From 807edd77e2df32d89703d5e550893b62d5973bc7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 16 Mar 2017 15:33:11 +0200 Subject: remove unused defines from HRC files in desktop Change-Id: Iae907966ef5bcde6b51aee8a987213c6c831bdc1 Reviewed-on: https://gerrit.libreoffice.org/35274 Tested-by: Jenkins Reviewed-by: Noel Grandin --- desktop/source/app/desktop.hrc | 9 --------- desktop/source/app/desktop.src | 45 ------------------------------------------ 2 files changed, 54 deletions(-) (limited to 'desktop/source/app') diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc index ac138ec18e47..c4f477ec7b54 100644 --- a/desktop/source/app/desktop.hrc +++ b/desktop/source/app/desktop.hrc @@ -25,14 +25,11 @@ // RID_FIRSTSTSTART_START 3000 #define RID_DESKTOP_STRING_START 10000 -#define STR_RECOVER_QUERY (RID_DESKTOP_STRING_START+0) -#define STR_RECOVER_TITLE (RID_DESKTOP_STRING_START+1) #define STR_QUERY_USERDATALOCKED (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) @@ -43,7 +40,6 @@ #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) @@ -52,17 +48,12 @@ #define STR_INTERNAL_ERRMSG (RID_DESKTOP_STRING_START+161) #define STR_LO_MUST_BE_RESTARTED (RID_DESKTOP_STRING_START+162) -#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) #define RID_APPTITLE (RID_DESKTOP_STRING_START+208) #endif diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src index 19962c277ba8..76eb81585790 100644 --- a/desktop/source/app/desktop.src +++ b/desktop/source/app/desktop.src @@ -19,16 +19,6 @@ #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" ; -}; - String STR_BOOTSTRAP_ERR_CANNOT_START { Text [ en-US ] = "The application cannot be started. "; @@ -44,11 +34,6 @@ 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."; @@ -84,41 +69,16 @@ 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."; }; -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." ; @@ -149,11 +109,6 @@ String STR_ERR_PRINTDISABLED Text [ 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"; -- cgit