[Libreoffice-commits] core.git: 2 commits - connectivity/source dbaccess/source desktop/source reportdesign/source sc/source svx/source wizards/source

Thomas Arnhold thomas at arnhold.org
Thu May 8 09:29:51 PDT 2014


 connectivity/source/resource/conn_shared_res.src |   10 +++++-----
 dbaccess/source/ui/dlg/dbadminsetup.src          |    2 +-
 dbaccess/source/ui/querydesign/querydlg.src      |    2 +-
 desktop/source/app/desktop.src                   |    2 +-
 desktop/source/deployment/misc/dp_misc.src       |    2 +-
 reportdesign/source/ui/report/report.src         |    4 ++--
 sc/source/ui/src/scfuncs.src                     |    4 ++--
 svx/source/dialog/sdstring.src                   |    6 +++---
 svx/source/gallery2/galtheme.src                 |    4 ++--
 wizards/source/formwizard/dbwizres.src           |    2 +-
 10 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit a89355091baeff266bc7c0d9c92d3404b185d268
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Thu May 8 18:27:34 2014 +0200

    some more %PRODUCTNAME usage
    
    Change-Id: If418877b88e95cd55c39fc6dbe314b3a796574cd

diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index 383af8f..9246f22 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -137,7 +137,7 @@ String STR_INTERNAL_ERRMSG
 
 String STR_LO_MUST_BE_RESTARTED
 {
-    Text [ en-US ] = "LibreOffice must unfortunately be manually restarted once after installation or update." ;
+    Text [ en-US ] = "%PRODUCTNAME must unfortunately be manually restarted once after installation or update." ;
 };
 
 QueryBox QBX_USERDATALOCKED
diff --git a/desktop/source/deployment/misc/dp_misc.src b/desktop/source/deployment/misc/dp_misc.src
index d626a19..498e042 100644
--- a/desktop/source/deployment/misc/dp_misc.src
+++ b/desktop/source/deployment/misc/dp_misc.src
@@ -32,7 +32,7 @@ String RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX {
 };
 
 String RID_DEPLOYMENT_DEPENDENCIES_LO_MIN {
-    Text[en-US] = "Extension requires at least LibreOffice version %VERSION";
+    Text[en-US] = "Extension requires at least %PRODUCTNAME version %VERSION";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 71cd150..f4387bc 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -1930,7 +1930,7 @@ String RID_SVXSTR_COLOR_USER
 
 String RID_SVXSTR_COLOR_LIBRE_GREEN_1
 {
-    Text [ en-US ] = "Green 1 (LibreOffice Main Color)" ;
+    Text [ en-US ] = "Green 1 (%PRODUCTNAME Main Color)" ;
 };
 
 String RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT
@@ -1965,7 +1965,7 @@ String RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT
 
 String RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF
 {
-    Text = "Green 1 (LibreOffice Main Color)" ;
+    Text = "Green 1 (%PRODUCTNAME Main Color)" ;
 };
 
 String RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF
commit dcee245d88aba3e4b50f6307668591c4d9f05ff6
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Thu May 8 18:23:54 2014 +0200

    typos
    
    Change-Id: I2e7676ddec446dfdb72018a1039d6271f963376c

diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index 1ed4ed3..99273cd 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -33,26 +33,26 @@
 
 String STR_MOZILLA_ADDRESSBOOKS
 {
-    Text [ en-US ] = "Mozilla/Seamonkey Addressbook Directory";
+    Text [ en-US ] = "Mozilla/Seamonkey Address Book Directory";
     Text [ x-comment ] = "This must be the term referring to address books in the user's "
         "Mozilla/Seamonkey profile in the system.";
 };
 
 String STR_THUNDERBIRD_ADDRESSBOOKS
 {
-    Text [ en-US ] = "Thunderbird Addressbook Directory";
+    Text [ en-US ] = "Thunderbird Address Book Directory";
     Text [ x-comment ] = "This must be the term referring to address books in the user's "
         "Thunderbird profile in the system.";
 };
 
 String STR_OE_ADDRESSBOOK
 {
-    Text [ en-US ] = "Outlook Express Addressbook";
+    Text [ en-US ] = "Outlook Express Address Book";
 };
 
 String STR_OUTLOOK_MAPI_ADDRESSBOOK
 {
-    Text [ en-US ] = "Outlook (MAPI) Addressbook";
+    Text [ en-US ] = "Outlook (MAPI) Address Book";
 };
 
 String STR_NO_TABLE_CREATION_SUPPORT
@@ -87,7 +87,7 @@ String STR_ERR_EXECUTING_QUERY
 
 String STR_MOZILLA_IS_RUNNIG_NO_CHANGES
 {
-    Text [ en-US ] = "You can't make any changes to mozilla address book when mozilla is running.";
+    Text [ en-US ] = "You can't make any changes to Mozilla Address Book when Mozilla is running.";
 };
 
 String STR_FOREIGN_PROCESS_CHANGED_AB
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index f4617a8..3572bc2 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -500,7 +500,7 @@ TabPage PAGE_DBWIZARD_ORACLE
     };
 
     String STR_ORACLE_HELPTEXT{
-        Text[ en-US ] = "Please enter the required information to connect to an Oracle database.Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
+        Text[ en-US ] = "Please enter the required information to connect to an Oracle database. Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
     };
 
     AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS,HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS)
diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src
index 81a5ee8..14d2718 100644
--- a/dbaccess/source/ui/querydesign/querydlg.src
+++ b/dbaccess/source/ui/querydesign/querydlg.src
@@ -41,7 +41,7 @@ String STR_QUERY_FULL_JOIN
 
 String STR_QUERY_CROSS_JOIN
 {
-    Text [ en-US ] = "Contains the cartesian product of ALL records from '%1' and from '%2'.";
+    Text [ en-US ] = "Contains the Cartesian product of ALL records from '%1' and from '%2'.";
 };
 
 String STR_QUERY_NATURAL_JOIN
diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src
index 2c08c89..a89be1e 100644
--- a/reportdesign/source/ui/report/report.src
+++ b/reportdesign/source/ui/report/report.src
@@ -256,12 +256,12 @@ String RID_STR_UNDO_UNGROUP
 String RID_STR_GROUPHEADER
 {
     Text [ en-US ] = "GroupHeader";
-    Text [ x-comment ] = "Please try to avoid spaces in the name. It is used as a programatic one.";
+    Text [ x-comment ] = "Please try to avoid spaces in the name. It is used as a programmatic one.";
 };
 String RID_STR_GROUPFOOTER
 {
     Text [ en-US ] = "GroupFooter";
-    Text [ x-comment ] = "Please try to avoid spaces in the name. It is used as a programatic one.";
+    Text [ x-comment ] = "Please try to avoid spaces in the name. It is used as a programmatic one.";
 };
 Menu RID_MENU_REPORT
 {
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 14201f6..5887ab0 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -691,7 +691,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
     {
         String 1 // Description
         {
-            Text [ en-US ] = "Returns the number of workdays between two dates using arguments to indicate weekenddays and holidays." ;
+            Text [ en-US ] = "Returns the number of workdays between two dates using arguments to indicate weekend days and holidays." ;
         };
         ExtraData =
         {
@@ -739,7 +739,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
     {
         String 1 // Description
         {
-            Text [ en-US ] = "Returns the serial number of the date before or after a number of workdays using arguments to indicate weekenddays and holidays." ;
+            Text [ en-US ] = "Returns the serial number of the date before or after a number of workdays using arguments to indicate weekend days and holidays." ;
         };
         ExtraData =
         {
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 76eda7e..71cd150 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -1469,7 +1469,7 @@ String RID_SVXSTR_BMP20_DEF
 /* do not translate */
 String RID_SVXSTR_BMP21_DEF
 {
-    Text = "Bitmape";
+    Text = "Bitmap";
 };
 
 String RID_SVXSTR_BMP0
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index d692cf0..0749688 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
@@ -347,7 +347,7 @@ Text [ en-US ] = "Architecture - overlay";
 
 String RID_GALLERYSTR_THEME_ARCHITECTURE_FURNITURES
 {
-Text [ en-US ] = "Architecture - furnitures";
+Text [ en-US ] = "Architecture - furniture";
 };
 
 String RID_GALLERYSTR_THEME_ARCHITECTURE_BUILDINGS
@@ -702,7 +702,7 @@ Text [ en-US ] = "Music - sheet music";
 
 String RID_GALLERYSTR_THEME_SPECIAL_PICTOGRAMM
 {
-Text [ en-US ] = "Special Pictogramms";
+Text [ en-US ] = "Special Pictograms";
 };
 
 String RID_GALLERYSTR_THEME_PHOTOS_CELEBRATION
diff --git a/wizards/source/formwizard/dbwizres.src b/wizards/source/formwizard/dbwizres.src
index 78f43b7..e4e04f7 100644
--- a/wizards/source/formwizard/dbwizres.src
+++ b/wizards/source/formwizard/dbwizres.src
@@ -1401,7 +1401,7 @@ String RID_DB_REPORT_WIZARD_START + 73
 
 String RID_DB_REPORT_WIZARD_START + 74
 {
-    Text [ en-US ] = "The sort criterium '<FIELDNAME>' was chosen twice. Each criterium can only be chosen once.";
+    Text [ en-US ] = "The sort criterion '<FIELDNAME>' was chosen twice. Each criterion can only be chosen once.";
 };
 
 


More information about the Libreoffice-commits mailing list