summaryrefslogtreecommitdiffstats
path: root/desktop
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2012-07-18 23:25:09 +0200
committerThomas Arnhold <thomas@arnhold.org>2012-07-18 23:28:54 +0200
commit3e7832724e6647f6e786b0feb846b97ce8c03070 (patch)
tree0cbc0a90a60af347ba96c3bc6e2d1c29effe79ff /desktop
parentupdate license documents (diff)
downloadcore-3e7832724e6647f6e786b0feb846b97ce8c03070.tar.gz
core-3e7832724e6647f6e786b0feb846b97ce8c03070.zip
Revert hrc string cleanup
This reverts mostly all of my hrc string cleanup commits. As Markus stated in dc05a825e71316e6f602e5c8dfcd3d10ecb6252f those are erroneous and mostly untested. And therefore absolutely unsave. I only did test them by compiling and checking the main screens. Cleaning those files seems to be much more complicated than I thought. So to be absolutely save I do this huge revert. Sorry for this. Revert "hrc cleanup: Further cleanup" This reverts commit 60212988e1cd84169afb028a4255b6f935f1fd4b. Revert "hrc cleanup: Remove unused strings" This reverts commit 0e2d7550dd287843b70c03dee952c02f9bd8afb5. Revert "hrc cleanup: Remove unused Strings in sfx2/source/doc/doc.hrc" This reverts commit efb74b5dfdb773ba53b29080e1996a93d2c1cac2. Revert "hrc cleanup: Remove unused Strings in cui" This reverts commit 527e8f61868210c54bdad650f16390bda03c4353. Revert "hrc cleanup: Remove unused Strings in desktop" This reverts commit ac3800fbb9f3251276302b24fa0542441276a34f. Revert "hrc cleanup: Remove unused cstitem.src" This reverts commit ae95e31831916df760503bfc2496b7bc55bc638b. Revert "hrc cleanup: Remove unused strings in wizards" This reverts commit 20f9a1744319ecdf18c9ab6d0873bb586eb4d03f. Revert "hrc cleanup: Remove unused Strings in sfx2" This reverts commit c26d4d34467008418ebf138412e87886694c326c.
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/desktop.hrc8
-rw-r--r--desktop/source/app/desktop.src40
-rw-r--r--desktop/source/deployment/registry/script/dp_script.hrc1
-rw-r--r--desktop/source/deployment/registry/script/dp_script.src5
4 files changed, 54 insertions, 0 deletions
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index ff23d478ad1a..3b01f2444db1 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -37,11 +37,14 @@
#define EBX_ERR_PRINTDISABLED (RID_DESKTOP_DIALOG_START+190)
+#define STR_RECOVER_QUERY (RID_DESKTOP_STRING_START+0)
+#define STR_RECOVER_TITLE (RID_DESKTOP_STRING_START+1)
#define STR_RECOVER_PREPARED (RID_DESKTOP_STRING_START+2)
#define STR_BOOTSTRAP_ERR_CANNOT_START (RID_DESKTOP_STRING_START+100)
#define STR_BOOTSTRAP_ERR_DIR_MISSING (RID_DESKTOP_STRING_START+101)
#define STR_BOOTSTRAP_ERR_PATH_INVALID (RID_DESKTOP_STRING_START+102)
+#define STR_BOOTSTRAP_ERR_NO_PATH (RID_DESKTOP_STRING_START+103)
#define STR_BOOTSTRAP_ERR_INTERNAL (RID_DESKTOP_STRING_START+104)
#define STR_BOOTSTRAP_ERR_FILE_CORRUPT (RID_DESKTOP_STRING_START+105)
#define STR_BOOTSTRAP_ERR_FILE_MISSING (RID_DESKTOP_STRING_START+106)
@@ -57,11 +60,16 @@
#define STR_INTERNAL_ERRMSG (RID_DESKTOP_STRING_START+161)
+#define STR_CONFIG_ERR_SETTINGS_INCOMPLETE (RID_DESKTOP_STRING_START+182)
+#define STR_CONFIG_ERR_CANNOT_CONNECT (RID_DESKTOP_STRING_START+183)
+#define STR_CONFIG_ERR_RIGHTS_MISSING (RID_DESKTOP_STRING_START+184)
#define STR_CONFIG_ERR_ACCESS_GENERAL (RID_DESKTOP_STRING_START+187)
+#define STR_CONFIG_ERR_NO_WRITE_ACCESS (RID_DESKTOP_STRING_START+188)
#define STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE (RID_DESKTOP_STRING_START+189)
#define STR_BOOSTRAP_ERR_NOACCESSRIGHTS (RID_DESKTOP_STRING_START+190)
#define STR_TITLE_USERDATALOCKED (RID_DESKTOP_STRING_START+206)
+#define STR_TITLE_EXPIRED (RID_DESKTOP_STRING_START+207)
#endif // _DESKTOP_HRC_
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index 6eb9a3ee1355..67651bc96f84 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -28,6 +28,16 @@
#include "desktop.hrc"
+String STR_RECOVER_QUERY
+{
+ Text [ en-US ] = "Should the file \"$1\" be restored?" ;
+};
+
+String STR_RECOVER_TITLE
+{
+ Text [ en-US ] = "File Recovery" ;
+};
+
WarningBox STR_RECOVER_PREPARED
{
Message [ en-US ] = "An unrecoverable error has occurred.\n\nAll modified files have been saved and can\nprobably be recovered at program restart." ;
@@ -48,6 +58,11 @@ String STR_BOOTSTRAP_ERR_PATH_INVALID
Text [ en-US ] = "The installation path is invalid.";
};
+String STR_BOOTSTRAP_ERR_NO_PATH
+{
+ Text [ en-US ] = "The installation path is not available.";
+};
+
String STR_BOOTSTRAP_ERR_INTERNAL
{
Text [ en-US ] = "An internal error occurred.";
@@ -88,11 +103,31 @@ 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.";
};
+String STR_CONFIG_ERR_SETTINGS_INCOMPLETE
+{
+ Text [ en-US ] = "The startup settings for accessing the central configuration are incomplete. ";
+};
+
+String STR_CONFIG_ERR_CANNOT_CONNECT
+{
+ Text [ en-US ] = "A connection to the central configuration could not be established. ";
+};
+
+String STR_CONFIG_ERR_RIGHTS_MISSING
+{
+ Text [ en-US ] = "You cannot access the central configuration because of missing access rights. ";
+};
+
String STR_CONFIG_ERR_ACCESS_GENERAL
{
Text [ en-US ] = "A general error occurred while accessing your central configuration. ";
};
+String STR_CONFIG_ERR_NO_WRITE_ACCESS
+{
+ Text [ en-US ] = "The changes to your personal settings cannot be stored centrally because of missing access rights. ";
+};
+
String STR_BOOTSTRAP_ERR_CFG_DATAACCESS
{
Text [ en-US ] = "%PRODUCTNAME cannot be started due to an error in accessing the %PRODUCTNAME configuration data.\n\nPlease contact your system administrator." ;
@@ -164,6 +199,11 @@ ErrorBox EBX_ERR_PRINTDISABLED
Message [ en-US ] = "Printing is disabled. No documents can be printed.";
};
+String STR_TITLE_EXPIRED
+{
+ Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION";
+};
+
String STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE
{
Text [ en-US ] = "The path manager is not available.\n";
diff --git a/desktop/source/deployment/registry/script/dp_script.hrc b/desktop/source/deployment/registry/script/dp_script.hrc
index ac7e7aae9fa6..2f95b3177cab 100644
--- a/desktop/source/deployment/registry/script/dp_script.hrc
+++ b/desktop/source/deployment/registry/script/dp_script.hrc
@@ -24,6 +24,7 @@
#define RID_STR_BASIC_LIB (RID_DEPLOYMENT_SCRIPT_START+10)
#define RID_STR_DIALOG_LIB (RID_DEPLOYMENT_SCRIPT_START+11)
+#define RID_STR_LIBNAME_ALREADY_EXISTS (RID_DEPLOYMENT_SCRIPT_START+15)
#define RID_STR_CANNOT_DETERMINE_LIBNAME (RID_DEPLOYMENT_SCRIPT_START+16)
#endif
diff --git a/desktop/source/deployment/registry/script/dp_script.src b/desktop/source/deployment/registry/script/dp_script.src
index fea7eaf0dbb9..4529835d38ac 100644
--- a/desktop/source/deployment/registry/script/dp_script.src
+++ b/desktop/source/deployment/registry/script/dp_script.src
@@ -33,3 +33,8 @@ String RID_STR_CANNOT_DETERMINE_LIBNAME
Text [ en-US ] = "The library name could not be determined.";
};
+String RID_STR_LIBNAME_ALREADY_EXISTS
+{
+ Text [ en-US ] = "This library name already exists. Please choose a different name.";
+};
+