[SHELL32]

- Use string IDs from rgs files
- Improve Polish translation

svn path=/trunk/; revision=54527

diff --git a/reactos/dll/win32/shell32/lang/pl-PL.rc b/reactos/dll/win32/shell32/lang/pl-PL.rc
index a0bba7f..e619fee 100644 (file)
--- a/reactos/dll/win32/shell32/lang/pl-PL.rc
+++ b/reactos/dll/win32/shell32/lang/pl-PL.rc
@@ -713,7 +713,7 @@ BEGIN
        IDS_COMMON_PICTURES         "Dokumenty\\Moje obrazy"
        IDS_COMMON_VIDEO            "Dokumenty\\Moje wideo"
        IDS_CDBURN_AREA             "Ustawienia lokalne\\Dane aplikacji\\Microsoft\\Nagrywanie dysków CD"
-       IDS_NETWORKPLACE            "Moja sieć"
+       IDS_NETWORKPLACE            "Moje miejsca sieciowe"
 
        IDS_NEWFOLDER               "Nowy katalog"
 

diff --git a/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs b/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs
index b84d0db..1c39e78 100644 (file)
--- a/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs
+++ b/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs
@@ -2,7 +2,7 @@ HKCR
 {
        NoRemove CLSID
        {
-               ForceRemove {645FF040-5081-101B-9F08-00AA002F954E}
+               ForceRemove {645FF040-5081-101B-9F08-00AA002F954E} = s 'Trash'
                {
                        val 'InfoTip' = e '@%%SystemRoot%%\system32\SHELL32.dll,-22915'
                        val 'IntroText' = e '@%%SystemRoot%%\system32\SHELL32.dll,-31748'

diff --git a/reactos/dll/win32/shell32/shresdef.h b/reactos/dll/win32/shell32/shresdef.h
index 67459e7..37f18db 100644 (file)
--- a/reactos/dll/win32/shell32/shresdef.h
+++ b/reactos/dll/win32/shell32/shresdef.h
@@ -42,7 +42,6 @@
 #define IDS_SHV_COLUMN_DELDATE      19
 
 #define IDS_DESKTOP                 20
-#define IDS_MYCOMPUTER              21
 
 #define IDS_SELECT                  22
 #define IDS_OPEN                    23
@@ -57,7 +56,6 @@
 #define IDS_SHUTDOWN_PROMPT         43
 
 #define IDS_PROGRAMS                45
-#define IDS_PERSONAL                46
 #define IDS_FAVORITES               47
 #define IDS_STARTUP                 48
 #define IDS_RECENT                  49
@@ -86,9 +84,6 @@
 #define IDS_DRIVE_FIXED             72
 #define IDS_DRIVE_CDROM             73
 #define IDS_DRIVE_NETWORK           74
-#define IDS_NETWORKPLACE            75
-#define IDS_FONTS                   76
-#define IDS_PRINTERS                77
 
 #define IDS_LOGOFF_TITLE            78
 #define IDS_LOGOFF_PROMPT           79
@@ -115,7 +110,6 @@
 #define FCIDM_SHVIEW_VIEW           147
 #define IDS_CONTROLPANEL            148
 #define IDS_NEWFOLDER               149
-#define IDS_FOLDER_OPTIONS          150
 #define IDS_COLUMN_EXTENSION        151
 #define IDS_NO_EXTENSION            152
 #define IDS_RECYCLEBIN_LOCATION     153
@@ -174,15 +168,21 @@
 #define IDS_CUT                     324
 #define IDS_RESTORE                 325
 #define IDS_DEFAULT_CLUSTER_SIZE    326
-#define IDS_ADMINISTRATIVETOOLS     327
 #define IDS_FORMATDRIVE             328
 #define IDS_RENAME                  329
 #define IDS_INSERT                  330
 #define IDS_DESCRIPTION             331
 #define IDS_COPY_OF                 332
 
-/* Note: this string is referenced from the registry */
-#define IDS_RECYCLEBIN_FOLDER_NAME   8964
+/* Note: those strings are referenced from the registry */
+#define IDS_RECYCLEBIN_FOLDER_NAME  8964
+#define IDS_ADMINISTRATIVETOOLS     22982
+#define IDS_FOLDER_OPTIONS          22985
+#define IDS_FONTS                   22981
+#define IDS_PRINTERS                9319
+#define IDS_MYCOMPUTER              9216
+#define IDS_PERSONAL                9227
+#define IDS_NETWORKPLACE            9217
 
 #define IDD_ICON                    0x4300
 #define IDD_MESSAGE                 0x4301