Author: zhangjf
Date: Fri Jun 29 12:47:28 2012
New Revision: 1355344
URL: http://svn.apache.org/viewvc?rev=1355344&view=rev
Log:
#i119950#, 1st part, the dialog string to block single user multi-session access
Found by: Dali Liu
Patch by: yuanlin
Review by: zhangjf
Modified:
incubator/ooo/branches/AOO34/main/desktop/source/app/desktop.hrc
incubator/ooo/branches/AOO34/main/desktop/source/app/desktop.src
Modified: incubator/ooo/branches/AOO34/main/desktop/source/app/desktop.hrc
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/desktop/source/app/desktop.hrc?rev=1355344&r1=1355343&r2=1355344&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/desktop/source/app/desktop.hrc (original)
+++ incubator/ooo/branches/AOO34/main/desktop/source/app/desktop.hrc Fri Jun 29
12:47:28 2012
@@ -67,6 +67,7 @@
#define STR_BOOTSTRAP_ERR_NO_CFG_SERVICE (RID_DESKTOP_STRING_START+121)
#define STR_BOOTSTRAP_ERR_CFG_DATAACCESS (RID_DESKTOP_STRING_START+122)
#define STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE (RID_DESKTOP_STRING_START+123)
+#define STR_BOOTSTRAP_ERR_MULTISESSION (RID_DESKTOP_STRING_START+124)
#define STR_ASK_START_SETUP_MANUALLY (RID_DESKTOP_STRING_START+152)
Modified: incubator/ooo/branches/AOO34/main/desktop/source/app/desktop.src
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/desktop/source/app/desktop.src?rev=1355344&r1=1355343&r2=1355344&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/desktop/source/app/desktop.src (original)
+++ incubator/ooo/branches/AOO34/main/desktop/source/app/desktop.src Fri Jun 29
12:47:28 2012
@@ -94,6 +94,11 @@ String STR_BOOTSTRAP_ERR_NO_CFG_SERVICE
Text [ en-US ] = "The configuration service is not available.";
};
+String STR_BOOTSTRAP_ERR_MULTISESSION
+{
+ Text [ en-US ] = "You have another instance running in a different
terminal session. Close that instance and then try again.";
+};
+
String STR_ASK_START_SETUP_MANUALLY
{
Text [ en-US ] = "Start the setup application to repair the
installation from the CD or the folder containing the installation packages.";
