summaryrefslogtreecommitdiff
path: root/uui/source/ids.hrc
diff options
context:
space:
mode:
Diffstat (limited to 'uui/source/ids.hrc')
-rw-r--r--[-rwxr-xr-x]uui/source/ids.hrc46
1 files changed, 27 insertions, 19 deletions
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index 796186fd5140..c292befb1663 100755..100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -48,13 +48,15 @@
#define DLG_FILTER_SELECT (RID_UUI_START + 10)
// RID_UUI_START + 11 moved to ERRCODE_UUI_WRONGMEDIUM
#define DLG_UUI_MASTERPASSWORD (RID_UUI_START + 12)
+#define DLG_SIMPLE_NAME_CLASH (RID_UUI_START + 13)
#define STR_ERROR_PASSWORDS_NOT_IDENTICAL (RID_UUI_START + 13)
#define STR_ERROR_MASTERPASSWORD_WRONG (RID_UUI_START + 14)
// RID_UUI_START + 15, 16, 17 are misused by syncaccess/source/ui/resids.hrc
+
#define RID_UUI_ERRHDL (RID_UUI_START + 20)
#define DLG_UUI_MASTERPASSWORD_CRT (RID_UUI_START + 21)
#define DLG_UUI_PASSWORD (RID_UUI_START + 22)
-#define DLG_UUI_PASSWORD_CRT (RID_UUI_START + 23)
+#define STR_ERROR_SIMPLE_PASSWORD_WRONG (RID_UUI_START + 23)
#define STR_ERROR_PASSWORD_TO_OPEN_WRONG (RID_UUI_START + 24)
#define STR_ERROR_PASSWORD_TO_MODIFY_WRONG (RID_UUI_START + 25)
#define DLG_UUI_UNKNOWNAUTH (RID_UUI_START + 26)
@@ -89,6 +91,11 @@
#define STR_WARNING_BROKENSIGNATURE_TITLE (RID_UUI_START + 55)
#define STR_ENTER_PASSWORD_TO_OPEN (RID_UUI_START + 56)
#define STR_ENTER_PASSWORD_TO_MODIFY (RID_UUI_START + 57)
+#define STR_RENAME_OR_REPLACE (RID_UUI_START + 58)
+#define STR_NAME_CLASH_RENAME_ONLY (RID_UUI_START + 59)
+#define STR_SAME_NAME_USED (RID_UUI_START + 60)
+#define STR_ENTER_SIMPLE_PASSWORD (RID_UUI_START + 61)
+#define STR_CONFIRM_SIMPLE_PASSWORD (RID_UUI_START + 62)
#define ERRCODE_UUI_IO_ABORT (ERRCODE_AREA_UUI + 0)
#define ERRCODE_UUI_IO_ACCESSDENIED (ERRCODE_AREA_UUI + 1)
@@ -170,25 +177,26 @@
#define ERRCODE_UUI_SSLWARN_INVALID_1 (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 1)
#define TITLE_UUI_SSLWARN_INVALID (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 3)
-#define HID_DLG_LOGIN (HID_UUI_START + 0)
-#define HID_DLG_COOKIES (HID_UUI_START + 1)
-#define HID_DLG_MASTERPASSWORD_UUI (HID_UUI_START + 2)
-#define HID_DLG_MASTERPASSWORD_CRT (HID_UUI_START + 3)
-#define HID_DLG_FILTER_SELECT (HID_UUI_START + 4)
-#define HID_DLG_PASSWORD_UUI (HID_UUI_START + 5)
-#define HID_DLG_PASSWORD_CRT (HID_UUI_START + 6)
-#define HID_DLG_UNKNOWNAUTH_UUI (HID_UUI_START + 7)
-#define HID_DLG_SSLWARN_UUI (HID_UUI_START + 8)
-#define HID_XMLSECDLG_MACROWARN (HID_UUI_START + 9)
-#define HID_DLG_NEWERVERSIONWARNING (HID_UUI_START +10)
+#define HID_DLG_LOGIN "UUI_HID_DLG_LOGIN"
+#define HID_DLG_COOKIES "UUI_HID_DLG_COOKIES"
+#define HID_DLG_MASTERPASSWORD_UUI "UUI_HID_DLG_MASTERPASSWORD_UUI"
+#define HID_DLG_MASTERPASSWORD_CRT "UUI_HID_DLG_MASTERPASSWORD_CRT"
+#define HID_DLG_FILTER_SELECT "UUI_HID_DLG_FILTER_SELECT"
+#define HID_DLG_PASSWORD_UUI "UUI_HID_DLG_PASSWORD_UUI"
+#define HID_DLG_PASSWORD_CRT "UUI_HID_DLG_PASSWORD_CRT"
+#define HID_DLG_UNKNOWNAUTH_UUI "UUI_HID_DLG_UNKNOWNAUTH_UUI"
+#define HID_DLG_SSLWARN_UUI "UUI_HID_DLG_SSLWARN_UUI"
+#define HID_XMLSECDLG_MACROWARN "UUI_HID_XMLSECDLG_MACROWARN"
+#define HID_DLG_NEWERVERSIONWARNING "UUI_HID_DLG_NEWERVERSIONWARNING"
-#define HID_LOGIN_DLG_PATH (HID_UUI_START +11)
-#define HID_LOGIN_DLG_BROWSE (HID_UUI_START +12)
-#define HID_LOGIN_DLG_USER_NAME (HID_UUI_START +13)
-#define HID_LOGIN_DLG_PASSWORD (HID_UUI_START +14)
-#define HID_LOGIN_DLG_ACCOUNT (HID_UUI_START +15)
-#define HID_LOGIN_DLG_REMEMBER_PASSWORD (HID_UUI_START +16)
-#define HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS (HID_UUI_START +17)
+#define HID_LOGIN_DLG_PATH "UUI_HID_LOGIN_DLG_PATH"
+#define HID_LOGIN_DLG_BROWSE "UUI_HID_LOGIN_DLG_BROWSE"
+#define HID_LOGIN_DLG_USER_NAME "UUI_HID_LOGIN_DLG_USER_NAME"
+#define HID_LOGIN_DLG_PASSWORD "UUI_HID_LOGIN_DLG_PASSWORD"
+#define HID_LOGIN_DLG_ACCOUNT "UUI_HID_LOGIN_DLG_ACCOUNT"
+#define HID_LOGIN_DLG_REMEMBER_PASSWORD "UUI_HID_LOGIN_DLG_REMEMBER_PASSWORD"
+#define HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS "UUI_HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS"
+#define HID_DLG_SIMPLE_NAME_CLASH "UUI_HID_DLG_SIMPLE_NAME_CLASH"
// HID_UUI_END (aka HID_CHAOS_NEW_DATABASE) is reserved in
// sfx2/util/hidother.src