[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - connectivity/source dbaccess/source svx/source

[Matthias Seidel]

 connectivity/source/resource/conn_shared_res.src |    2 +-
 dbaccess/source/ext/adabas/AdabasNewDb.src       |    2 +-
 svx/source/dialog/imapdlg.cxx                    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f4385117298865ab4522c895dcf904ae092473a7
Author: Matthias Seidel <mseidel at apache.org>
Date:   Sun Feb 18 14:13:53 2018 +0000

    #i85702#
    
    Changed German "<Alle>" to "*" until we have a better solution.

diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index fb2de2cf881f..d7b7b8f889ec 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -78,7 +78,7 @@
 #include <vcl/svapp.hxx>
 
 #define SELF_TARGET         "_self"
-#define IMAP_ALL_FILTER     "<Alle>"
+#define IMAP_ALL_FILTER     "*"
 #define IMAP_CERN_FILTER    "MAP - CERN"
 #define IMAP_NCSA_FILTER    "MAP - NCSA"
 #define IMAP_BINARY_FILTER  "SIP - StarView ImageMap"
commit 4152bef79573e3c7b3e77cc65ef347ace0d6aba6
Author: Matthias Seidel <mseidel at apache.org>
Date:   Sun Feb 18 14:03:53 2018 +0000

    Fixed typo, deleted whitespace

diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index 8009f629b643..6d2ae1f32d53 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -603,7 +603,7 @@ String STR_COMMAND_NOT_FOUND
 };
 String STR_DATABASE_NEEDS_CONVERTING
 {
-    Text [ en-US ] = "The current database need to be converted. Please insert control user  and password.";
+    Text [ en-US ] = "The current database needs to be converted. Please insert control user and password.";
 };
 String STR_USER_NO_DELETE
 {
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.src b/dbaccess/source/ext/adabas/AdabasNewDb.src
index ba21abc01cd1..5efd2d17eb5f 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.src
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.src
@@ -441,7 +441,7 @@ String STR_ADABAS_NO_ACCESSRIGHTS
 
 String STR_ADABAS_CANNOT_CONVERT
 {
-    Text[ en-US ] = "The current database need to be converted. Please insert control user  and password.";
+    Text[ en-US ] = "The current database needs to be converted. Please insert control user and password.";
 };
 
 String STR_ADABAS_PASSWORD_ILLEGAL