[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - svx/inc svx/source

[Luboš Luňák]

 svx/inc/svx/dialogs.hrc          |    2 +-
 svx/source/tbxctrls/tbcontrl.cxx |    3 ++-
 svx/source/tbxctrls/tbcontrl.src |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit e512ad5a744e1e73b0a78697d21b6d4723d36d48
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Feb 8 14:44:41 2013 +0100

    try to reuse a string so that at least part of a message is translated
    
    Change-Id: Ie452223b1b55b50e851f666b340355a4d116b84f

diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index bf68808..e20e72e 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -397,7 +397,7 @@
 #define RID_SVXSTR_EXTRAS_CHARBACKGROUND    (RID_SVX_START + 196)
 #define RID_SVXSTR_CLEARFORM                (RID_SVX_START + 197)
 #define RID_SVXSTR_MORE                     (RID_SVX_START + 198)
-#define RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE (RID_SVX_START + 199)
+#define RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE_APPEND (RID_SVX_START + 199)
 #define RID_SVXSTR_CHARFONTNAME             (RID_SVX_START + 200)
 
 
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 2eb46cc..3f800e2 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -681,7 +681,8 @@ void SvxFontNameBox_Impl::CheckAndMarkUnknownFont( const XubString& fontname )
         {
             font.SetItalic( ITALIC_NORMAL );
             SetControlFont( font );
-            SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE ));
+            SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_CHARFONTNAME )
+                + ". " + SVX_RESSTR( RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE_APPEND ));
         }
     }
 }
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index d12a94e..562219d 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -170,9 +170,9 @@ String RID_SVXSTR_CHARFONTNAME
     Text [ en-US ] = "Font Name";
 };
 
-String RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE
+String RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE_APPEND
 {
-    Text [ en-US ] = "Font Name. The current font is not available and will be substituted.";
+    Text [ en-US ] = "The current font is not available and will be substituted.";
 };
 
 // ********************************************************************** EOF