[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - android/sdremote cui/uiconfig unixODBC/inc

[Andras Timar]

 android/sdremote/res/values/strings.xml |    2 +-
 cui/uiconfig/ui/customize.ui            |    2 +-
 unixODBC/inc/odbc/sqltypes.h            |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 179c1fcdde5187f53fb435cb41ccdb8093bef685
Author: Andras Timar <atimar at suse.com>
Date:   Sat May 25 13:49:37 2013 +0200

    typo: s/Toolbare/Toolbars/
    
    Change-Id: Id9311252ced86df661f9219fe74478e69d9219ac

diff --git a/cui/uiconfig/ui/customize.ui b/cui/uiconfig/ui/customize.ui
index cb8c889..d31efbe 100644
--- a/cui/uiconfig/ui/customize.ui
+++ b/cui/uiconfig/ui/customize.ui
@@ -973,7 +973,7 @@
                               <object class="GtkLabel" id="label29">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">_Toolbare</property>
+                                <property name="label" translatable="yes">_Toolbars</property>
                                 <property name="use_underline">True</property>
                               </object>
                               <packing>
commit 324fc2c7a50e443ce8c9d6e9f4b9ca5c5417b509
Author: Andras Timar <atimar at suse.com>
Date:   Sat May 25 13:48:42 2013 +0200

    typo: s/recommanded/recommended/
    
    Change-Id: I4a22f856b993ef09556fcf921aa1f01be322cd4b

diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml
index 3500aee..324d852 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -53,7 +53,7 @@
     <string name="addserver_cancel">Cancel</string>
     <string name="reconnect_description1">Your connection has been dropped.</string>
     <string name="reconnect_description2">Please try to reconnect</string>
-    <string name="wifiAlertMsg">This is still an experimental feature. You need to \"enable experimental features\" in \"Preference\"-\"LibreOffice\"-\"Advanced\" on your computer. \nThe use over Bluetooth is recommanded.</string>
+    <string name="wifiAlertMsg">This is still an experimental feature. You need to \"enable experimental features\" in \"Preference\"-\"LibreOffice\"-\"Advanced\" on your computer. \nThe use over Bluetooth is recommended.</string>
     <string-array name="countdown_values">
         <item >5:00</item>
         <item >10:00</item>
diff --git a/unixODBC/inc/odbc/sqltypes.h b/unixODBC/inc/odbc/sqltypes.h
index 1b0f9d5..8800502 100644
--- a/unixODBC/inc/odbc/sqltypes.h
+++ b/unixODBC/inc/odbc/sqltypes.h
@@ -84,7 +84,7 @@ typedef char                CHAR;
 /*
  * NOTE: The Microsoft unicode define is only for apps that want to use TCHARs and
  *  be able to compile for both unicode and non-unicode with the same source.
- *  This is not recommanded for linux applications and is not supported
+ *  This is not recommended for linux applications and is not supported
  *  by the standard linux string header files.
  */
 #ifdef SQL_WCHART_CONVERT