[Libreoffice-commits] core.git: dbaccess/source desktop/source sw/source

Zolnai Tamás zolnaitamas2000 at gmail.com
Thu Apr 4 12:47:50 PDT 2013


 dbaccess/source/ui/dlg/AutoControls_tmpl.hrc          |    2 
 desktop/source/deployment/gui/dp_gui_dialog.src       |   30 ++++++------
 desktop/source/deployment/gui/dp_gui_updatedialog.src |    4 -
 desktop/source/deployment/gui/dp_gui_versionboxes.src |   42 +++++++++---------
 sw/source/ui/app/app.src                              |    2 
 5 files changed, 40 insertions(+), 40 deletions(-)

New commits:
commit ca776f348aa90119e6281eb5d979de2d56786e08
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Thu Apr 4 21:14:32 2013 +0200

    Not escape single quotes in src\hrc files
    
    Escaping them is not needed.
    Plus escaped quotes are taken into po files and
    make translater's work more uncomfortable.
    
    Change-Id: I2ea7218120bc3d9967bdf51091ef091acbf2b73c

diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
index 8bdc3f2..bf37c0d 100644
--- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
+++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
@@ -405,7 +405,7 @@
                                                                                                                             \
     String STR_AUTOFIELDSEPARATORLIST                                                                                       \
     {                                                                                                                       \
-        Text [ x-comment ] = "EM Dec 2002: \'Space\' refers to what you get when you hit the space bar on your keyboard.";  \
+        Text [ x-comment ] = "EM Dec 2002: 'Space' refers to what you get when you hit the space bar on your keyboard.";  \
         Text [ en-US ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32" ;                                                     \
     };                                                                                                                      \
                                                                                                                             \
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src
index 08736f6..4d523f7 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -216,7 +216,7 @@ ModalDialog RID_DLG_LICENSE
         Size = MAP_APPFONT(COL3_WIDTH+COL4_WIDTH, ROW3_HEIGHT);
         WordBreak = TRUE;
         NoLabel = TRUE;
-        Text [ en-US ] = "Read the complete License Agreement. Use the scroll bar or the \'Scroll Down\' button in this dialog to view the entire license text.";
+        Text [ en-US ] = "Read the complete License Agreement. Use the scroll bar or the 'Scroll Down' button in this dialog to view the entire license text.";
     };
 
     FixedText FT_LICENSE_BODY_2
@@ -233,7 +233,7 @@ ModalDialog RID_DLG_LICENSE
         Size = MAP_APPFONT(COL3_WIDTH+COL4_WIDTH, ROW4_HEIGHT);
         WordBreak = TRUE;
         NoLabel = TRUE;
-        Text [ en-US ] = "Accept the License Agreement for the extension by pressing the \'Accept\' button.";
+        Text [ en-US ] = "Accept the License Agreement for the extension by pressing the 'Accept' button.";
 
     };
 
@@ -329,17 +329,17 @@ ModalDialog RID_DLG_SHOW_LICENSE
 WarningBox RID_WARNINGBOX_INSTALL_EXTENSION {
     Buttons = WB_OK_CANCEL;
     DefButton = WB_DEF_OK;
-    Message[en-US] = "You are about to install the extension \'%NAME\'.\n"
-    "Click \'OK\' to proceed with the installation.\n"
-    "Click \'Cancel\' to stop the installation.";
+    Message[en-US] = "You are about to install the extension '%NAME'.\n"
+    "Click 'OK' to proceed with the installation.\n"
+    "Click 'Cancel' to stop the installation.";
 };
 
 WarningBox RID_WARNINGBOX_REMOVE_EXTENSION {
     Buttons = WB_OK_CANCEL;
     DefButton = WB_DEF_CANCEL;
-    Message[en-US] = "You are about to remove the extension \'%NAME\'.\n"
-    "Click \'OK\' to remove the extension.\n"
-    "Click \'Cancel\' to stop removing the extension.";
+    Message[en-US] = "You are about to remove the extension '%NAME'.\n"
+    "Click 'OK' to remove the extension.\n"
+    "Click 'Cancel' to stop removing the extension.";
 };
 
 WARNINGBOX RID_WARNINGBOX_REMOVE_SHARED_EXTENSION
@@ -348,8 +348,8 @@ WARNINGBOX RID_WARNINGBOX_REMOVE_SHARED_EXTENSION
     DefButton = WB_DEF_CANCEL;
     Message[en-US] = "Make sure that no further users are working with the same "
     "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n"
-    "Click \'OK\' to remove the extension.\n"
-    "Click \'Cancel\' to stop removing the extension.";
+    "Click 'OK' to remove the extension.\n"
+    "Click 'Cancel' to stop removing the extension.";
 };
 
 WARNINGBOX RID_WARNINGBOX_ENABLE_SHARED_EXTENSION
@@ -358,8 +358,8 @@ WARNINGBOX RID_WARNINGBOX_ENABLE_SHARED_EXTENSION
     DefButton = WB_DEF_CANCEL;
     Message[en-US] = "Make sure that no further users are working with the same "
     "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n"
-    "Click \'OK\' to enable the extension.\n"
-    "Click \'Cancel\' to stop enabling the extension.";
+    "Click 'OK' to enable the extension.\n"
+    "Click 'Cancel' to stop enabling the extension.";
 };
 
 WARNINGBOX RID_WARNINGBOX_DISABLE_SHARED_EXTENSION
@@ -368,14 +368,14 @@ WARNINGBOX RID_WARNINGBOX_DISABLE_SHARED_EXTENSION
     DefButton = WB_DEF_CANCEL;
     Message[en-US] = "Make sure that no further users are working with the same "
     "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n"
-    "Click \'OK\' to disable the extension.\n"
-    "Click \'Cancel\' to stop disabling the extension.";
+    "Click 'OK' to disable the extension.\n"
+    "Click 'Cancel' to stop disabling the extension.";
 };
 
 
 String RID_STR_UNSUPPORTED_PLATFORM
 {
-    Text [ en-US ] = "The extension \'%Name\' does not work on this computer.";
+    Text [ en-US ] = "The extension '%Name' does not work on this computer.";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index 1e97f7a..43d7d7b 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -261,8 +261,8 @@ WarningBox RID_WARNINGBOX_UPDATE_SHARED_EXTENSION
     DefButton = WB_DEF_CANCEL;
     Message[en-US] = "Make sure that no further users are working with the same "
     "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n"
-    "Click \'OK\' to update the extensions.\n"
-    "Click \'Cancel\' to stop updating the extensions.";
+    "Click 'OK' to update the extensions.\n"
+    "Click 'Cancel' to stop updating the extensions.";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_versionboxes.src b/desktop/source/deployment/gui/dp_gui_versionboxes.src
index b582024..8ef810c 100644
--- a/desktop/source/deployment/gui/dp_gui_versionboxes.src
+++ b/desktop/source/deployment/gui/dp_gui_versionboxes.src
@@ -22,48 +22,48 @@
 WarningBox RID_WARNINGBOX_VERSION_LESS {
     Buttons = WB_OK_CANCEL;
     DefButton = WB_DEF_CANCEL;
-    Message[en-US] = "You are about to install version $NEW of the extension \'$NAME\'.\n"
+    Message[en-US] = "You are about to install version $NEW of the extension '$NAME'.\n"
     "The newer version $DEPLOYED is already installed.\n"
-    "Click \'OK\' to replace the installed extension.\n"
-    "Click \'Cancel\' to stop the installation.";
+    "Click 'OK' to replace the installed extension.\n"
+    "Click 'Cancel' to stop the installation.";
 };
 
 String RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES {
-    Text [en-US] = "You are about to install version $NEW of the extension \'$NAME\'.\n"
-    "The newer version $DEPLOYED, named \'$OLDNAME\', is already installed.\n"
-    "Click \'OK\' to replace the installed extension.\n"
-    "Click \'Cancel\' to stop the installation.";
+    Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n"
+    "The newer version $DEPLOYED, named '$OLDNAME', is already installed.\n"
+    "Click 'OK' to replace the installed extension.\n"
+    "Click 'Cancel' to stop the installation.";
 };
 
 WarningBox RID_WARNINGBOX_VERSION_EQUAL {
     Buttons = WB_OK_CANCEL;
     DefButton = WB_DEF_CANCEL;
-    Message[en-US] = "You are about to install version $NEW of the extension \'$NAME\'.\n"
+    Message[en-US] = "You are about to install version $NEW of the extension '$NAME'.\n"
     "That version is already installed.\n"
-    "Click \'OK\' to replace the installed extension.\n"
-    "Click \'Cancel\' to stop the installation.";
+    "Click 'OK' to replace the installed extension.\n"
+    "Click 'Cancel' to stop the installation.";
 };
 
 String RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES {
-    Text [en-US] = "You are about to install version $NEW of the extension \'$NAME\'.\n"
-    "That version, named \'$OLDNAME\', is already installed.\n"
-    "Click \'OK\' to replace the installed extension.\n"
-    "Click \'Cancel\' to stop the installation.";
+    Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n"
+    "That version, named '$OLDNAME', is already installed.\n"
+    "Click 'OK' to replace the installed extension.\n"
+    "Click 'Cancel' to stop the installation.";
 };
 
 WarningBox RID_WARNINGBOX_VERSION_GREATER {
     Buttons = WB_OK_CANCEL;
     DefButton = WB_DEF_OK;
-    Message[en-US] = "You are about to install version $NEW of the extension \'$NAME\'.\n"
+    Message[en-US] = "You are about to install version $NEW of the extension '$NAME'.\n"
     "The older version $DEPLOYED is already installed.\n"
-    "Click \'OK\' to replace the installed extension.\n"
-    "Click \'Cancel\' to stop the installation.";
+    "Click 'OK' to replace the installed extension.\n"
+    "Click 'Cancel' to stop the installation.";
 };
 
 String RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES {
-    TEXT [en-US] = "You are about to install version $NEW of the extension \'$NAME\'.\n"
-    "The older version $DEPLOYED, named \'$OLDNAME\', is already installed.\n"
-    "Click \'OK\' to replace the installed extension.\n"
-    "Click \'Cancel\' to stop the installation.";
+    TEXT [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n"
+    "The older version $DEPLOYED, named '$OLDNAME', is already installed.\n"
+    "Click 'OK' to replace the installed extension.\n"
+    "Click 'Cancel' to stop the installation.";
 };
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 2e9d059..7212515 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -541,7 +541,7 @@ ModalDialog DLG_MERGE_SOURCE_UNAVAILABLE
         Pos = MAP_APPFONT ( 12 , 6 ) ;
         Size = MAP_APPFONT ( 178 , 40 ) ;
         WordBreak = TRUE;
-        Text [ en-US ] = "The data source \'%1\' was not found. Thus the connection to the data source could not be established.\n\nPlease check the connections settings.";
+        Text [ en-US ] = "The data source '%1' was not found. Thus the connection to the data source could not be established.\n\nPlease check the connections settings.";
     };
     OKButton PB_MERGE_OK
     {


More information about the Libreoffice-commits mailing list