cppuhelper/source/paths.cxx | 2 +-
desktop/inc/strings.hrc | 4 ++--
desktop/source/app/app.cxx | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit b57ed76361da672697eccd219b09bd358a967e0d
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Mon Aug 27 14:38:16 2018 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Tue Aug 28 16:19:10 2018 +0200
Fix typo in code
To complete commit:
e9fa088735bfbd34bc81f1925438691f746db070
It passed "make check" on Linux
Change-Id: I2772b1ac5d4024bb11f3e09e24afc566b7091fb8
Reviewed-on: https://gerrit.libreoffice.org/59693
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Jenkins
diff --git a/cppuhelper/source/paths.cxx b/cppuhelper/source/paths.cxx
index 429df7edf8d3..38584b38ee4d 100644
--- a/cppuhelper/source/paths.cxx
+++ b/cppuhelper/source/paths.cxx
@@ -64,7 +64,7 @@ rtl::OUString cppu::getUnoIniUri() {
// Wouldn't it be lovely to avoid this ugly hard-coding.
// The problem is that the 'create_bootstrap_macro_expander_factory()'
// required for bootstrapping services, calls cppu::get_unorc directly
- // instead of re-using the BoostrapHandle from:
+ // instead of re-using the BootstrapHandle from:
// defaultBootstrap_InitialComponentContext
// and since rtlBootstrapHandle is not ref-counted doing anything
// clean here is hardish.
diff --git a/desktop/inc/strings.hrc b/desktop/inc/strings.hrc
index 40504ce36815..912f76626b0e 100644
--- a/desktop/inc/strings.hrc
+++ b/desktop/inc/strings.hrc
@@ -174,8 +174,8 @@
#define STR_TITLE_USERDATALOCKED
NC_("STR_TITLE_USERDATALOCKED", "%PRODUCTNAME %PRODUCTVERSION")
#define STR_ERR_PRINTDISABLED
NC_("STR_ERR_PRINTDISABLED", "Printing is disabled. No documents can be
printed.")
#define STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE
NC_("STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE", "The path manager is not
available.\n")
-#define STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE
NC_("STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE", "%PRODUCTNAME user installation
could not be completed due to insufficient free disk space. Please free more
disc space at the following location and restart %PRODUCTNAME:\n\n")
-#define STR_BOOSTRAP_ERR_NOACCESSRIGHTS
NC_("STR_BOOSTRAP_ERR_NOACCESSRIGHTS", "%PRODUCTNAME user installation could
not be processed due to missing access rights. Please make sure that you have
sufficient access rights for the following location and restart
%PRODUCTNAME:\n\n")
+#define STR_BOOTSTRAP_ERR_NOTENOUGHDISKSPACE
NC_("STR_BOOTSTRAP_ERR_NOTENOUGHDISKSPACE", "%PRODUCTNAME user installation
could not be completed due to insufficient free disk space. Please free more
disc space at the following location and restart %PRODUCTNAME:\n\n")
+#define STR_BOOTSTRAP_ERR_NOACCESSRIGHTS
NC_("STR_BOOTSTRAP_ERR_NOACCESSRIGHTS", "%PRODUCTNAME user installation could
not be processed due to missing access rights. Please make sure that you have
sufficient access rights for the following location and restart
%PRODUCTNAME:\n\n")
#define RID_STR_UNOPKG_ACCEPT_LIC_1
NC_("RID_STR_UNOPKG_ACCEPT_LIC_1", "Extension Software License Agreement of
$NAME:")
#define RID_STR_UNOPKG_ACCEPT_LIC_2
NC_("RID_STR_UNOPKG_ACCEPT_LIC_2", "Read the complete License Agreement
displayed above. " \
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 71b83d64f3c3..de11310bc7ca 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -878,9 +878,9 @@ void Desktop::HandleBootstrapErrors(
OUString aDiagnosticMessage;
if ( aBootstrapError == BE_USERINSTALL_NOTENOUGHDISKSPACE )
- aDiagnosticMessage = DpResId(STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE);
+ aDiagnosticMessage = DpResId(STR_BOOTSTRAP_ERR_NOTENOUGHDISKSPACE);
else
- aDiagnosticMessage = DpResId(STR_BOOSTRAP_ERR_NOACCESSRIGHTS);
+ aDiagnosticMessage = DpResId(STR_BOOTSTRAP_ERR_NOACCESSRIGHTS);
aDiagnosticMessage += aUserInstallationPath;
FatalError(MakeStartupErrorMessage(aDiagnosticMessage));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
