summaryrefslogtreecommitdiff
path: root/desktop/source
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-04-17 20:16:55 +0200
committerMichael Stahl <mstahl@redhat.com>2013-04-18 13:21:09 +0200
commit000d3aaca5e8b0bab4689f753e8025d73e5bcded (patch)
tree865eb36f72b02d6ccdb58fb3163acc3c2d2708ef /desktop/source
parent47754fe3ed8359a393c20996d70770c1dcd92207 (diff)
desktop: add STR_BOOTSTRAP_ERR_USERINSTALL_FAILED
... or why do we handle this case separately to put up a generic "internal error" message? Change-Id: Id51534adb0092cdd459c1811dac0385f0dcbaddb
Diffstat (limited to 'desktop/source')
-rw-r--r--desktop/source/app/app.cxx2
-rw-r--r--desktop/source/app/desktop.hrc1
-rw-r--r--desktop/source/app/desktop.src5
3 files changed, 7 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 2e8fe11f9f7d..2f0ecf6993cb 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1003,7 +1003,7 @@ void Desktop::HandleBootstrapErrors(
OUString aMessage;
OUStringBuffer aDiagnosticMessage( 100 );
OUString aErrorMsg;
- aErrorMsg = GetMsgString( STR_BOOTSTRAP_ERR_INTERNAL,
+ aErrorMsg = GetMsgString( STR_BOOTSTRAP_ERR_USERINSTALL_FAILED,
OUString( "User installation could not be completed" ) );
aDiagnosticMessage.append( aErrorMsg );
aMessage = MakeStartupErrorMessage( aDiagnosticMessage.makeStringAndClear() );
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index 4cf74f0fb490..18d66e42f4c3 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -43,6 +43,7 @@
#define STR_BOOTSTRAP_ERR_FILE_MISSING (RID_DESKTOP_STRING_START+106)
#define STR_BOOTSTRAP_ERR_NO_SUPPORT (RID_DESKTOP_STRING_START+107)
#define STR_BOOTSTRAP_ERR_LANGUAGE_MISSING (RID_DESKTOP_STRING_START+108)
+#define STR_BOOTSTRAP_ERR_USERINSTALL_FAILED (RID_DESKTOP_STRING_START+109)
#define STR_BOOTSTRAP_ERR_NO_CFG_SERVICE (RID_DESKTOP_STRING_START+121)
#define STR_BOOTSTRAP_ERR_CFG_DATAACCESS (RID_DESKTOP_STRING_START+122)
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index c6372d80286a..367bc128e195 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -80,6 +80,11 @@ String STR_BOOTSTRAP_ERR_LANGUAGE_MISSING
Text [ en-US ] = "The user interface language cannot be determined.";
};
+String STR_BOOTSTRAP_ERR_USERINSTALL_FAILED
+{
+ Text [ en-US ] = "User installation could not be completed. ";
+};
+
String STR_BOOTSTRAP_ERR_NO_CFG_SERVICE
{
Text [ en-US ] = "The configuration service is not available.";