[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - connectivity/source cui/source extensions/source reportdesign/source uui/source

[Andras Timar]

 connectivity/source/resource/conn_shared_res.src |    2 +-
 cui/source/dialogs/passwdomdlg.src               |    3 +--
 extensions/source/scanner/strings.src            |    8 ++++----
 reportdesign/source/ui/report/report.src         |    2 +-
 uui/source/lockfailed.src                        |    4 ++--
 uui/source/nameclashdlg.src                      |    6 +++---
 6 files changed, 12 insertions(+), 13 deletions(-)

New commits:
commit 4f9d125461a238f5c807a654d7351d32ca31074e
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Jun 15 16:39:10 2015 +0200

    more untranslatable UI strings
    
    Change-Id: I4c02d7613743a1b11594fd96f6131219afd102ef
    (cherry picked from commit 814867c75cd175594b8e60125f248ecbb6647644)

diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index ad56436..23c7db1 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -618,7 +618,7 @@ String STR_NO_DOCUMENTUI
 };
 String STR_ERROR_NEW_VERSION
 {
-    Text = "The connection could not be established. The database was created by a newer version of %PRODUCTNAME.";
+    Text [ en-US ] = "The connection could not be established. The database was created by a newer version of %PRODUCTNAME.";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src
index 8ea1c09..b0953c8 100644
--- a/cui/source/dialogs/passwdomdlg.src
+++ b/cui/source/dialogs/passwdomdlg.src
@@ -39,10 +39,9 @@ String RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON
     Text [ en-US ] = "Please enter a password to open or to modify, or check the open read-only option to continue." ;
 };
 
-// this missing string was detected late - so for 3.4 we just add an english string
 String RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2
 {
-    Text = "Set the password by entering the same password in both boxes." ;
+    Text [ en-US ] = "Set the password by entering the same password in both boxes." ;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/scanner/strings.src b/extensions/source/scanner/strings.src
index e7c4608..4f8ea64 100644
--- a/extensions/source/scanner/strings.src
+++ b/extensions/source/scanner/strings.src
@@ -11,22 +11,22 @@
 
 String STR_COULD_NOT_BE_INIT
 {
-    Text = "The SANE interface could not be initialized. Scanning is not possible.";
+    Text [ en-US ] = "The SANE interface could not be initialized. Scanning is not possible.";
 };
 
 String STR_SLOW_PREVIEW
 {
-    Text = "The device does not offer a preview option. Therefore, a normal scan will be used as a preview instead. This may take a considerable amount of time.";
+    Text [ en-US ] = "The device does not offer a preview option. Therefore, a normal scan will be used as a preview instead. This may take a considerable amount of time.";
 };
 
 String STR_ERROR_SCAN
 {
-    Text = "An error occurred while scanning.";
+    Text [ en-US ] = "An error occurred while scanning.";
 };
 
 String STR_DEVICE_DESC
 {
-    Text = "Device: %s\nVendor: %s\nModel: %s\nType: %s";
+    Text [ en-US ] = "Device: %s\nVendor: %s\nModel: %s\nType: %s";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src
index 616984b..ed9bfd9 100644
--- a/reportdesign/source/ui/report/report.src
+++ b/reportdesign/source/ui/report/report.src
@@ -150,7 +150,7 @@ String RID_STR_UNDO_ADD_PAGEHEADERFOOTER
 String RID_STR_UNDO_PROPERTY
 {
     Text [ en-US ] = "Change property '#'";
-    Text = "The # character is used for replacing";
+    Text [ x-comment ] = "The # character is used for replacing";
 };
 
 String RID_STR_UNDO_ADD_GROUP_HEADER
diff --git a/uui/source/lockfailed.src b/uui/source/lockfailed.src
index be9f43a..2384e43 100644
--- a/uui/source/lockfailed.src
+++ b/uui/source/lockfailed.src
@@ -23,7 +23,7 @@
 
 String STR_LOCKFAILED_TITLE
 {
-    Text = "Document Could Not Be Locked";
+    Text [ en-US ] = "Document Could Not Be Locked";
 };
 String STR_LOCKFAILED_MSG
 {
@@ -31,7 +31,7 @@ String STR_LOCKFAILED_MSG
 };
 String STR_LOCKFAILED_DONTSHOWAGAIN
 {
-    Text = "~Do not show this message again";
+    Text [ en-US ] = "~Do not show this message again";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/nameclashdlg.src b/uui/source/nameclashdlg.src
index 3ffe2e4..b608123 100644
--- a/uui/source/nameclashdlg.src
+++ b/uui/source/nameclashdlg.src
@@ -23,17 +23,17 @@
 
 String STR_RENAME_OR_REPLACE
 {
-    Text = "A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\nChoose Replace to overwrite the existing file or provide a new name.";
+    Text [ en-US ] = "A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\nChoose Replace to overwrite the existing file or provide a new name.";
 };
 
 String STR_NAME_CLASH_RENAME_ONLY
 {
-    Text = "A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\nPlease enter a new name.";
+    Text [ en-US ] = "A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\nPlease enter a new name.";
 };
 
 String STR_SAME_NAME_USED
 {
-    Text = "Please provide a different file name!";
+    Text [ en-US ] = "Please provide a different file name!";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */