From a2481a3f6b4d482e9902bc93a609ee002f84e0c8 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Fri, 6 Jan 2012 09:57:08 +0100
Subject: [PATCH] comdlg32: Remove some unused string resources that are not
 present on Windows.

---
 dlls/comdlg32/comdlg32.rc      |  14 -
 dlls/comdlg32/filedlgbrowser.h |  13 -
 po/ar.po                       | 444 +++++++++++++++----------------
 po/bg.po                       | 454 +++++++++++++++----------------
 po/ca.po                       | 442 +++++++++++++++---------------
 po/cs.po                       | 454 +++++++++++++++----------------
 po/da.po                       | 464 +++++++++++++++-----------------
 po/de.po                       | 442 +++++++++++++++---------------
 po/el.po                       | 444 +++++++++++++++----------------
 po/en.po                       | 442 +++++++++++++++---------------
 po/en_US.po                    | 442 +++++++++++++++---------------
 po/eo.po                       | 464 +++++++++++++++-----------------
 po/es.po                       | 454 +++++++++++++++----------------
 po/fa.po                       | 444 +++++++++++++++----------------
 po/fi.po                       | 444 +++++++++++++++----------------
 po/fr.po                       | 442 +++++++++++++++---------------
 po/he.po                       | 442 +++++++++++++++---------------
 po/hi.po                       | 444 +++++++++++++++----------------
 po/hu.po                       | 464 +++++++++++++++-----------------
 po/it.po                       | 442 +++++++++++++++---------------
 po/ja.po                       | 442 +++++++++++++++---------------
 po/ko.po                       | 442 +++++++++++++++---------------
 po/lt.po                       | 442 +++++++++++++++---------------
 po/ml.po                       | 444 +++++++++++++++----------------
 po/nb_NO.po                    | 454 +++++++++++++++----------------
 po/nl.po                       | 442 +++++++++++++++---------------
 po/or.po                       | 444 +++++++++++++++----------------
 po/pa.po                       | 444 +++++++++++++++----------------
 po/pl.po                       | 442 +++++++++++++++---------------
 po/pt_BR.po                    | 452 +++++++++++++++----------------
 po/pt_PT.po                    | 462 +++++++++++++++-----------------
 po/rm.po                       | 442 +++++++++++++++---------------
 po/ro.po                       | 472 ++++++++++++++++-----------------
 po/ru.po                       | 442 +++++++++++++++---------------
 po/sk.po                       | 444 +++++++++++++++----------------
 po/sl.po                       | 444 +++++++++++++++----------------
 po/sr_RS@cyrillic.po           | 444 +++++++++++++++----------------
 po/sr_RS@latin.po              | 444 +++++++++++++++----------------
 po/sv.po                       | 444 +++++++++++++++----------------
 po/te.po                       | 444 +++++++++++++++----------------
 po/th.po                       | 444 +++++++++++++++----------------
 po/tr.po                       | 454 +++++++++++++++----------------
 po/uk.po                       | 444 +++++++++++++++----------------
 po/wa.po                       | 442 +++++++++++++++---------------
 po/wine.pot                    | 442 +++++++++++++++---------------
 po/zh_CN.po                    | 454 +++++++++++++++----------------
 po/zh_TW.po                    | 444 +++++++++++++++----------------
 47 files changed, 9521 insertions(+), 10628 deletions(-)

diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc
index 07ad427b60a..d9d4e7031c1 100644
--- a/dlls/comdlg32/comdlg32.rc
+++ b/dlls/comdlg32/comdlg32.rc
@@ -26,20 +26,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
-    IDS_ABOUTBOX            "&About FolderPicker Test"
-    IDS_DOCUMENTFOLDERS     "Document Folders"
-    IDS_PERSONAL            "My Documents"
-    IDS_FAVORITES           "My Favorites"
-    IDS_PATH                "System Path"
-    IDS_DESKTOP             "#msgctxt#display name#Desktop"
-    IDS_FONTS               "Fonts"
-    IDS_MYCOMPUTER          "My Computer"
-}
-
-STRINGTABLE
-{
-    IDS_SYSTEMFOLDERS       "System Folders"
-    IDS_LOCALHARDRIVES      "Local Hard Drives"
     IDS_FILENOTFOUND        "File not found"
     IDS_VERIFYFILE          "Please verify that the correct file name was given"
     IDS_CREATEFILE          "File does not exist.\nDo you want to create file?"
diff --git a/dlls/comdlg32/filedlgbrowser.h b/dlls/comdlg32/filedlgbrowser.h
index 7d556778ce2..e01c5a06a7d 100644
--- a/dlls/comdlg32/filedlgbrowser.h
+++ b/dlls/comdlg32/filedlgbrowser.h
@@ -97,22 +97,9 @@ typedef struct
 /***********************************************************************
  * Control IDs
  */
-#define IDS_ABOUTBOX                    101
-#define IDS_DOCUMENTFOLDERS             102
-#define IDS_PERSONAL                    103
-#define IDS_FAVORITES                   104
-#define IDS_PATH                        105
-#define IDS_DESKTOP                     106
-
-#define IDS_FONTS                       108
-#define IDS_MYCOMPUTER                  110
-#define IDS_SYSTEMFOLDERS               112
-#define IDS_LOCALHARDRIVES              113
 #define IDS_FILENOTFOUND                114
 #define IDS_VERIFYFILE                  115
 #define IDS_CREATEFILE                  116
-#define IDS_CREATEFOLDER_DENIED         117
-#define IDS_FILEOPEN_CAPTION            118
 #define IDS_OVERWRITEFILE		119
 #define IDS_INVALID_FILENAME_TITLE	120
 #define IDS_INVALID_FILENAME		121
diff --git a/po/ar.po b/po/ar.po
index d03033a8d03..2a05df4376a 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -52,8 +52,8 @@ msgstr ""
 msgid "Support Information"
 msgstr "معلومات"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -129,10 +129,10 @@ msgid "&Install"
 msgstr ""
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -277,11 +277,11 @@ msgstr ""
 msgid "Properties for %s"
 msgstr "اختر ال&كل\tCtrl+A"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr ""
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 #, fuzzy
 msgid "Help"
 msgstr "&مساعدة"
@@ -315,9 +315,9 @@ msgstr ""
 msgid "R&eset"
 msgstr ""
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -372,488 +372,446 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 #, fuzzy
 msgid "Open"
 msgstr "ا&فتح...\tCtrl+O"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 #, fuzzy
 msgid "File &Name:"
 msgstr "&مساعدة"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr ""
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 #, fuzzy
 msgid "List Files of &Type:"
 msgstr "&مساعدة"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr ""
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr ""
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 #, fuzzy
 msgid "Save As..."
 msgstr "احفظ &ك‍..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 #, fuzzy
 msgid "Save As"
 msgstr "احفظ &ك‍..."
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr ""
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 #, fuzzy
 msgid "Printer:"
 msgstr "ا&طبع...\tCtrl+P"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 #, fuzzy
 msgid "Print range"
 msgstr "اح&ذف\tDel"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr ""
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 #, fuzzy
 msgid "S&election"
 msgstr "اختر ال&كل\tCtrl+A"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 #, fuzzy
 msgid "&Pages"
 msgstr "صفحة &p"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 #, fuzzy
 msgid "&Setup"
 msgstr "إعداد الصفحة"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr ""
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr ""
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr ""
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 #, fuzzy
 msgid "Print to Fi&le"
 msgstr "ملفات النصوص (*.txt)"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr ""
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 #, fuzzy
 msgid "Print Setup"
 msgstr "إعداد الطاب&عة..."
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 #, fuzzy
 msgid "Printer"
 msgstr "ا&طبع...\tCtrl+P"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr ""
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr ""
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr ""
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 #, fuzzy
 msgid "Orientation"
 msgstr "معلومات"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr ""
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr ""
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr ""
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr ""
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr ""
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 #, fuzzy
 msgid "Font"
 msgstr "ال&خط..."
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 #, fuzzy
 msgid "&Font:"
 msgstr "ال&خط..."
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr ""
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr ""
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr ""
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr ""
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr ""
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr ""
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr ""
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr ""
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr ""
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr ""
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr ""
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr ""
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr ""
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr ""
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr ""
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr ""
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr ""
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr ""
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr ""
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr ""
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr ""
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr ""
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr ""
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr ""
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 #, fuzzy
 msgid "Direction"
 msgstr "معلومات"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr ""
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr ""
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr ""
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr ""
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr ""
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 #, fuzzy
 msgid "&Replace"
 msgstr "ا&ستبدل...\tCtrl+H"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 #, fuzzy
 msgid "Replace &All"
 msgstr "اختر ال&كل\tCtrl+A"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 #, fuzzy
 msgid "Print to fi&le"
 msgstr "ملفات النصوص (*.txt)"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr ""
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr ""
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr ""
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr ""
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr ""
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 #, fuzzy
 msgid "Comment:"
 msgstr "الم&حتويات"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr ""
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr ""
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr ""
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr ""
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 #, fuzzy
 msgid "&Selection"
 msgstr "اختر ال&كل\tCtrl+A"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr ""
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr ""
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr ""
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr ""
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr ""
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr ""
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr ""
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr ""
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr ""
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr ""
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 #, fuzzy
 msgid "L&eft:"
 msgstr "ال&يسار:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "الي&مين:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr ""
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "الأس&فل:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 #, fuzzy
 msgid "P&rinter..."
 msgstr "ا&طبع...\tCtrl+P"
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr ""
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 #, fuzzy
 msgid "File &name:"
 msgstr "&مساعدة"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 #, fuzzy
 msgid "Files of &type:"
 msgstr "&مساعدة"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr ""
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr ""
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&مساعدة"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "&مساعدة"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr ""
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr ""
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr ""
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr ""
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr ""
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr ""
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-#, fuzzy
-msgid "Fonts"
-msgstr "ال&خط..."
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr ""
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr ""
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr ""
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr ""
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr ""
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 #, fuzzy
 msgid ""
 "File does not exist.\n"
@@ -863,7 +821,7 @@ msgstr ""
 "\n"
 "أتريد إنشاء ملف جديد؟"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 #, fuzzy
 msgid ""
 "File already exists.\n"
@@ -873,330 +831,330 @@ msgstr ""
 "\n"
 "أتريد إنشاء ملف جديد؟"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr ""
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
 msgstr ""
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr ""
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr ""
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr ""
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr ""
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr ""
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr ""
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr ""
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr ""
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr ""
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr ""
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr ""
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr ""
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr ""
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr ""
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr ""
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr ""
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr ""
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr ""
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr ""
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr ""
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr ""
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr ""
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr ""
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr ""
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
 msgstr ""
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr ""
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
 msgstr ""
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr ""
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
 msgstr ""
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr ""
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr ""
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr ""
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr ""
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr ""
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr ""
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 msgstr ""
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr ""
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr ""
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 #, fuzzy
 msgid "Save &in:"
 msgstr "احفظ &ك‍..."
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr ""
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 #, fuzzy
 msgid "Open File"
 msgstr "&مساعدة"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr ""
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr ""
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr ""
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr ""
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr ""
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr ""
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr ""
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr ""
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 #, fuzzy
 msgid "Printer offline; "
 msgstr "ملفات النصوص (*.txt)"
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr ""
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr ""
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr ""
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr ""
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 #, fuzzy
 msgid "Not available; "
 msgstr "معلومات"
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr ""
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr ""
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr ""
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr ""
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr ""
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr ""
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 #, fuzzy
 msgid "Page punt; "
 msgstr "صفحة &p"
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr ""
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr ""
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr ""
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr ""
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr ""
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr ""
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr ""
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr ""
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr ""
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr ""
@@ -7833,6 +7791,15 @@ msgstr ""
 msgid "Date deleted"
 msgstr "اح&ذف\tDel"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr ""
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr ""
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -7862,6 +7829,10 @@ msgstr ""
 msgid "Start Menu\\Programs"
 msgstr ""
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr ""
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr ""
@@ -13215,6 +13186,11 @@ msgstr ""
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+#, fuzzy
+msgid "Fonts"
+msgstr "ال&خط..."
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 72fae95ccc0..71980ecfc00 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -55,8 +55,8 @@ msgstr "Пре&махни"
 msgid "Support Information"
 msgstr "Информация"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -140,10 +140,10 @@ msgid "&Install"
 msgstr "Инсталирай"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -292,11 +292,11 @@ msgstr "Инсталиране..."
 msgid "Properties for %s"
 msgstr "Свойства на %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Потвърди"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Помощ"
 
@@ -329,9 +329,9 @@ msgstr "&Затвори"
 msgid "R&eset"
 msgstr "&Възстанови"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -386,467 +386,420 @@ msgstr "Днес:"
 msgid "Go to today"
 msgstr "Иди на днес"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Отвори"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "&Име на файл:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Директории:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "&Тип файлове:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Устройства:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "Само за &четене"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Съхрани като..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Съхрани като"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Печат"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Принтер:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Разпечатай"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Всичко"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "&Избраното"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Страници"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Настройки"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&От:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&До:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&Качество:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Печат във &файл"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Сгъстено"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Настройки на печатането"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Принтер"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "Принтер по под&разбиране"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[няма]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Друг &принтер"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Ориентация"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "Пор&трет"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "Пейза&ж"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Хартия"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "Раз&мер"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Източник"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Шрифт"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Шрифт:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "&Стил:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "Размер:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Ефекти"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Зачертан"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "Под&чертан"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "Цвят:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Пример"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "&Азбука:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Цвят"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Основни цветове:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Потребителски цветове:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Цвят|&Плътен"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Червено:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Зелено:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Синьо:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Тон:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Наситеност:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Осветеност:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Добави потребителски цвят"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Определи цветове >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Търсене"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "Търси &за:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "&Само цели думи"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "&Чувствителен регистър"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Посока"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "На&горе"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "На&долу"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Намери следващ"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Замяна"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "За&мяна с:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Замени"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Замени &всички"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Печат във &файл"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "Сво&йства"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Име:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Състояние:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Тип:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Място:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Коментар:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Копия"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Брой &копия:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "Под&реждане"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "&Страници"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Избраното"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&от:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&до:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Size:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Източник:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "Пор&трет"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "Пейза&ж"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Настройки на страницата"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Контейнер:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "Пор&трет"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Рамки"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&Лява:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "Дя&сна:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&Горна:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "Ля&ва:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "&Принтер..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "М&ясто:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "&Име на файл:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "&Тип файлове:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Само за &четене"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Отвори"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Файл"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "&Тип файлове:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&Относно FolderPicker теста"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Папки с документи"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Моите документи"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Отметки"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Системен път"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Работен плот"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Шрифтове"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-#, fuzzy
-msgid "My Computer"
-msgstr ""
-"#-#-#-#-#  bg.po (Wine)  #-#-#-#-#\n"
-"Моят компютър\n"
-"#-#-#-#-#  bg.po (Wine)  #-#-#-#-#\n"
-"Моя компютър"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Системни папки"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Локални устройства"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Файлът не е намерен"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Проверете дали сте въвели правилно името на файла"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -854,7 +807,7 @@ msgstr ""
 "Файлът не съществува.\n"
 "Искате ли да го създадете?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -862,11 +815,11 @@ msgstr ""
 "Файлът вече съществува.\n"
 "Искате ли да го замените?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Невалидни знаци в пътя"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -874,119 +827,119 @@ msgstr ""
 "Името на файла не може да съдържа следните символи:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Пътят не съществува"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Файлът не съществува"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Едно ниво нагоре"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Създай нова папка"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Списък"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Подробности"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Премини към работния плот"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Черно"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Шатен"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Зелен"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Маслинен"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Тъмносин"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Морав"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Синьозелен"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Сив"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Сребърен"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Червен"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Жълтозелен"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Жълт"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Син"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Пурпурен"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Аквамарин"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Бяло"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Нечетим елемент"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -995,11 +948,11 @@ msgstr ""
 "Невалиден номер на страница.\n"
 "Използвайте стойности между %d и %d."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "Стойността 'от' не може да е по-голяма от стойността 'до'."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1007,12 +960,12 @@ msgstr ""
 "Границите се препокриват или излизат извън края на страницата.\n"
 "Коригирайте ги."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Трябва да въведете брой копия, които да бъдат отпечатани."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1020,31 +973,31 @@ msgstr ""
 "Въвели сте по-голям брой копия, отколкото вашият принтер поддържа.\n"
 "Въведете число между 1 и %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Появи се грешка при печатането."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Не е зададен принтер по подразбиране."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Принтерът не може да бъде намерен."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Недостиг на памет."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Появи се грешка."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Непознат драйвер за принтера."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1053,148 +1006,148 @@ msgstr ""
 "страницата или разпечатване на документ, само ако имате инсталиран принтер. "
 "Инсталирайте принтер и опитайте отново."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Изберете размер на шрифта между %d и %d пункта."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Съхрани"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Съхрани &в:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Съхрани"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Отвори файл"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Готово"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Преустановено; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Грешка; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Предстоящо изтриване; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Задръстване на хартията; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Няма хартия; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Поставете хартия ръчно; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Проблем с хартията; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Принтера изключен; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "Вход/Изход активен; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Зает; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Печати; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Изходния контейнер е пълен; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Не е наличен; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Изчакване; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Обработка; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Подготовка; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Загряване; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Тонера на привършване; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Няма тонер; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Подаване на хартията; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Прекъснато от потребителя; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Недостиг на памет; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Капака на принтера е отворен; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Неизвестен принтер сървър; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Режим на пестене на енергия; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Принтер по подразбиране; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Има %d документа в опашката"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Граници [инчове]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Граници [мм]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 #, fuzzy
 msgctxt "unit: millimeters"
 msgid "mm"
@@ -7954,6 +7907,21 @@ msgstr ""
 msgid "Date deleted"
 msgstr ""
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Работен плот"
+
+#: shell32.rc:154 regedit.rc:200
+#, fuzzy
+msgid "My Computer"
+msgstr ""
+"#-#-#-#-#  bg.po (Wine)  #-#-#-#-#\n"
+"Моят компютър\n"
+"#-#-#-#-#  bg.po (Wine)  #-#-#-#-#\n"
+"Моя компютър"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -7982,6 +7950,10 @@ msgstr "Искате ли да прекратите вашата Wine сесия
 msgid "Start Menu\\Programs"
 msgstr "Start Menu\\Programs"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Моите документи"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favorites"
@@ -13410,6 +13382,10 @@ msgstr "&Задай..."
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Шрифтове"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index f77b486e168..ec654098226 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -56,8 +56,8 @@ msgstr "T&reu"
 msgid "Support Information"
 msgstr "Informació de Suport"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -138,10 +138,10 @@ msgid "&Install"
 msgstr "&Instal·la"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -290,11 +290,11 @@ msgstr "Cancel·lant..."
 msgid "Properties for %s"
 msgstr "Propietats de %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Aplica"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Ajuda"
 
@@ -327,9 +327,9 @@ msgstr "&Tanca"
 msgid "R&eset"
 msgstr "R&einicia"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -383,459 +383,418 @@ msgstr "Avui:"
 msgid "Go to today"
 msgstr "Anar a avui"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Obre"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "&Nom de Fitxer:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Directoris:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "&Tipus de fitxers:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Unitats:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Només Lectura"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Anomenar i desar..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Anomenar i Desar"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Imprimeix"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Impressora:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Interval d'impressi"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Tot"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "&Selecció"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "Pà&gines"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Configuració"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&De:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&A:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&Qualitat d'Impressió:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Imprimir a un &Fitxer"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Condensat"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Configuració d'Impressió"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Impressora:"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "Impressora per &Defecte"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[cap]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Impressora &Específica:"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Orientació"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "&Vertical"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Horizontal"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Paper"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Mida"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Font:"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Tipus de Lletra"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Tipus de lletra:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "&Estil del Tipus de Lletra:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Mida:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Efectes"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Ratllat"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Subratllat"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Color:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Exemple"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Scr&ipt:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Color"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "Colors &Básics:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "Colors &Personalitzats:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Color |  Sòl&id"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "Ver&mell:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "Ver&d:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Blau:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Ton.:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Sat.:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Llum.:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Afegeix als Colors Personalitzats"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Defineix els Colors Personalitzats >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Cerca"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Cerca Por:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Troba només paraules &completes"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "&Distingir majúscules de minúscules"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Direcció"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "A&munt"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "A &Baix"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Continuació"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Substitució"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "&Substituir per:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "S&ubstitució"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Substitució &automàtica"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Imprimeix a &fitxer"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Propietats"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Nom:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Estat:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Tipus:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "On:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Comentari:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Copies"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Nombre de &copies:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "C&ompagina"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "Pa&ges"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Selecci"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&de:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&a:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Mi&da:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Font:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "&Vertical"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "&Horizontal"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Configuració de la Pgina"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Safata:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Vertical"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Vores"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&Esquerra:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Dreta:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "S&uperior:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Inferior:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "Imp&ressora..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "Cerca &en:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "&Nom de fitxer:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Fitxers de &tipus:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Obre per només &lectura"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Obre"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr "Nom de fitxer:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr "Fitxers de tipus:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "Qu&ant a la prova FolderPicker"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Carpetes de Documents"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Els meus documents"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Els meus preferits"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Ruta del Sistema"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Escriptori"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Fonts"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "El meu ordinador"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Carpetes de Sistema"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Discs Durs Locals"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Fitxer no trobat"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Si us plau, verifiqueu que es hagués donat el nom correct del fitxer"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -843,7 +802,7 @@ msgstr ""
 "El fitxer no existeix.\n"
 "El voleu crear?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -851,11 +810,11 @@ msgstr ""
 "El fitxer ja existeix.\n"
 "El voleu reemplaçar?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Hi ha caràcters invàlids en la ruta"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -863,119 +822,119 @@ msgstr ""
 "Un nom de fitxer no pot contenir cualsevol dels caràcters següents:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "La ruta no existeix"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "El fitxer no existeix"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Un Nivell Amunt"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Crear Nova Carpeta"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Llista"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Detalls"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Anar a Escriptori"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Regular"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Negreta"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Cursiva"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Negreta Cursiva"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Negre"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Granat"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Verd"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Oliva"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Marí"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Porpra"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Xarxet"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Gris"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Plata"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Vermell"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Llima"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Groc"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Blau"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Fúcsia"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Aigua"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Blanc"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Entrada Il·legible"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
@@ -983,11 +942,11 @@ msgstr ""
 "Aquest valor no cau entre l'abast de la pàgina.\n"
 "Si us plau, introdueix un valor entre %1!d! i %2!d!."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "La entrada 'de' no pot superar la entrada 'a'."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -995,11 +954,11 @@ msgstr ""
 "Els marges es superposen o cauen fora dels límits de la pàgina.\n"
 "Si us plau, reintrodueix els marges."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "El camp 'Nombre de còpies' no pot estar buit."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1007,31 +966,31 @@ msgstr ""
 "Aquest gran nombre de còpies no és compatible amb la vostre impressora.\n"
 "Si us plau, introduïu un valor entre 1 i %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "S'ha produït un error d'impressora."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "No s'ha seleccionat cap impressora predeterminada."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "No es pot trobar la impressora."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "No queda memòria."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Un error s'ha produït."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Controlador d'impressora desconegut."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1040,147 +999,147 @@ msgstr ""
 "configurar la pàgina o imprimir un document, cal instal·lar una impressora. "
 "Si us plau, instal·leu una i torneu a intentar."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Seleccioneu una mida de lletra entre %1!d! i %2!d! punts."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Desa"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Desa &en:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Desa"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Obre Fitxer"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Llest"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Pausada; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Error; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Pendent d'eliminació; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Embús de paper; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "No queda paper; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Introduir paper manualment; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Problema de paper; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Impressora fora de línea; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "E/S Actius; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Ocupada; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Imprimint; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "La safata de sortida està plena; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "No disponible; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Esperant; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Realitzant; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Inicialitzant; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Escalfant; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Tòner baix; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Falta tòner; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Expulsió de pàgina; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Interromput per usuari; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "No queda memòria; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "La porta de la impressora està oberta; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Servidor d'impresió desconegut; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Mode d'estalvi d'energia; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Impressora Predeterminada; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Hi ha %d documents en la cua"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Marges [polzades]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Marges [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "unidad: mil·límetres"
@@ -7871,6 +7830,15 @@ msgstr "Ubicació original"
 msgid "Date deleted"
 msgstr "Data suprimit"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Escriptori"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "El meu ordinador"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Panell de Control"
@@ -7899,6 +7867,10 @@ msgstr "Voleu aturar la vostre sessió del Wine?"
 msgid "Start Menu\\Programs"
 msgstr "Menú d'Inici\\Programes"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Els meus documents"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Preferits"
@@ -13731,6 +13703,10 @@ msgstr "&Defineix..."
 msgid "History"
 msgstr "Historia"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Fonts"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Petit"
diff --git a/po/cs.po b/po/cs.po
index 0fc4246bc5c..edf58e69bb4 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -54,8 +54,8 @@ msgstr "Odeb&rat DLL náhradu"
 msgid "Support Information"
 msgstr "Informace"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -134,10 +134,10 @@ msgid "&Install"
 msgstr "Instalovat téma..."
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -291,11 +291,11 @@ msgstr ""
 msgid "Properties for %s"
 msgstr "Vlastnosti %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Použít"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Nápověda"
 
@@ -328,9 +328,9 @@ msgstr "&Zavřít"
 msgid "R&eset"
 msgstr "&Výchozí"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -389,467 +389,420 @@ msgstr "Dnes:"
 msgid "Go to today"
 msgstr "Jdi na dnešek"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Otevřít"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "&Jméno souboru:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Adresáře:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "&Typ zobrazených souborů:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Diskové jednotky:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Pouze pro čtení"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Ulož pod jménem..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Ulož pod jménem"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Tisk"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Tiskárna:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Rozsah tisku"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "VÅ¡&e"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "&Výběr"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Zadané stránky"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Nastavit..."
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&Od:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&Do:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "Kvalita &tisku:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Tisk do so&uboru"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Kondenzované"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Nastavení tisku"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Tiskárna"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Výchozí tiskárna"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[none]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Specifická &tiskárna"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Orientace"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "Na &výšku"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "N&a šířku"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Papír"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Formát"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Zdroj"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Písmo"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "Pí&smo:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "St&yl:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "Velikost"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Efekty"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "Přeš&krtnutí"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Podtržení"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "Barva:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Ukázka"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "Příliš žluťoučký kůň úpěl ďábelské ódy"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Skr&ipt:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Barvy"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Základní barvy:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Barvy na zakázku:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Barva|Spoj&itá"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "Če&rvená:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Zelená:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Modrá:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Odstín:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Sytost:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Jas:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Přidat k vlastním barvám"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Definovat vlastní barvu >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Hledání"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Vyhledat:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Pouze &celá slova"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "&Rozlišovat velikost"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Směr"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "Nahor&u"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "&Dolů"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "Najít d&alší"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Nahrazení"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "&Zaměnit za:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "Za&měnit"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Zaměni&t vše"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Tisk do so&uboru"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Vlastnosti"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Název:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Status:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Typ:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Umístění:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Komentář:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Kopie"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Počet &kopií:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "K&ompletovat"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "St&ránky"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "Vý&běr"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&od:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&do:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Velikost:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "Z&droj:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "Na výšk&u"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "N&a šířku"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Nastavení stránky"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Tray:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Na výšku"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Okraje"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "L&evý:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "P&ravý:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "H&orní:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Dolní:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "Tiská&rna..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "Náh&led:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "&Název souboru:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Soubory &typu:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Jen ke čt&ení"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Otevřít"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Název souboru:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "Soubory &typu:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&O FolderPicker testu"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Složky dokumentů"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Dokumenty"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Oblíbené"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Systémový adresář"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Plocha"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Písma"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-#, fuzzy
-msgid "My Computer"
-msgstr ""
-"#-#-#-#-#  cs.po (Wine)  #-#-#-#-#\n"
-"Tento počítač\n"
-"#-#-#-#-#  cs.po (Wine)  #-#-#-#-#\n"
-"Můj počítač"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Systémové složky"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Místní jednotky pevných disků"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Soubor nebyl nalezen"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Ověřte prosím, že název souboru byl zadán správně"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -857,7 +810,7 @@ msgstr ""
 "Soubor neexistuje.\n"
 "Chcete ho vytvořit?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -865,11 +818,11 @@ msgstr ""
 "Soubor již existuje.\n"
 "Chcete ho přepsat novým?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Nedovolený(é) znak(y) v cestě k souboru"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -877,119 +830,119 @@ msgstr ""
 "Název souboru nesmí obsahovat žádný z následujících znaků:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Adresář neexistuje"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Soubor neexistuje"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "O jednu úroveň výše"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Vytvořit novou složku"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Výpis"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Prohlížet plochu"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "černá"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "hnědá"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "zelená"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "olivová"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "námořní"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "nachová"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "sivá"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "šedá"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "stříbrná"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "červená"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "citronová"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "žlutá"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "modrá"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "fuchsiová"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "vodová"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "bílá"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Nečitelný vstup"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -998,11 +951,11 @@ msgstr ""
 "Tato hodnota přesahuje možnosti stránky.\n"
 "Zadejte prosím hodnotu mezi %d a %d."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "Hodnota 'Od' nemůže překročit hodnotu 'Do'."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1010,12 +963,12 @@ msgstr ""
 "Dosažení nebo přesah okrajů tisknutelné oblasti.\n"
 "Zadejte prosím jiné okraje."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Počet kopií musí být' zadán."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1023,19 +976,19 @@ msgstr ""
 "Tak velké množství kopií není podporováno Vaší tiskárnou.\n"
 "Zadejte prosím hodnotu mezi 1 a %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Nastala chyba tisku."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Výchozí tiskárna neexistuje."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Nemohu najít tiskárnu."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 #, fuzzy
 msgid "Out of memory."
 msgstr ""
@@ -1044,162 +997,162 @@ msgstr ""
 "#-#-#-#-#  cs.po (Wine)  #-#-#-#-#\n"
 "Dostupná paměť byla vyčerpána."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Vyskytla se chyba."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Neznámý ovladač tiskárny."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 msgstr ""
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Určete velikost fontu mezi %d a %d body."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Uložit"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Ulož&it v:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Uložit"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Otevřít soubor"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Připraven"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Pozastaven; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Chyba; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Probíhá mazání; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Zaseknutý papír; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Došel papír; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Ruční zakládání papíru; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Problém s papírem; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Tiskárna je nedostupná; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "Přenos dat; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Pracuji; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Tiskne se; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Výstupní zásobník je plný; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Není k dispozici; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Čeká se; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Zpracovává se; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Inicializuje se; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Zahřívá se; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Dochází toner; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Došel toner; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Zařazování; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Přerušeno uživatelem; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Dostupná paměť byla vyčerpána; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Kryt tiskárny je otevřen; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Neznámý tiskový server; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Úsporný režim; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Výchozí tiskárna; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Ve frontě je %d dokumentů"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Okraje [palce]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Okraje [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 #, fuzzy
 msgctxt "unit: millimeters"
 msgid "mm"
@@ -8022,6 +7975,21 @@ msgstr ""
 msgid "Date deleted"
 msgstr ""
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Plocha"
+
+#: shell32.rc:154 regedit.rc:200
+#, fuzzy
+msgid "My Computer"
+msgstr ""
+"#-#-#-#-#  cs.po (Wine)  #-#-#-#-#\n"
+"Tento počítač\n"
+"#-#-#-#-#  cs.po (Wine)  #-#-#-#-#\n"
+"Můj počítač"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -8050,6 +8018,10 @@ msgstr ""
 msgid "Start Menu\\Programs"
 msgstr ""
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Dokumenty"
+
 #: shell32.rc:201
 #, fuzzy
 msgid "Favorites"
@@ -13853,6 +13825,10 @@ msgstr "Při&dat..."
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Písma"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 572e4d1d019..d6af0697298 100644
--- a/po/da.po
+++ b/po/da.po
@@ -56,8 +56,8 @@ msgstr "&Fjern"
 msgid "Support Information"
 msgstr "Support Information"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -137,10 +137,10 @@ msgid "&Install"
 msgstr "&Installer"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -293,11 +293,11 @@ msgstr "Annullering..."
 msgid "Properties for %s"
 msgstr "Egenskaper for %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Anvend"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Hjælp"
 
@@ -330,9 +330,9 @@ msgstr "&Luk"
 msgid "R&eset"
 msgstr "N&ulstil"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -387,472 +387,420 @@ msgstr "Idag:"
 msgid "Go to today"
 msgstr "GÃ¥ til i dag"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Ã…ben"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "&Filnavn:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Kataloger:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "&Oversigt over filer af type:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Drev:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "Sk&rivebeskyttet"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Gem som..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Gem som"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Udskriv"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Printer:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Udskriv område"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Alt"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "&Markeret"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Sider"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Indstilling"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&Fra:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&Til:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&Udskriftskvalitet:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Udskriv til fi&l"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Sammentrykket"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Udskriftsindstilling"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Printer"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Standardprinter"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[none]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Specifik &printer"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Retning"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "Po&rtræt"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Landskab"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Papir"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "Størrelse"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Kilde"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Skrifttyper"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "Skrifttype&navn:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "&Typografi:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Størrelse:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Effekter"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Gennemstreget"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Understreget"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Farve:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Eksempel"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Scr&ipt (translate):"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Farve"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Grundlæggende farver:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Selvvalgte farver:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "&Ensfarvet"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Rød:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Grøn:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Blå:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Intensitet:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Farvemætning:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Lysstyrke:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Tilføj til selvvalgte farver"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Definer selvvalgt farve >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Find"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Find hvad:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "&Kun hele ord"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "Forskel på store/små &bogstaver"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Retning"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Op"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "Ne&d"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Find næste"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Erstat"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "&Erstat med:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Erstat"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Erstat &alle"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Udskriv til fi&l"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Egenskaber"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Navn:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Status:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Type:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Hvor:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Kopier"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Antal &kopier:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "&hold sammen"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "Si&der"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Markeret"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&fra:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&til:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "S&tørrelse:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Kilde:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "P&ortræt"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "L&andskab"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Papir opsætning"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Bakke:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Portræt"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Kanter"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&Venstre:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Højre:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "T&op:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Bund:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "P&rinter..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "Kig &i:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "&Filnavn:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Fil&type:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Ã…bn som &skrivebeskyttet"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Ã…bn"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Filnavn:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "Fil&type:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&Om FolderPicker Test"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Dokument foldere"
-
-#: comdlg32.rc:31 shell32.rc:200
-#, fuzzy
-msgid "My Documents"
-msgstr ""
-"#-#-#-#-#  da.po (Wine)  #-#-#-#-#\n"
-"Mine Dokumenter\n"
-"#-#-#-#-#  da.po (Wine)  #-#-#-#-#\n"
-"Mine dokumenter"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Mine favoriter"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "System sti"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Skrivebord"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Skrifttype"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-#, fuzzy
-msgid "My Computer"
-msgstr ""
-"#-#-#-#-#  da.po (Wine)  #-#-#-#-#\n"
-"Min Computer\n"
-"#-#-#-#-#  da.po (Wine)  #-#-#-#-#\n"
-"Min computer"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "System mapper"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Lokale harddiske"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Kunne ikke finde filen"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Kontroller venligst, at der blev angivet et korrekt filnavn"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -860,7 +808,7 @@ msgstr ""
 "Filen eksisterer ikke.\n"
 "Vil du oprette filen?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -868,11 +816,11 @@ msgstr ""
 "Filen findes allerede.\n"
 "Vil du erstatte den?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Der er et eller flere Ugyldige tegn i stien"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -880,119 +828,119 @@ msgstr ""
 "Et filnavn må ikke indeholde følgende tegn:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Stien eksisterer ikke."
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Filen eksisterer ikke."
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Et niveau op"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Opret ny mappe"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Liste"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Detaljer"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Gennemse skrivebordet"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Normal"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Fed"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Kursiv"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Fed Kursiv"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Sort"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Mørkerød"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Grøn"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Oliven"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Navy"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Lilla"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Teal"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Grå"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Sølv"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Rød"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Lime"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Gul"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Blå"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Violet"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Cyan"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Hvid"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Ulæselig Post"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -1001,11 +949,11 @@ msgstr ""
 "Denne værdi ligger ikke indenfor sideområde.\n"
 "Indtast en værdi mellem %d og %d."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "'fra' kan ikke overstige 'til'."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1013,12 +961,12 @@ msgstr ""
 "Margenen overlapper eller er uden for papirets kanter.\n"
 "Genindtast Margin."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Værdien af 'Antal kopier' kan ikke være tomt."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1026,19 +974,19 @@ msgstr ""
 "Det store antal af kopier er ikke understøttet af din printer.\n"
 "Angiv en værdi mellem 1 og %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Der opstod en printer fejl."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Ingen standard printer defineret."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Kan ikke finde printeren."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 #, fuzzy
 msgid "Out of memory."
 msgstr ""
@@ -1047,15 +995,15 @@ msgstr ""
 "#-#-#-#-#  da.po (Wine)  #-#-#-#-#\n"
 "Ikke mere hukommelse."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Der opstod en fejl."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Ukendt printer driver."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1064,148 +1012,148 @@ msgstr ""
 "udskrivning af dokumenter, skal du installere en printer. Installer venligst "
 "en og prøv igen."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Vælg en skrift størrelse mellem %d og %d punkter."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Gem"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Gem &i:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Gem"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Ã…ben fil"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Klar"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Pauset; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Fejl; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Venter på sletning; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Papir kludder; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Ikke mere papir; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Indsæt papir manuelt; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Papir problem; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Printer slukket; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "I/O Aktiv; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Igang; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Udskriver; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Udskrivningbakken er fuld; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Ikke tilgængelig; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Venter; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Tænker; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Klargører; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Varmer op; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Toner næsten slut; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Ikke mere toner; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Page punt; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Stoppet af brugeren; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Ikke mere hukommelse; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Printer låget er åben; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Print server ukendt; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Energispare mode; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Standard printer; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Der er %d dokumenter in køen"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Margener [tommer]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Margener [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -8036,6 +7984,21 @@ msgstr "Original sted"
 msgid "Date deleted"
 msgstr "Dato slettet"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Skrivebord"
+
+#: shell32.rc:154 regedit.rc:200
+#, fuzzy
+msgid "My Computer"
+msgstr ""
+"#-#-#-#-#  da.po (Wine)  #-#-#-#-#\n"
+"Min Computer\n"
+"#-#-#-#-#  da.po (Wine)  #-#-#-#-#\n"
+"Min computer"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Control Panel"
@@ -8064,6 +8027,15 @@ msgstr "Vil du lukke din Wine session?"
 msgid "Start Menu\\Programs"
 msgstr "Start Menu\\Programmer"
 
+#: shell32.rc:200
+#, fuzzy
+msgid "My Documents"
+msgstr ""
+"#-#-#-#-#  da.po (Wine)  #-#-#-#-#\n"
+"Mine Dokumenter\n"
+"#-#-#-#-#  da.po (Wine)  #-#-#-#-#\n"
+"Mine dokumenter"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favoriter"
@@ -13935,6 +13907,10 @@ msgstr "&Definer..."
 msgid "History"
 msgstr "History"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Skrifttype"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Small"
diff --git a/po/de.po b/po/de.po
index ecf2fe2b2be..3201d8d5adc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -56,8 +56,8 @@ msgstr "&Entfernen"
 msgid "Support Information"
 msgstr "Informationen"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -139,10 +139,10 @@ msgid "&Install"
 msgstr "&Installieren"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -289,11 +289,11 @@ msgstr "Abbrechen..."
 msgid "Properties for %s"
 msgstr "Eigenschaften für %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Anwenden"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "&Hilfe"
 
@@ -326,9 +326,9 @@ msgstr "&Schließen"
 msgid "R&eset"
 msgstr "&Zurücksetzen"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -382,459 +382,418 @@ msgstr "Heute:"
 msgid "Go to today"
 msgstr "Gehe zu Heute"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Öffnen"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "Datei&name:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Verzeichnisse:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Liste der Datei&typen:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Laufwerke:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Schreibgeschützt"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Speichern als..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Speichern als"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Drucken"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Drucker:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Druck Bereich"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Alles"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "A&uswahl"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Seiten"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Einrichten"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&Von:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&Bis:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "Druck&qualität:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "In &Datei drucken"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Verdichtet"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Druckereinrichtung"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Drucker"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Standarddrucker"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[keiner]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Bestimmter &Drucker"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Ausrichtung"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "&Hochformat"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Querformat"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Papier"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Größe"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "P&apierquelle"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Schriftart"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "Schrift&art:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "Schrift&stil:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Größe:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Darstellung"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Durchgestrichen"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Unterstrichen"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Farbe:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Muster"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Skr&ipt:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Farbe"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "Gr&undfarben:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "Selbs&t definierte Farben:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Farbe |  B&asis"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Rot:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Grün:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Blau:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Farbe:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Sätt:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "H&ell:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "Farbe hin&zufügen"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "Farben &definieren >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Suchen"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "S&uchen nach:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Nu&r ganzes Wort suchen"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "Groß-/Klein&schreibung"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Suchrichtung"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Oben"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "&Unten"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Weitersuchen"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "Ersetzen &durch:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Ersetzen"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "A&lles ersetzen"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "In Da&tei drucken"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Eigenschaften"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Name:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Status:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Typ:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Ort:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Kopien"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Anzahl &Kopien:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "S&ortieren"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "&Seiten"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "Aus&wahl"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&von:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&bis:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "G&röße:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Zufuhr:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "&Hochformat"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "&Querformat"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Seite einrichten"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Zufuhr:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Hochformat"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Ränder"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&Links:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Rechts:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&Oben:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Unten:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "&Drucker..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "&Suche in:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "Datei&name:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Datei&typen:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Schreibgeschüt&zt"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Öffnen"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr "Dateiname:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr "Dateien vom Typ:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "Ü&ber den Folderpicker"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Dokumenten Ordner"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Meine Dokumente"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Meine Favoriten"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "System Ordner"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Desktop"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Schriftarten"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Arbeitsplatz"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "System Ordner"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Lokale Festplatten"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Datei nicht gefunden"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Bitte überprüfen sie, ob der korrekte Dateiname angegeben wurde"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -842,7 +801,7 @@ msgstr ""
 "Die Datei existiert nicht.\n"
 "Wollen Sie sie neu anlegen?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -850,11 +809,11 @@ msgstr ""
 "Die Datei existiert bereits.\n"
 "Wollen Sie sie überschreiben?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Unzulässige Zeichen im Pfad"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -862,119 +821,119 @@ msgstr ""
 "Ein Dateiname darf folgende Zeichen nicht enthalten:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Der Pfad existiert nicht"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Die Datei existiert nicht"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Eine Verzeichnisebene höher"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Neuen Ordner anlegen"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Liste"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Details"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Desktopordner anzeigen"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Normal"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Fett"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Kursiv"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Fett Kursiv"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Schwarz"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Kastanienbraun"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Grün"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Olivgrün"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Dunkelblau"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Lila"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Blaugrün"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Grau"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Silber"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Rot"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Hellgrün"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Gelb"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Blau"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Fuchsin"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Aquamarin"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Weiß"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Unlesbarer Eintrag"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
@@ -982,11 +941,11 @@ msgstr ""
 "Dieser Wert liegt nicht auf der Seite.\n"
 "Bitte geben sie einen Wert zwischen %1!d! und %2!d! an."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "Der 'von' Eintrag kann nicht größer sein als der 'bis' Eintrag."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -994,11 +953,11 @@ msgstr ""
 "Die Ränder überlappen oder sind außerhalb des Papiers.\n"
 "Bitte die Ränder neu eingeben."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Es muss ein Wert bei der Anzahl der Kopien angegeben werden."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1006,31 +965,31 @@ msgstr ""
 "Ihr Drucker unterstützt so viele Kopien nicht.\n"
 "Bitte geben Sie eine Zahl zwischen 1 und %d ein."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Ein Druckerfehler ist aufgetreten."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Es ist kein Standarddrucker eingestellt."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Kann den Drucker nicht finden."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Kein freier Speicher mehr."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Ein unbekannter Fehler ist aufgetreten."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Unbekannter Druckertreiber."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1039,147 +998,147 @@ msgstr ""
 "Seiteneinrichtung oder ein Dokument zu drucken, müssen Sie einen Drucker "
 "installieren. Bitte führen Sie dies zuerst aus und versuchen Sie es erneut."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Wählen Sie eine Schriftgröße zwischen %1!d! und %2!d! Punkten aus."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Speichern"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Speichern &unter:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Speichern"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Öffne Datei"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Bereit"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Gestoppt; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Fehler; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Wartet auf Löschung; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Papierstau; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Papierfach leer; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Papier manuell zuführen; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Papierproblem; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Drucker ist offline; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "Datenübertragung; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Beschäftigt; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Druckend; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Ausgabe Fach ist voll; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Nicht vorhanden; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Wartend; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "In Bearbeitung; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Initialisierend; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Aufwärmend; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Tonerstand niedrig; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Kein Toner mehr; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Seitenausgabe; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Durch Benutzer unterbrochen; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Kein Speicher mehr; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Druckergehäuse ist offen; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Druckserver unbekannt; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Stromsparmodus; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Standard Drucker; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Es sind %d Dokumente in der Warteschlange"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Ränder [Zoll]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Ränder [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -7853,6 +7812,15 @@ msgstr "Ursprung"
 msgid "Date deleted"
 msgstr "Gelöscht am"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Desktop"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Arbeitsplatz"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Systemsteuerung"
@@ -7881,6 +7849,10 @@ msgstr "Möchten Sie die aktuelle Wine Sitzung beenden?"
 msgid "Start Menu\\Programs"
 msgstr "Startmenü\\Programme"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Meine Dokumente"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favoriten"
@@ -13710,6 +13682,10 @@ msgstr "&Definieren..."
 msgid "History"
 msgstr "Verlauf"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Schriftarten"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Klein"
diff --git a/po/el.po b/po/el.po
index 45606cfceda..dcf7bd27488 100644
--- a/po/el.po
+++ b/po/el.po
@@ -51,8 +51,8 @@ msgstr ""
 msgid "Support Information"
 msgstr ""
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -129,10 +129,10 @@ msgid "&Install"
 msgstr ""
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -278,11 +278,11 @@ msgstr ""
 msgid "Properties for %s"
 msgstr "Ιδιότητες για %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Εφαρμογή"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Βοήθεια"
 
@@ -315,9 +315,9 @@ msgstr "&Κλείσιμο"
 msgid "R&eset"
 msgstr "Ε&παναφορά"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -372,462 +372,420 @@ msgstr "Σήμερα:"
 msgid "Go to today"
 msgstr "Μετάβαση στα σημερινά"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Άνοιγμα"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "File &Όνομα:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Κατάλογοι:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Λίστα Αρχείων του &Τύπου:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "Dri&ves:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Μόνο για Ανάγνωση"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Αποθήκευση ως..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Αποθήκευση ως"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Εκτυπωτής:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Print range"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Όλα"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "Ε&πιλογή"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Σελίδες"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Εγκατάσταση"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&Από:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&Έως:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "Print &Ποιότητα:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Εκτύπωση σε Αρ&χείο"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Condensed"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Εγκατάσταση εκτυπωτή"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "PΕκτυπωτής"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Προεπιλεγμένος εκτυπωτής"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[none]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Specific &Printer"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Orientation"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "Po&rtrait"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Landscape"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Χαρτί"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "Μέγε&θος"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Πηγή"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Γραμματοσειρά"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Γραμματοσειρά:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "Στυλ Γρ&αμματοσειράς:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Μέγεθος:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Εφφέ"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "Stri&keout"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Υπογράμμιση"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Χρώμα:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Δείγμα"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Σκρ&ιπτ:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Χρώμα"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Βασικά χρώματα:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Προσαρμοσμένα χρώματα:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Χρώμα |  Sol&id"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Κόκκινο:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Πράσινο:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Μπλε:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Hue:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Sat:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Φωτεινότητα:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Προσθήκη στα προσαρμοσμένα χρώματα"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Ορισμός προσαρμοσμένων χρωμάτων >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Εύρεση"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "Εύ&ρεση του:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Ταίριασμα &Ολόκληρης Λέξης Μόνο"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "Ταίριασμα &Κεφαλαίων"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Κατεύθυνση"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Πάνω"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "&Κάτω"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Εύρεση Επόμενου"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Αντικατάσταση"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "Αν&τικατάσταση Με:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Αντικατάσταση"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Αντικατάσταση &Όλων"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Εκτύπωση σε Αρ&χείο"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Ιδιότητες"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Όνομα:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Κατάσταση:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Τύπος:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Που:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Σχόλιο:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Αντίγραφα"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Αριθμός &Αντιγράφων:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "C&ollate"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "Σε&λίδες"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Επιλογή"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&από:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&έως:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Μέγε&θος:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Πηγή:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "P&ortrait"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "L&andscape"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Ρύθμιση σελίδας"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Tray:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Portrait"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Borders"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "Α&ριστερά:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Δεξιά:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "Πά&νω:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Κάτω:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "Εκ&τυπωτής..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "Look &in:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "Όνομα &αρχείου:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Αρχεία του &τύπου:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Άνοιγμα ως &μόνο-για-ανάγνωση"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Άνοιγμα"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Περιεχόμενα"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "Αρχεία του &τύπου:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr ""
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr ""
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Τα Έγγραφά μου"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Τα Αγαπημένα μου"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr ""
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Επιφάνεια Εργασίας"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Γραμματοσειρές"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Ο Υπολογιστής μου"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Κατάλογοι Συστήματος"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Τοπικοί Σκληροί Δίσκοι"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Το αρχείο δε βρέθηκε"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Παρακαλώ επιβεβαιώστε ότι δόθηκε το σωστό όνομα αρχείου"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -835,7 +793,7 @@ msgstr ""
 "Το αρχείο δεν υπάρχει.\n"
 "Θέλετε να δημιουργήσετε το αρχείο;"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -843,11 +801,11 @@ msgstr ""
 "Το αρχείο υπάρχει ήδη.\n"
 "Θέλετε να το αντικαταστήσετε;"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -856,316 +814,316 @@ msgstr ""
 "χαρακτήρες:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Το μονοπάτι δεν υπάρχει"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Το αρχείο δεν υπάρχει"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Ένα επίπεδο πάνω"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Δημιουργία νέου καταλόγου"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Λίστα"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr ""
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Κανονικά"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Έντονα"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Πλάγια"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Έντονα Πλάγια"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Μαύρο"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr ""
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Πράσινο"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr ""
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr ""
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Μωβ"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr ""
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Γκρι"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Ασημί"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Κόκκινο"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr ""
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Κίτρινο"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Μπλε"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr ""
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr ""
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Άσπρο"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Μη αναγνώσιμη εγγραφή"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
 msgstr ""
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr ""
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
 msgstr ""
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr ""
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
 msgstr ""
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Προκλήθηκε σφάλμα εκτυπωτή."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Δεν έχει οριστεί προεπιλεγμένος εκτυπωτής."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Δεν ήταν δυνατή η εύρεση του εκτυπωτή."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr ""
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Προκλήθηκε σφάλμα."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Άγνωστος οδηγός εκτυπωτή."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 msgstr ""
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Επιλέξτε μέγεθος γραμματοσειράς μεταξύ %d και %d πόντους."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Αποθήκευση"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Αποθήκευση &σε:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Άνοιγμα Αρχείου"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Έτοιμο"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Σταματημένος; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Σφάλμα; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr ""
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr ""
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Τέλος χαρτιού; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr ""
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Πρόβλημα χαρτιού; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Εκτυπωτής αποσυνδεδεμένος; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr ""
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Απασχολημένος; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Γίνεται εκτύπωση; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr ""
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "ΜΗ διαθέσιμος; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Αναμονή; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr ""
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Εκκίνηση; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Γίνεται προθέρμανση; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Τόνερ χαμηλό; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Δεν υπάρχει τόνερ; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr ""
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr ""
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr ""
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr ""
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr ""
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Προεπιλεγμένος εκτυπωτής; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Υπάρχουν %d έγγραφα στην ουρά"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr ""
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr ""
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 #, fuzzy
 msgctxt "unit: millimeters"
 msgid "mm"
@@ -7830,6 +7788,16 @@ msgstr ""
 msgid "Date deleted"
 msgstr ""
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Επιφάνεια Εργασίας"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Ο Υπολογιστής μου"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -7858,6 +7826,10 @@ msgstr ""
 msgid "Start Menu\\Programs"
 msgstr ""
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Τα Έγγραφά μου"
+
 #: shell32.rc:201
 #, fuzzy
 msgid "Favorites"
@@ -13167,6 +13139,10 @@ msgstr ""
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Γραμματοσειρές"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/en.po b/po/en.po
index 8f10ec0849c..cf8408e72e8 100644
--- a/po/en.po
+++ b/po/en.po
@@ -51,8 +51,8 @@ msgstr "&Remove"
 msgid "Support Information"
 msgstr "Support Information"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -125,10 +125,10 @@ msgid "&Install"
 msgstr "&Install"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -273,11 +273,11 @@ msgstr "Cancelling..."
 msgid "Properties for %s"
 msgstr "Properties for %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Apply"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Help"
 
@@ -310,9 +310,9 @@ msgstr ""
 msgid "R&eset"
 msgstr ""
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -366,789 +366,748 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Open"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "File &Name:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Directories:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "List Files of &Type:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr ""
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr ""
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Save As..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Save As"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Print"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Printer:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Print range"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr ""
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "S&election"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Pages"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Setup"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr ""
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr ""
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr ""
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Print to Fi&le"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr ""
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Print Setup"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Printer"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Default Printer"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr ""
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr ""
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Orientation"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr ""
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr ""
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr ""
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "Si&ze"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Source"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Font"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Font:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "Font St&yle:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Size:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Effects"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "Stri&keout"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Underline"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Colour:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Sample"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Scr&ipt:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Colour"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Basic Colours:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Custom Colours:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Colour |  Sol&id"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Red:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Green:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Blue:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Hue:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Sat:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Lum:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Add to Custom Colours"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Define Custom Colours >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr ""
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr ""
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr ""
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Direction"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr ""
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr ""
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Find Next"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr ""
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr ""
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr ""
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Replace &All"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Print to fi&le"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Properties"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Name:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Status:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr ""
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr ""
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Comment:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr ""
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr ""
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr ""
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr ""
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Selection"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr ""
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr ""
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Si&ze:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Source:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr ""
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr ""
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr ""
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr ""
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr ""
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Borders"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "L&eft:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Right:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr ""
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Bottom:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "P&rinter..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr ""
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "File &name:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Files of &type:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr ""
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Open"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr "File name:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr "Files of type:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr ""
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Document Folders"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "My Documents"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "My Favourites"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr ""
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Desktop"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Fonts"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr ""
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "System Folders"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr ""
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "File not found"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr ""
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
 msgstr ""
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr ""
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
 msgstr ""
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr ""
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr ""
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr ""
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr ""
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr ""
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr ""
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr ""
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Black"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Maroon"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Green"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Olive"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Navy"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Purple"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Teal"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Grey"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Silver"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Red"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Lime"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Yellow"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Blue"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Fuchsia"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Aqua"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "White"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr ""
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
 msgstr ""
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr ""
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
 msgstr ""
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr ""
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
 msgstr ""
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr ""
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr ""
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr ""
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Out of memory."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "An error occurred."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Unknown printer driver."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 msgstr ""
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr ""
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr ""
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Save &in:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Save"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Open File"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr ""
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr ""
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Error; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr ""
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr ""
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Out of paper; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr ""
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr ""
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr ""
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr ""
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Busy; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Printing; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr ""
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Not available; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr ""
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr ""
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Initialising; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr ""
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr ""
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr ""
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Page punt; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr ""
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Out of memory; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr ""
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr ""
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr ""
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Default Printer; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "There are %d documents in the queue"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr ""
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr ""
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr ""
@@ -7708,6 +7667,15 @@ msgstr "Original location"
 msgid "Date deleted"
 msgstr "Date deleted"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Desktop"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr ""
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Control Panel"
@@ -7736,6 +7704,10 @@ msgstr ""
 msgid "Start Menu\\Programs"
 msgstr ""
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "My Documents"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favourites"
@@ -13327,6 +13299,10 @@ msgstr "&Define..."
 msgid "History"
 msgstr "History"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Fonts"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Small"
diff --git a/po/en_US.po b/po/en_US.po
index e749cbf6dbb..06f0c841035 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -56,8 +56,8 @@ msgstr "&Remove"
 msgid "Support Information"
 msgstr "Support Information"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -137,10 +137,10 @@ msgid "&Install"
 msgstr "&Install"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -289,11 +289,11 @@ msgstr "Canceling..."
 msgid "Properties for %s"
 msgstr "Properties for %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Apply"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Help"
 
@@ -326,9 +326,9 @@ msgstr "&Close"
 msgid "R&eset"
 msgstr "R&eset"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -382,459 +382,418 @@ msgstr "Today:"
 msgid "Go to today"
 msgstr "Go to today"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Open"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "File &Name:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Directories:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "List Files of &Type:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "Dri&ves:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Read Only"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Save As..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Save As"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Print"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Printer:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Print range"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&All"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "S&election"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Pages"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Setup"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&From:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&To:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "Print &Quality:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Print to Fi&le"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Condensed"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Print Setup"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Printer"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Default Printer"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[none]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Specific &Printer"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Orientation"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "Po&rtrait"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Landscape"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Paper"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "Si&ze"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Source"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Font"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Font:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "Font St&yle:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Size:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Effects"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "Stri&keout"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Underline"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Color:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Sample"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Scr&ipt:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Color"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Basic Colors:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Custom Colors:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Color |  Sol&id"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Red:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Green:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Blue:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Hue:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Sat:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Lum:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Add to Custom Colors"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Define Custom Colors >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Find"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "Fi&nd What:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Match &Whole Word Only"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "Match &Case"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Direction"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Up"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "&Down"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Find Next"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Replace"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "Re&place With:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Replace"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Replace &All"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Print to fi&le"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Properties"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Name:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Status:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Type:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Where:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Comment:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Copies"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Number of &copies:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "C&ollate"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "Pa&ges"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Selection"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&from:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&to:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Si&ze:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Source:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "P&ortrait"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "L&andscape"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Setup Page"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Tray:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Portrait"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Borders"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "L&eft:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Right:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "T&op:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Bottom:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "P&rinter..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "Look &in:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "File &name:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Files of &type:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Open as &read-only"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Open"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr "File name:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr "Files of type:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&About FolderPicker Test"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Document Folders"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "My Documents"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "My Favorites"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "System Path"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Desktop"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Fonts"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "My Computer"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "System Folders"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Local Hard Drives"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "File not found"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Please verify that the correct file name was given"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -842,7 +801,7 @@ msgstr ""
 "File does not exist.\n"
 "Do you want to create file?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -850,11 +809,11 @@ msgstr ""
 "File already exists.\n"
 "Do you want to replace it?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Invalid character(s) in path"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -862,119 +821,119 @@ msgstr ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Path does not exist"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "File does not exist"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Up One Level"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Create New Folder"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "List"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Details"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Browse to Desktop"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Regular"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Bold"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Italic"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Bold Italic"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Black"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Maroon"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Green"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Olive"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Navy"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Purple"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Teal"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Gray"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Silver"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Red"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Lime"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Yellow"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Blue"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Fuchsia"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Aqua"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "White"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Unreadable Entry"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
@@ -982,11 +941,11 @@ msgstr ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "The 'from' entry cannot exceed the 'to' entry."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -994,11 +953,11 @@ msgstr ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "The 'Number of copies' field cannot be empty."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1006,31 +965,31 @@ msgstr ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "A printer error occurred."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "No default printer defined."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Cannot find the printer."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Out of memory."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "An error occurred."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Unknown printer driver."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1038,147 +997,147 @@ msgstr ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Select a font size between %1!d! and %2!d! points."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Save"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Save &in:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Save"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Open File"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Ready"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Paused; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Error; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Pending deletion; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Paper jam; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Out of paper; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Feed paper manual; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Paper problem; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Printer offline; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "I/O Active; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Busy; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Printing; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Output tray is full; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Not available; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Waiting; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Processing; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Initialising; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Warming up; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Toner low; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "No toner; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Page punt; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Interrupted by user; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Out of memory; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "The printer door is open; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Print server unknown; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Power save mode; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Default Printer; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "There are %d documents in the queue"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Margins [inches]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Margins [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -7844,6 +7803,15 @@ msgstr "Original location"
 msgid "Date deleted"
 msgstr "Date deleted"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Desktop"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "My Computer"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Control Panel"
@@ -7872,6 +7840,10 @@ msgstr "Do you want to shutdown your Wine session?"
 msgid "Start Menu\\Programs"
 msgstr "Start Menu\\Programs"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "My Documents"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favorites"
@@ -13609,6 +13581,10 @@ msgstr "&Define..."
 msgid "History"
 msgstr "History"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Fonts"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Small"
diff --git a/po/eo.po b/po/eo.po
index 771e7bc6170..11a9d408966 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -55,8 +55,8 @@ msgstr "&Notu..."
 msgid "Support Information"
 msgstr "Informo pri"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -135,10 +135,10 @@ msgid "&Install"
 msgstr "&Notu..."
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -287,11 +287,11 @@ msgstr ""
 msgid "Properties for %s"
 msgstr "Ecoj laý %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Apliku"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Helpo"
 
@@ -324,9 +324,9 @@ msgstr "&Fermu"
 msgid "R&eset"
 msgstr "R&ee agordu"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -381,402 +381,402 @@ msgstr "Hodiaý:"
 msgid "Go to today"
 msgstr "Iru a la hodiaý"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Malfermu"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "Dosier&nomo:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Vojo:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Dosier&speco:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Drajvo:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "Nur &legebla"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Konservu kiel..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Konservu"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Presu"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Printilo:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Etendiøon"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "æ&iujn"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "&elekton"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&paøojn"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Aranøu"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "de:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "øis:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&Kvalito:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Presu &dosieren"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Mallarøtipe"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Presadaj Agordoj"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Printilo"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Implicita Presilo"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[none]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "&Specifa Printilo"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Formato"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "&Vertikala"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Horizontala"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Papero"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Dimensio"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Fonto"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Tiparo"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Tiparo:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "Tipara St&ilo:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Dimensio:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Eficoj"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "Stre&ko"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "S&ubstreko"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Koloro:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Ekzemplo"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Scri&pt:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Koloro"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Normala koloraro:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Persona koloraro:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Sol&idkoloro"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Ruøo"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Verdo"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Bluo"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Farbo"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Saturo"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Helo"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Aldonu al Koloraro"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Forv&iþu Koloraron >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Seræu"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Seræu:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Nur tutan &vorton"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "Atentu &Usklecon"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Direkto"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Supre"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "&Sube"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Pluseræu"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Anstataýigu"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "&per:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Anstataýigu"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Anstataýigu æ&iujn"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Prezu kiel &dosiero"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Ecoj"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Nomo:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Stato:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Speco:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Kie:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Komento:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Ekzempleroj"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Nombro da &ekzempleroj:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "Laý&kajere"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "&paøojn"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&elekton"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "de:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "øis:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "&Dimensio:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Fonto:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "&Vertikala"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "&Horizontala"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Impozu Paøon"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "P&leto:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Vertikala"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Marøenoj"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&Dekstra:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Dekstra:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&Supre:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "Su&ba:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "&Printilo.."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "Seræu &en:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "Dosier&nomo:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Dosier&speco:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Nur &legebla"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Malfermu"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr ""
@@ -785,72 +785,20 @@ msgstr ""
 "#-#-#-#-#  eo.po (Wine)  #-#-#-#-#\n"
 "&Dosiero"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "Dosier&speco:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&Pri 'Test FolderPicker'"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Dokumentdosierujoj"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Miaj Dokumentoj"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Miaj Favoritaj"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Sistemvojo"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Desktop"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-#, fuzzy
-msgid "Fonts"
-msgstr ""
-"#-#-#-#-#  eo.po (Wine)  #-#-#-#-#\n"
-"Fonts\n"
-"#-#-#-#-#  eo.po (Wine)  #-#-#-#-#\n"
-"Tiparoj"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-#, fuzzy
-msgid "My Computer"
-msgstr ""
-"#-#-#-#-#  eo.po (Wine)  #-#-#-#-#\n"
-"Mea Komputero\n"
-"#-#-#-#-#  eo.po (Wine)  #-#-#-#-#\n"
-"Mia Komputero"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Sistemdosierujoj"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Localaj Durdiskoj"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Dosiero ne estis trovita"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Kontrolu la øustecon je havigita dosiernomo."
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -858,7 +806,7 @@ msgstr ""
 "Dosiero estas neekzistanta\n"
 "Æu vi volas krei dosieron?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -866,11 +814,11 @@ msgstr ""
 "Dosiero estas jam ekzistanta.\n"
 "Æu vi volas superskribi øin?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Nekorekta(j) tipo(j) en vojo"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -878,119 +826,119 @@ msgstr ""
 "La dosiernomo ne povas enhavi la jenajn tipojn:\n"
 " / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Vojo estas neekzistanta"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Dosiero estas neekzistanta"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Suriru da unu nivelo"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Kreu Novan Dosieujon"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Listo"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Detale"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Foliu Desktop"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Nigro"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Duonruøbruna koloro"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Verdo"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Olivverdo"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Ultramara bluo"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Purpurruøo"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Kreka koloro"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Grizo"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Arøento"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Ruøo"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Limeta koloro"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Flavo"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Bluo"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Fuksia koloro"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Akvo"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Blanko"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Nelegebla Entry"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -999,11 +947,11 @@ msgstr ""
 "Æi tiu valoro ne estas en la paøo.\n"
 "Enigu valoron inter %d kaj %d."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "La 'de:' valoro ne povas superi la 'øis:' valoron."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1011,12 +959,12 @@ msgstr ""
 "Marøenoj surmetiøas inter si aý estas ekster paperfolio.\n"
 "Difinu denove la marøenojn."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "La nombrvaloro je 'Nombro da &ekzempleroj' ne povas esti malplena."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1024,31 +972,31 @@ msgstr ""
 "La via printilo ne povas presi tiel granda nombro da ekzempleroj\n"
 "Enigu valoron inter 1 kaj %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Okazis printila eroro."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Ne estas defaýlta printilo."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Mi ne povas trovi la printilon."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "La memoro estas elæerpita."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Okazis eroro."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Nekonata printilzorgilo."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1057,148 +1005,148 @@ msgstr ""
 "dokumenton, estas necese ke vi instalu printilon. Oni konsilas instali øin "
 "kaj reprovi."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Elektu tiparan grandecvaloron inter %d kaj %d punktoj."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "Kon&servu"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Konservu &en:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Konservu"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Malfermu Dosieron"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Preta"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Paýse; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Eroro; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Nuliga atendado; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Blokita papero; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Elæerpita papero; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Mane enþovo de papero; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Papera problemo; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Nekonektita printilo; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "I/O Aktiva; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Okupita printilo; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Nun presata; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Eljreja pleto estas plena; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Ne disponebla; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Atendando; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Procezo; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Preparado; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Varmigo de la printilo; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Kseroprintila nivelo estas basa; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Neniu kseroprintilo; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Paøa 'punt'; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Interrompita far uzanto; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Elæerpita memoro; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "La printila pordo estas malfermita; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Nekonata pres-servanto; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Energiþpare; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Defaýlta Printilo; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "%d dokumento(j) estas en presvico"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Marøenoj [inches]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Marøenoj [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 #, fuzzy
 msgctxt "unit: millimeters"
 msgid "mm"
@@ -7971,6 +7919,21 @@ msgstr "Original location"
 msgid "Date deleted"
 msgstr ""
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Desktop"
+
+#: shell32.rc:154 regedit.rc:200
+#, fuzzy
+msgid "My Computer"
+msgstr ""
+"#-#-#-#-#  eo.po (Wine)  #-#-#-#-#\n"
+"Mea Komputero\n"
+"#-#-#-#-#  eo.po (Wine)  #-#-#-#-#\n"
+"Mia Komputero"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -7999,6 +7962,10 @@ msgstr "Æu vi volas adiaýi Wine?"
 msgid "Start Menu\\Programs"
 msgstr "Start Menu\\Programs"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Miaj Dokumentoj"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favorites"
@@ -13446,6 +13413,15 @@ msgstr "&Difinu..."
 msgid "History"
 msgstr "History"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+#, fuzzy
+msgid "Fonts"
+msgstr ""
+"#-#-#-#-#  eo.po (Wine)  #-#-#-#-#\n"
+"Fonts\n"
+"#-#-#-#-#  eo.po (Wine)  #-#-#-#-#\n"
+"Tiparoj"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Small"
diff --git a/po/es.po b/po/es.po
index 594892d56cc..e6ed1a29959 100644
--- a/po/es.po
+++ b/po/es.po
@@ -56,8 +56,8 @@ msgstr "E&liminar"
 msgid "Support Information"
 msgstr "Información de Soporte"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -139,10 +139,10 @@ msgid "&Install"
 msgstr "&Instalar"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -290,11 +290,11 @@ msgstr "Cancelando..."
 msgid "Properties for %s"
 msgstr "Propiedades de %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Aplicar"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Ayuda"
 
@@ -327,9 +327,9 @@ msgstr "&Cerrar"
 msgid "R&eset"
 msgstr "R&estaurar"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -388,467 +388,420 @@ msgstr "Hoy:"
 msgid "Go to today"
 msgstr "Ir a hoy"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Abrir"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "Nombre de &archivo:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Directorios:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "&Mostrar archivos de tipo:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "U&nidades:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "Sólo &lectura"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "&Guardar como"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Imprimir"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Impresora:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Rango de impresión"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Todo"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "Selecc&ión"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Páginas"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Configuración"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&Desde:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&Hasta:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "Calidad de impre&sión:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Impri&mir en archivo"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Condensado"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Configuración de impresión"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Impresora:"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "Impresora por &defecto"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[ninguna]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Impresora &específica:"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Orientación"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "&Vertical"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Apaisado"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Papel"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Tamaño"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "O&rigen:"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Fuente"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Fuente:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "Est&ilo:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "Tamaño:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "&Efectos"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Tachado"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Subrayado"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "Color:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Ejemplo"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZzÑñ"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Codificación:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Color"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "Colores &básicos:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "Colores person&alizados:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Color | Sól&ido"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Rojo:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Verde:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "A&zul:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Tinte:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Sat.:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Lum.:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "Añadir a &colores personalizados"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Definir colores personalizados >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Buscar"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Buscar:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Sólo palabra &entera"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "&Mayúsculas/minúsculas"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Dirección"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Arriba"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "A&bajo"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "Buscar &siguiente"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Reemplazar"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "Reem&plazar por:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Reemplazar"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Reemplazar &todo"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Imprimir en a&rchivo"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Propiedades"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Nombre:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Estado:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Tipo:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Dónde:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Copias"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Número de &copias:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "C&ollate"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "Pá&ginas"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Selección"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&desde:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&hasta:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Tamaño:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Origen:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "&Vertical"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "A&paisado"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Configuración de página"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Bandeja:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Vertical"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Márgenes"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "I&zquierdo:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Derecha:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&Superior:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "Aba&jo:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "&Impresora..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "Mirar &en:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "Nombre de &archivo:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Archivos de &tipo:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Abrir como &sólo-lectura"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Abrir"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Nombre de archivo:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "Archivos de &tipo:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&Acerca del test FolderPicker"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Carpetas de documentos"
-
-#: comdlg32.rc:31 shell32.rc:200
-#, fuzzy
-msgid "My Documents"
-msgstr ""
-"#-#-#-#-#  es.po (Wine)  #-#-#-#-#\n"
-"Mis documentos\n"
-"#-#-#-#-#  es.po (Wine)  #-#-#-#-#\n"
-"Mis Documentos"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Mis Favoritos"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Ruta del sistema"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Escritorio"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Fuentes"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Mi PC"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Carpetas del sistema"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Discos duros locales"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Archivo no encontrado"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Compruebe que haya dado el nombre de archivo correcto"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -856,7 +809,7 @@ msgstr ""
 "El archivo no existe\n"
 "¿Desea crearlo?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -864,11 +817,11 @@ msgstr ""
 "El archivo ya existe.\n"
 "¿Desea reemplazarlo?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Caracter(es) inválidos en la ruta"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -877,119 +830,119 @@ msgstr ""
 "caracteres:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "La ruta no existe"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "El archivo no existe"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Subir un nivel"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Crear nueva carpeta"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Lista"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Detalles"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Explorar el escritorio"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Normal"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Negrita"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Cursiva"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Cursiva negrita"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Negro"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Granate"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Verde"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Verde oliva"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Azul marino"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Morado"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Turquesa"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Gris"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Plateado"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Rojo"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Lima"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Amarillo"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Azul"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Fucsia"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Agua"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Blanco"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Entrada ilegible"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -998,11 +951,11 @@ msgstr ""
 "Este valor no concuerda con el rango de la página.\n"
 " Por favor, introduzca un valor entre %d y %d."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "La entrada 'desde' no puede exceder a la entrada 'hasta'."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1010,12 +963,12 @@ msgstr ""
 "Los márgenes se superponen o quedan fuera de los límites del papel.\n"
 "Por favor, reintroduzca los márgenes."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "El número del valor 'Número de copias' no puede estar vacío."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1023,31 +976,31 @@ msgstr ""
 "Este número tan grande de copias no es soportado por su impresora.\n"
 "Por favor, introduzca un valor entre 1 y %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Ocurrió un error en la impresora."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Ninguna impresora definida por defecto."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "No se encuentra la impresora."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Sin memoria."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Ocurrió un error."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Manejador de la impresora desconocido."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1056,148 +1009,148 @@ msgstr ""
 "imprimir un documento, necesita instalar una impresora. Por favor, instale "
 "una y vuelva a intentarlo."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Elija un tamaño de fuente entre %d y %d puntos."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Guardar"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Guardar &en:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Guardar"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Abrir archivo"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Lista"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Pausada; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Error; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Borrado pendiente; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Papel atascado; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Sin papel; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Ponga papel a mano; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Problema con el papel; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Impresora desconectada; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "E/S activa; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Ocupada; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Imprimiendo; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Bandeja de salida llena; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "No disponible; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Esperando; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Procesando; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Inicializando; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Calentádonse; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Tóner bajo; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Sin tóner; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Interrumpida por el usuario; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Sin memoria; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Puerta de la impresora abierta; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Servidor de impresión desconocido; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Modo de ahorro de energía; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Impresora por defecto; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Hay %d documentos en la cola"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Márgenes [pulgadas]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Márgenes [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -8207,6 +8160,16 @@ msgstr "Lugar original"
 msgid "Date deleted"
 msgstr "Fecha de borrado"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Escritorio"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Mi PC"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Panel de Control"
@@ -8235,6 +8198,15 @@ msgstr "¿Desea terminar su sesión de Wine?"
 msgid "Start Menu\\Programs"
 msgstr "Menú Inicio\\Programas"
 
+#: shell32.rc:200
+#, fuzzy
+msgid "My Documents"
+msgstr ""
+"#-#-#-#-#  es.po (Wine)  #-#-#-#-#\n"
+"Mis documentos\n"
+"#-#-#-#-#  es.po (Wine)  #-#-#-#-#\n"
+"Mis Documentos"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favoritos"
@@ -14165,6 +14137,10 @@ msgstr "&Definir..."
 msgid "History"
 msgstr "Historial"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Fuentes"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Pequeña"
diff --git a/po/fa.po b/po/fa.po
index 2c6da82c80c..fc2459d91f8 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -52,8 +52,8 @@ msgstr ""
 msgid "Support Information"
 msgstr "اطلاعات"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -129,10 +129,10 @@ msgid "&Install"
 msgstr ""
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -277,11 +277,11 @@ msgstr ""
 msgid "Properties for %s"
 msgstr "انتخاب &همه\tCtrl+A"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr ""
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 #, fuzzy
 msgid "Help"
 msgstr "&Ú©Ù…Ú©"
@@ -315,9 +315,9 @@ msgstr ""
 msgid "R&eset"
 msgstr ""
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -372,488 +372,446 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 #, fuzzy
 msgid "Open"
 msgstr "&باز‌کردن...\tCtrl+O"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 #, fuzzy
 msgid "File &Name:"
 msgstr "&پرونده"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr ""
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 #, fuzzy
 msgid "List Files of &Type:"
 msgstr "&پرونده"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr ""
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr ""
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 #, fuzzy
 msgid "Save As..."
 msgstr "ذخیره &به نام..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 #, fuzzy
 msgid "Save As"
 msgstr "ذخیره &به نام..."
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr ""
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 #, fuzzy
 msgid "Printer:"
 msgstr "&چاپ‌کردن...\tCtrl+P"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 #, fuzzy
 msgid "Print range"
 msgstr "&حذف\tDel"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr ""
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 #, fuzzy
 msgid "S&election"
 msgstr "انتخاب &همه\tCtrl+A"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 #, fuzzy
 msgid "&Pages"
 msgstr "صفحه &p"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 #, fuzzy
 msgid "&Setup"
 msgstr "تنظیمات صفحه"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr ""
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr ""
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr ""
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 #, fuzzy
 msgid "Print to Fi&le"
 msgstr "پرونده‌های متنی (*.txt)"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr ""
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 #, fuzzy
 msgid "Print Setup"
 msgstr "&تنظیمات چاپ‌گر..."
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 #, fuzzy
 msgid "Printer"
 msgstr "&چاپ‌کردن...\tCtrl+P"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr ""
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr ""
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr ""
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 #, fuzzy
 msgid "Orientation"
 msgstr "اطلاعات"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr ""
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr ""
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr ""
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr ""
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr ""
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 #, fuzzy
 msgid "Font"
 msgstr "&قلم‌ها..."
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 #, fuzzy
 msgid "&Font:"
 msgstr "&قلم‌ها..."
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr ""
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr ""
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr ""
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr ""
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr ""
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr ""
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr ""
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr ""
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr ""
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr ""
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr ""
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr ""
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr ""
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr ""
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr ""
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr ""
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr ""
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr ""
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr ""
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr ""
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr ""
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr ""
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr ""
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr ""
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 #, fuzzy
 msgid "Direction"
 msgstr "اطلاعات"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr ""
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr ""
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr ""
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr ""
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr ""
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 #, fuzzy
 msgid "&Replace"
 msgstr "جای&‌گزین کردن...\tCtrl+H"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 #, fuzzy
 msgid "Replace &All"
 msgstr "انتخاب &همه\tCtrl+A"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 #, fuzzy
 msgid "Print to fi&le"
 msgstr "پرونده‌های متنی (*.txt)"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr ""
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr ""
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr ""
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr ""
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr ""
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 #, fuzzy
 msgid "Comment:"
 msgstr "&محتویات"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr ""
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr ""
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr ""
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr ""
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 #, fuzzy
 msgid "&Selection"
 msgstr "انتخاب &همه\tCtrl+A"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr ""
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr ""
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr ""
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr ""
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr ""
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr ""
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr ""
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr ""
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr ""
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr ""
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 #, fuzzy
 msgid "L&eft:"
 msgstr "&Ú†Ù¾:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&راست:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr ""
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&پایین:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 #, fuzzy
 msgid "P&rinter..."
 msgstr "&چاپ‌کردن...\tCtrl+P"
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr ""
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 #, fuzzy
 msgid "File &name:"
 msgstr "&پرونده"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 #, fuzzy
 msgid "Files of &type:"
 msgstr "&پرونده"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr ""
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr ""
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&پرونده"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "&پرونده"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr ""
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr ""
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr ""
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr ""
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr ""
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr ""
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-#, fuzzy
-msgid "Fonts"
-msgstr "&قلم‌ها..."
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr ""
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr ""
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr ""
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr ""
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr ""
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 #, fuzzy
 msgid ""
 "File does not exist.\n"
@@ -863,7 +821,7 @@ msgstr ""
 "\n"
 "آیا می‌خواهید یک پرونده‌ی جدید ایجاد کنید؟"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 #, fuzzy
 msgid ""
 "File already exists.\n"
@@ -873,330 +831,330 @@ msgstr ""
 "\n"
 "آیا می‌خواهید یک پرونده‌ی جدید ایجاد کنید؟"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr ""
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
 msgstr ""
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr ""
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr ""
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr ""
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr ""
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr ""
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr ""
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr ""
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr ""
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr ""
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr ""
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr ""
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr ""
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr ""
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr ""
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr ""
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr ""
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr ""
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr ""
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr ""
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr ""
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr ""
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr ""
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr ""
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr ""
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
 msgstr ""
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr ""
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
 msgstr ""
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr ""
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
 msgstr ""
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr ""
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr ""
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr ""
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr ""
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr ""
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr ""
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 msgstr ""
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr ""
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr ""
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 #, fuzzy
 msgid "Save &in:"
 msgstr "ذخیره &به نام..."
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr ""
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 #, fuzzy
 msgid "Open File"
 msgstr "&پرونده"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr ""
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr ""
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr ""
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr ""
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr ""
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr ""
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr ""
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr ""
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 #, fuzzy
 msgid "Printer offline; "
 msgstr "پرونده‌های متنی (*.txt)"
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr ""
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr ""
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr ""
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr ""
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 #, fuzzy
 msgid "Not available; "
 msgstr "اطلاعات"
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr ""
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr ""
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr ""
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr ""
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr ""
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr ""
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 #, fuzzy
 msgid "Page punt; "
 msgstr "صفحه &p"
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr ""
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr ""
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr ""
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr ""
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr ""
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr ""
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr ""
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr ""
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr ""
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr ""
@@ -7833,6 +7791,15 @@ msgstr ""
 msgid "Date deleted"
 msgstr "&حذف\tDel"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr ""
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr ""
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -7862,6 +7829,10 @@ msgstr ""
 msgid "Start Menu\\Programs"
 msgstr ""
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr ""
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr ""
@@ -13216,6 +13187,11 @@ msgstr ""
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+#, fuzzy
+msgid "Fonts"
+msgstr "&قلم‌ها..."
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 775ba49d942..6eece0b908c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -58,8 +58,8 @@ msgstr ""
 "#-#-#-#-#  fi.po (Wine)  #-#-#-#-#\n"
 "Tietoja"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -142,10 +142,10 @@ msgid "&Install"
 msgstr "Asenna &teema..."
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -299,11 +299,11 @@ msgstr ""
 msgid "Properties for %s"
 msgstr "Ominaisuudet"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Ota käyttöön"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Ohje"
 
@@ -337,9 +337,9 @@ msgstr ""
 msgid "R&eset"
 msgstr ""
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -399,462 +399,420 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Avaa"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "Tiedosto&nimi:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Hakemistot:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "&Luettele tiedostot tyypeittäin:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Asemat:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Vain luku"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Tallenna nimellä"
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Tallenna nimellä"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Tulosta"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Kirjoitin:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Tulosta alueelta"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Kaikki"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "&Valinta"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Sivut"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Asetukset"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&Mistä:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "Mi&hin:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&Tulostustarkkuus:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Tulosta t&iedostoon"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Tiivistetty"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Kirjoittimen asetukset"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Kirjoitin"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "O&letuskirjoitin"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[ei valittu]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "&Erityinen kirjoitin"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Suunta"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "&Pysty"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Vaaka"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Paperi"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Koko:"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "Lä&hde:"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Fontit"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Fontti:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "Fonttit&yyli:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "Koko:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Efektit"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "Yli&viivattu"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "A&lleviivattu"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "Väri:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Näyte"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Merk&istö:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Väri"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "Pe&rusvärit:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Muokatut värit:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Väri|&Tasainen"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Pun:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Vihr:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "Si&n:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Sävy:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Kyll:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "K&irkk:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Lisää väri"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "M&äärittele väri >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Etsi"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Etsittävä:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "&Koko sana"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "Kirjaink&oko"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Suunta"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Ylös"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "&Alas"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "Etsi &seuraava"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Korvaa"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "Ko&rvattava:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "Korv&aa"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Korvaa ka&ikki"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "&Tulosta tiedostoon"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Ominaisuudet"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Nimi:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Tila:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Sijainti:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Kommentti:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Kopioita"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Kopioiden &määrä:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "&Kokoa"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "&Sivut"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Valinta"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "M&istä:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "Mi&hin:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Size:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Lähde:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "&Pysty"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "V&aaka"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Sivun Asetukset"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Syöttö:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "P&ysty"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Reunat"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&Vasen:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Oikea:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&Vasen:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Ala:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "T&ulostin..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "&Kansiosta:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "&Nimi:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "&Tyyppi:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Avaa vain &lukuoikeuksilla"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Avaa"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Tiedosto"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "&Tyyppi:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&Tietoja FolderPicker-testistä"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Dokumenttikansiot"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Omat tiedostot"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Suosikit"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Järjestelmäkansio"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Työpöytä"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Fontit"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Oma tietokone"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Järjestemäkansiot"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Paikalliset kiintolevyt"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Tiedostoa ei löydy"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Varmista, että tiedoston nimi on oikein"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -862,7 +820,7 @@ msgstr ""
 "Tiedostoa ei ole olemassa.\n"
 "Haluatko luoda sen?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -870,11 +828,11 @@ msgstr ""
 "Tiedosto on jo olemassa.\n"
 "Haluatko ylikirjoitaa sen?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Kansio sisältää epäkelpoja merkkejä"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -882,119 +840,119 @@ msgstr ""
 "Tiedoston nimi ei voi sisältää näitä merkkejä:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Kansiota ei ole"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Tiedostoa ei ole"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Ylempi kansio"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Luo uusi kansio"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Lista"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Tiedot"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Työpöytä"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Tavallinen"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Lihavoitu"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Kursivoitu"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Lihavoitu kursivoitu"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Musta"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Kastanjanruskea"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Vihreä"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Oliivinvihreä"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Laivastonsininen"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Purppura"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Turkoosi"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Harmaa"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Hopea"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Punainen"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Vaaleanvihreä"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Keltainen"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Sininen"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Tummanpunainen"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Vaaleanturkoosi"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Valkoinen"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Lukukelvoton merkintä"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -1003,11 +961,11 @@ msgstr ""
 "Arvo ei ole paperien määrän alueella.\n"
 "Anna arvo väliltä %d ja %d."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "Alukuarvo ei voi olla suurempi kuin loppuarvo."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1015,12 +973,12 @@ msgstr ""
 "Marginaalit ovat päällekäin tai ulkona paperin alueelta.\n"
 "Määritä marginaalit uudestaan."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Kopioiden määrä täytyy antaa."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1028,31 +986,31 @@ msgstr ""
 "Tulostin ei tue näin montaa kopiota.\n"
 "Valitse arvo väliltä 1 ja %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Tulostinvirhe."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Oletustulostinta ei ole määritetty."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Tulostinta ei löydy."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Muisti loppu."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Virhe."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Tuntematon tulostinajuri."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1060,148 +1018,148 @@ msgstr ""
 "Jotta voisit käyttää tulostimia tai muokata niiden asetuksia, sinun täytyy "
 "ensin asentaa jokin tulostin."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Valitse fontin koko väliltä %d ja %d pistettä."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Tallenna"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "&Kansioon:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Tallenna"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Avaa tiedosto"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Valmis"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Pysäytetty; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Virhe; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Tuhoutumassa; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Paperitukos; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Paperi loppu; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Syötä paperi käsin; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Ongelma paperin kanssa; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Ei yhteyttä tulostimeen; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "Tiedonsiirto meneillään; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Varattu; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Tulostaa; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Paperin luovutustaso on täynnä; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Ei saatavilla; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Odottaa; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Käsitellään; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Alustetaan; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Lämmitetään; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Väriaine vähissä; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Ei väriainetta; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Käyttäjän keskeyttämä; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Muisti loppu; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Tulostimen kansi on auki; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Tulostinpalvelin tuntematon; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Virransäästötila; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Oletustulostin; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Jonossa on %d dokumenttia"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Marginaalit (tuumina)"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Marginaalit (mm)"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -8070,6 +8028,16 @@ msgstr "Alkuperäinen sijainti"
 msgid "Date deleted"
 msgstr "Poistoaika"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Työpöytä"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Oma tietokone"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Ohjauspaneeli"
@@ -8098,6 +8066,10 @@ msgstr "Haluatko lopettaa Wine-istunnon?"
 msgid "Start Menu\\Programs"
 msgstr "Käynnistä-valikko\\Ohjelmat"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Omat tiedostot"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Suosikit"
@@ -13583,6 +13555,10 @@ msgstr "&Aseta..."
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Fontit"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index dc4943b528f..a6876e55c23 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -56,8 +56,8 @@ msgstr "&Supprimer"
 msgid "Support Information"
 msgstr "Informations de support"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -139,10 +139,10 @@ msgid "&Install"
 msgstr "&Installer"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -292,11 +292,11 @@ msgstr "Annulation..."
 msgid "Properties for %s"
 msgstr "Propriétés de %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Appliquer"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Aide"
 
@@ -329,9 +329,9 @@ msgstr "&Fermer"
 msgid "R&eset"
 msgstr "&Réinitialiser"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -385,459 +385,418 @@ msgstr "Aujourd'hui :"
 msgid "Go to today"
 msgstr "Aller à aujourd'hui"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Ouvrir"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "&Nom de fichier :"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Répertoires"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Liste des fichiers de &type :"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Lecteurs :"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "Lectu&re seule"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Enregistrer"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Imprimer"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Imprimante :"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Zone d'impression"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Tout"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "&Sélection"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Pages"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Configurer..."
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&De :"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&à :"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&Qualité d'impression :"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Imprimer dans un &fichier"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Copies t&riées"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Configuration de l'impression"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Imprimante"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Imprimante par défaut"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[aucune]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Imprimante &spécifique"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Orientation"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "&Portrait"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "P&aysage"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Papier"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Taille :"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Source :"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Police"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Police :"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "St&yle :"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "T&aille :"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Effets"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Barré"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Souligné"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Couleur :"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Aperçu"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "ÀàCcÇçEeÉéÈèÊêIiÏïÎîLlUuÙù12"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Sc&ript :"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Couleurs"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "Couleurs de base :"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "Couleurs personnalisées :"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Couleur | &Uni"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Rouge :"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Vert :"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "Bl&eu :"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Teinte :"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Satur. :"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Lum. :"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Ajouter aux couleurs personnalisées"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Définir les couleurs personnalisées >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Recherche"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Rechercher :"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Mots &entiers seulement"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "Respecter la &casse"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Direction"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Haut"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "&Bas"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Suivant"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Remplacer"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "R&emplacer par :"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Remplacer"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Remplacer &tout"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Imprimer dans un fichier"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Propriétés"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Nom :"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "État :"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Type :"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Emplacement :"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Copies"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Nombre de copies :"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "Copies assemblées"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "&Pages"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Sélection"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&de :"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&à :"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Tai&lle :"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "Source :"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "&Portrait"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "Pa&ysage"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Mise en page"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Bac :"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Portrait"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Marges"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&Gauche :"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Droite :"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&Haut :"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Bas :"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "&Imprimante..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "&Rechercher dans"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "&Nom du fichier :"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Fichiers du &type :"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "&Lecture seule"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Ouvrir"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr "Nom du fichier :"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr "Fichiers du type :"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "À propos du sélecteur de répertoires"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Dossiers Documents"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Mes documents"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Mes favoris"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Chemin système (path)"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Bureau"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Polices"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Poste de travail"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Répertoires système"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Disques locaux"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Fichier introuvable"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Veuillez vérifier que le nom de fichier indiqué est correct"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -845,7 +804,7 @@ msgstr ""
 "Ce fichier n'existe pas.\n"
 "Souhaitez-vous le créer ?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -853,11 +812,11 @@ msgstr ""
 "Ce fichier existe déjà.\n"
 "Voulez-vous le remplacer ?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Le chemin d'accès contient des caractères invalides"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -865,119 +824,119 @@ msgstr ""
 "Un nom de fichier ne peut contenir aucun des caractères suivants :\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Le chemin d'accès n'existe pas"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Le fichier n'existe pas"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Remonter d'un niveau"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Créer un nouveau dossier"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Liste"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Détails"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Afficher le bureau"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Normal"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Gras"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Italique"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Gras italique"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Noir"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Marron"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Vert"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Olive"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Bleu marine"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Pourpre"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Sarcelle"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Gris"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Argent"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Rouge"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Citron vert"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Jaune"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Bleu"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Fuchsia"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Eau"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Blanc"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Entrée illisible"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
@@ -985,11 +944,11 @@ msgstr ""
 "Cette valeur n'est pas dans l'intervalle de pages.\n"
 "Veuillez indiquer une valeur entre %1!d! et %2!d!."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "Le champ « de » ne peut être plus grand que le champ « à »."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -997,11 +956,11 @@ msgstr ""
 "Les marges se chevauchent ou dépassent du papier\n"
 "Veuillez indiquer de nouvelles valeurs."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Le champ « Nombre de copies » ne peut être vide."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1009,31 +968,31 @@ msgstr ""
 "Votre imprimante ne peut gérer autant de copies.\n"
 "Veuillez indiquer un nombre de copies entre 1 et %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Une erreur d'impression s'est produite."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Imprimante par défaut non définie."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Impossible de trouver l'imprimante."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Mémoire insuffisante."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Une erreur s'est produite."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Pilote d'imprimante inconnu."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1042,147 +1001,147 @@ msgstr ""
 "comme la configuration de l'imprimante ou l'impression d'un document, vous "
 "devez installer une imprimante. Veuillez en installer une et réessayez."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Sélectionnez une taille de police entre %1!d! et %2!d! points."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Enregistrer"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Enregistrer &dans :"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Enregistrer"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Ouvrir le fichier"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Prêt"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Suspendu ; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Erreur ; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "En attente de suppression ; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Bourrage papier ; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Plus de papier ; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Insertion manuelle du papier ; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Problème de papier ; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "L'imprimante n'est pas en ligne ; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "E/S actives ; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Occupée ; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "En cours d'impression ; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Le bac de sortie est plein ; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Non disponible ; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "En attente ; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Traitement en cours ; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Démarrage en cours ; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Préchauffage ; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Toner presque vide ; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Pas de toner ; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Abandon de page ; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Interrompu par l'utilisateur ; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Mémoire insuffisante ; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Le capot de l'imprimante est ouvert ; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Serveur d'impression inconnu ; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Mode économie d'énergie ; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Imprimante par défaut ; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Il y a %d document(s) dans la file d'attente"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Marges (pouces)"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Marges (mm)"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -7877,6 +7836,15 @@ msgstr "Emplacement d'origine"
 msgid "Date deleted"
 msgstr "Date de suppression"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Bureau"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Poste de travail"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Panneau de configuration"
@@ -7905,6 +7873,10 @@ msgstr "Voulez-vous clôturer la session Wine ?"
 msgid "Start Menu\\Programs"
 msgstr "Menu Démarrer\\Programmes"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Mes documents"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favoris"
@@ -13771,6 +13743,10 @@ msgstr "&Définir..."
 msgid "History"
 msgstr "Historique"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Polices"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Petite"
diff --git a/po/he.po b/po/he.po
index 1ba2434f943..0c62b520621 100644
--- a/po/he.po
+++ b/po/he.po
@@ -57,8 +57,8 @@ msgstr "ה&סרה"
 msgid "Support Information"
 msgstr "פרטי תמיכה"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -137,10 +137,10 @@ msgid "&Install"
 msgstr "ה&תקנה"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -286,11 +286,11 @@ msgstr "בהליכי ביטול..."
 msgid "Properties for %s"
 msgstr "מאפיינים עבור %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "ה&חלה"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "עזרה"
 
@@ -323,9 +323,9 @@ msgstr "&סגירה"
 msgid "R&eset"
 msgstr "&איפוס"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -379,461 +379,420 @@ msgstr "היום:"
 msgid "Go to today"
 msgstr "מעבר ליום הנוכחי"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "פתיחה"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "&שם הקובץ:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&תיקיות:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "הצגת קבצים מ&סוג:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&כוננים:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&קריאה בלבד"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "שמירה בשם..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "שמירה בשם"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "הדפסה"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "מדפסת:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "טווח ההדפסה"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "ה&כול"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "&בחירה"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&עמודים"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "ה&גדרה"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&מ־:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&עד:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&איכות ההדפסה:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "הדפסה ל&קובץ"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "דחוס"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "הגדרות הדפסה"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "מדפסת"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "מדפסת &בררת המחדל"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[ללא]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "מדפסת מ&סוימת"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "כיווניות"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "ל&אורך"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "ל&רוחב"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "נייר"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&גודל"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "מ&קור"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "גופן"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&גופן:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "&סגנון הגופן:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&גודל:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "אפקטים"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "קו חו&צה"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "קו &תחתי"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&צבע:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "דוגמה"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZzנסשת"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "&כתב:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "צבע"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "צבעים &בסיסיים:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "צבעים &מותאמים אישית:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "צבע |  א&חיד"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&אדום:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&ירוק:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&כחול:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&גוון:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&רוויה:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "א&ור:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "הו&ספה לצבעים המותאמים אישית"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "הגדרת  צבעים &מותאמים אישית >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "חיפוש"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "חיפוש &אחר מה:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "התאמת מילים &שלמות בלבד"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "התאמת &רשיות"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "כיוון"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "למ&עלה"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "למ&טה"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "חיפוש ה&בא"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "החלפה"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "הח&לפה ב־:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "ה&חלפה"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "החלפת ה&כול"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "הדפסה ל&קובץ"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "מ&אפיינים"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&שם:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "מצב:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "סוג:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "היכן:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "הערה:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "עותקים"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "מספר ה&עותקים:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "&איסוף"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "&עמודים"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&בחירה"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&מ־:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&עד:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "&גודל:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "מ&קור:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "ל&אורך"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "ל&רוחב"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "הגדרת עמוד"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "מ&גש:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "ל&אורך"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "גבולות"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&שמאליים:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&ימניים:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&עליונים:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&תחתונים:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "מ&דפסת..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "&חיפוש תחת:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "&שם הקובץ:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "קבצים מ&סוג:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "פתיחה לקריאה &בלבד"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&פתיחה"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&שם הקובץ:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "קבצים מ&סוג:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "על &אודות בדיקת FolderPicker"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "תיקיות מסמכים"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "המסמכים שלי"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "המועדפים שלי"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "נתיב המערכת"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr "שולחן העבודה"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "גופנים"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "המחשב שלי"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "תיקיות המערכת"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "כוננים קשיחים מקומיים"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "הקובץ לא נמצא"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "נא לוודא שצוין שם הקובץ הנכון"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -841,7 +800,7 @@ msgstr ""
 "הקובץ אינו קיים.\n"
 "האם ברצונך ליצור אותו?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -849,11 +808,11 @@ msgstr ""
 "הקובץ כבר קיים.\n"
 "האם ברצונך להחליף אותו?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "תווים שגויים בנתיב"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -861,119 +820,119 @@ msgstr ""
 "שם קובץ לא יכול להכיל אף אחד מהתווים הבאים:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "הנתיב אינו קיים"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "הקובץ אינו קיים"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "רמה אחת למעלה"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "יצירת תיקייה חדשה"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "רשימה"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "פרטים"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "עיון בשולחן העבודה"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "רגיל"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "מודגש"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "נטוי"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "מודגש ונטוי"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "שחור"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "אדום עז"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "ירוק"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "זית"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "כחול כהה"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "סגול"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "כחול ים"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "אפור"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "כסוף"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "אדום"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "ירקרק"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "צהוב"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "כחול"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "פוקסיה"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "תכלת"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "לבן"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "רשומה בלתי קריאה"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -982,11 +941,11 @@ msgstr ""
 "ערך זה אינו נמצא בטווח העמודים.\n"
 "נא להזין ערך בין %d ל־%d."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "הערך של הרשומה 'מ־' לא יכול לחרוג מערך הרשומה 'עד'."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -994,11 +953,11 @@ msgstr ""
 "השוליים חופפים או גולשים אל מחוץ לגבולות העמוד.\n"
 "נא להזין שוב את ערכי השוליים."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "הערך שצוין בשדה 'מספר העותקים' לא יכול להישאר ריק."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1006,31 +965,31 @@ msgstr ""
 "המדפסת שלך אינה תומכת בכמות כזו גדולה של עותקים.\n"
 "נא להזין ערך בין 1 ל־%d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "אירעה שגיאת מדפסת."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "לא הוגדרה מדפסת בררת מחדל."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "לא ניתן למצוא את המדפסת."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "הזיכרון אזל."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "אירעה שגיאה."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "מנהל ההתקן של המדפסת אינו ידוע."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1038,148 +997,148 @@ msgstr ""
 "לפני שניתן יהיה לבצע פעולות הקשורות במדפסתכגון הגדרות עמוד או הדפסת מסמך, "
 "עליך להתקין מדפסת. נא להתקין אחת כזאת ולנסות שוב."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "נא לבחור גודל גופן בין %d ל־%d נקודות."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&שמירה"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "שמירה &תחת:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "שמירה"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "פתיחת קובץ"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "מוכן"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "מושהית; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "שגיאה; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "בהמתנה למחיקה; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "מעצור נייר; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "נגמר הנייר; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "הזנת הנייר ידנית; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "בעיית נייר; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "המדפסת מנותקת; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "קלט/פלט פעיל; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "עסוקה; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "בהדפסה; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "מגש הפלט מלא; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "לא זמינה; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "בהמתנה; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "מעבדת; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "מופעלת; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "מתחממת; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "כרית הדיו עומדת להיגמר; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "אין כרית דיו; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "הרצת עמוד; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "המשתמש הפריע; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "הזיכרון אזל; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "דלת המדפסת פתוחה; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "שרת ההדפסה אינו מוכר; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "מצב חיסכון באנרגיה; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "מדפסת בררת המחדל; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "ישנם %d מסמכים הממתינים בתור"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "שוליים [אינטשים]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "שוליים [מ״מ]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "מ״מ"
@@ -8078,6 +8037,15 @@ msgstr "המיקום המקורי"
 msgid "Date deleted"
 msgstr "תאריך המחיקה"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr "שולחן העבודה"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "המחשב שלי"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "לוח הבקרה"
@@ -8106,6 +8074,10 @@ msgstr "האם ברצונך לכבות את הפעלת ה־Wine שלך?"
 msgid "Start Menu\\Programs"
 msgstr "תפריט ההתחלה\\תכניות"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "המסמכים שלי"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "מועדפים"
@@ -13836,6 +13808,10 @@ msgstr "ה&גדרה..."
 msgid "History"
 msgstr "היסטוריה"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "גופנים"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "קטנים"
diff --git a/po/hi.po b/po/hi.po
index a3af84d96cf..09e3d6ef312 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -51,8 +51,8 @@ msgstr ""
 msgid "Support Information"
 msgstr ""
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -126,10 +126,10 @@ msgid "&Install"
 msgstr ""
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -274,11 +274,11 @@ msgstr ""
 msgid "Properties for %s"
 msgstr "सूचना (&o)"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr ""
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr ""
 
@@ -311,9 +311,9 @@ msgstr ""
 msgid "R&eset"
 msgstr ""
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -367,796 +367,754 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr ""
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr ""
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr ""
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr ""
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr ""
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr ""
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr ""
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr ""
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr ""
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 #, fuzzy
 msgid "Printer:"
 msgstr "फ़ॉन्ट (&F)..."
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 #, fuzzy
 msgid "Print range"
 msgstr "फ़ॉन्ट (&F)..."
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr ""
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr ""
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr ""
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr ""
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr ""
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr ""
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr ""
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr ""
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr ""
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr ""
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 #, fuzzy
 msgid "Printer"
 msgstr "फ़ॉन्ट (&F)..."
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr ""
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr ""
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr ""
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr ""
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr ""
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr ""
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr ""
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr ""
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr ""
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 #, fuzzy
 msgid "Font"
 msgstr "फ़ॉन्ट (&F)..."
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 #, fuzzy
 msgid "&Font:"
 msgstr "फ़ॉन्ट (&F)..."
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr ""
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr ""
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr ""
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr ""
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr ""
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr ""
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr ""
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr ""
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr ""
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr ""
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr ""
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr ""
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr ""
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr ""
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr ""
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr ""
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr ""
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr ""
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr ""
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr ""
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr ""
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr ""
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr ""
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr ""
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr ""
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr ""
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr ""
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr ""
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr ""
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr ""
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr ""
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr ""
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr ""
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "सूचना (&o)"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr ""
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr ""
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr ""
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr ""
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr ""
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr ""
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr ""
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr ""
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr ""
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr ""
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr ""
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr ""
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr ""
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr ""
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr ""
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr ""
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr ""
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr ""
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr ""
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr ""
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr ""
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr ""
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr ""
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr ""
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 #, fuzzy
 msgid "P&rinter..."
 msgstr "फ़ॉन्ट (&F)..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr ""
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr ""
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr ""
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr ""
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr ""
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr ""
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr ""
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr ""
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr ""
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr ""
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr ""
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr ""
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr ""
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-#, fuzzy
-msgid "Fonts"
-msgstr "फ़ॉन्ट (&F)..."
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr ""
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr ""
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr ""
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr ""
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr ""
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
 msgstr ""
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr ""
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
 msgstr ""
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr ""
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr ""
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr ""
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr ""
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr ""
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr ""
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr ""
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr ""
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr ""
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr ""
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr ""
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr ""
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr ""
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr ""
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr ""
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr ""
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr ""
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr ""
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr ""
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr ""
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr ""
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr ""
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr ""
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr ""
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
 msgstr ""
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr ""
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
 msgstr ""
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr ""
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
 msgstr ""
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr ""
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr ""
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr ""
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr ""
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr ""
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr ""
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 msgstr ""
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr ""
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr ""
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr ""
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr ""
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr ""
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr ""
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr ""
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr ""
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr ""
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr ""
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr ""
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr ""
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr ""
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr ""
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr ""
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr ""
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr ""
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr ""
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr ""
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr ""
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr ""
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr ""
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr ""
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr ""
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr ""
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr ""
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr ""
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr ""
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr ""
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr ""
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr ""
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr ""
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr ""
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr ""
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr ""
@@ -7721,6 +7679,15 @@ msgstr ""
 msgid "Date deleted"
 msgstr ""
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr ""
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr ""
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -7749,6 +7716,10 @@ msgstr ""
 msgid "Start Menu\\Programs"
 msgstr ""
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr ""
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr ""
@@ -13001,6 +12972,11 @@ msgstr ""
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+#, fuzzy
+msgid "Fonts"
+msgstr "फ़ॉन्ट (&F)..."
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 54fc5067ed4..eaf851fcf4f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -56,8 +56,8 @@ msgstr "E&ltávolítás"
 msgid "Support Information"
 msgstr "Támogatási információ"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -139,10 +139,10 @@ msgid "&Install"
 msgstr "&Telepítés"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -296,11 +296,11 @@ msgstr "Megszakítás..."
 msgid "Properties for %s"
 msgstr "Tulajdonságok: %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Alkalmazás"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Súgó"
 
@@ -333,9 +333,9 @@ msgstr "&Bezárás"
 msgid "R&eset"
 msgstr "Alaph&elyzet"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -394,472 +394,420 @@ msgstr "Ma:"
 msgid "Go to today"
 msgstr "Ugrás mára"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Megnyitás"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "Fájl&név:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Könyvtár:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Fájl&típus:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Meghajtó:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Csak olvasható"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Mentés másként..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Mentés másként"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Nyomtató:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Nyomtatási terület"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Mind"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "&Kiválasztott"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Lapok"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Beállítás"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "Et&tõl:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "Ed&dig:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "Mi&nőség:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "&Fájlba nyomtat"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Sűrű"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Nyomtató beállítása"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Nyomtató"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Alapértelmezett nyomtató"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[nincs]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "&Adott nyomtató"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Írásirány"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "Á&lló"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Vízszintes"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Papír"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Méret"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "Fo&rrás"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Betûtípus"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Betûtípus:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "Betû&stílus:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "Méret:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Effektusok"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "Á&thúzott"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Aláhúzott"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "Szín:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Minta"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZzÁáŐőÉé"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Szkr&ipt:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Szín"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Alap színek:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Egyedi színek:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Szín |  &Tömör"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Vörös:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Zöld:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Kék:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Hue:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Sat:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Lum:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Egyedi színekhez adás"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "E&gyedi szín definiálás >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Keresés"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Mit keressen:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Teljes &szavak keresése"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "Kis/&nagybetű különb."
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Irány"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Vissza"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "&Előre"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Következő"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Csere"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "Mire &cserélje:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "C&serél"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "M&indent cserél"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Nyomtatás fáj&lba"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Tulajdonságok"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Név:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Állapot:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Típus:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Hely:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Megjegyzés:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Másolatok"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Másola&tok száma:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "Le&válogatás"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "Oldala&k"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Kijelölés"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "Et&tõl:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "Ed&dig:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Size:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Forrás:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "&Álló"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "Fe&kvõ"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Oldalbeállítás"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Forrás:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Függőleges"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Margók"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&Bal:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Jobb:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "F&elül:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Alsó:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "Ny&omtató..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "H&ely:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "Fájl&név:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Fájl&típus:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Me&gnyitás csak olvashatóként"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Megnyitás"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Fájlnév:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "Fájl&típus:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "M&appaválasztó teszt névjegye"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Dokumentum mappák"
-
-#: comdlg32.rc:31 shell32.rc:200
-#, fuzzy
-msgid "My Documents"
-msgstr ""
-"#-#-#-#-#  hu.po (Wine)  #-#-#-#-#\n"
-"My Documents\n"
-"#-#-#-#-#  hu.po (Wine)  #-#-#-#-#\n"
-"Dokumentumok"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Kedvencek"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Rendszer elérési útvonal"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Asztal"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Betûtípusok"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-#, fuzzy
-msgid "My Computer"
-msgstr ""
-"#-#-#-#-#  hu.po (Wine)  #-#-#-#-#\n"
-"Sajátgép\n"
-"#-#-#-#-#  hu.po (Wine)  #-#-#-#-#\n"
-"Számítógép"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Rendszermappák"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Helyi merevlemezek"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Fájl nem található"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Kérem ellenõrizze, hogy helyes fájnevet adott-e meg"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -867,7 +815,7 @@ msgstr ""
 "A fájl nem létezik.\n"
 "Létrehozza a fájlt?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -875,11 +823,11 @@ msgstr ""
 "A fájl már létezik.\n"
 "Cseréli a fájlt?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Érvénytelen karakter(ek) van(nak) az útvonalban"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -887,119 +835,119 @@ msgstr ""
 "A fájlnév nem tartalmazhatja ezeket a karaktereket:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Útvonal nem létezik"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Fájl nem létezik"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Feljebb egy szintet"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Új mappa léterehozása"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Lista"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Részletek"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Navigálás az asztalra"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Szokásos"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Félkövér"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Dõlt"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Félkövér dõlt"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Fekete"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Gesztenyebarna"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Zöld"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Olajzöld"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Tengerkék"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Lila"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Kékeszöld"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Szürke"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Ezüst"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Piros"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Borostnyán"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Sárga"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Kék"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Vöröses lila"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Kékeszöld"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Fehér"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Olvashatatlan bejegyzés"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -1008,11 +956,11 @@ msgstr ""
 "Ez az érték nincs az oldal határain belûl.\n"
 "Kérem adjon meg egy értéket %d és %d között."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "Az 'Ettõl' mezõ nem haladhatja meg az 'Eddig' mezõt."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1020,12 +968,12 @@ msgstr ""
 "A margók átfedik egymást vagy kívül esnek a papír határain.\n"
 "Kérem adja meg újra a margókat."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "A 'Másolatok száma' mezõ nem lehet üres."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1033,19 +981,19 @@ msgstr ""
 "Ezt a nagyszámú másolatok számát nem támogatja az Ön nyomtatója.\n"
 "Kérem adjon meg egy értéket 1 és %d között."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Nyomtatási hiba történt."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Nincs alapértelmezett nyomtató megadva."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Nem találom a nyomtatót."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 #, fuzzy
 msgid "Out of memory."
 msgstr ""
@@ -1054,15 +1002,15 @@ msgstr ""
 "#-#-#-#-#  hu.po (Wine)  #-#-#-#-#\n"
 "Elfogyott a memória."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Hiba történt."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Ismeretlen nyomtató eszközmeghajtó."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 #, fuzzy
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
@@ -1072,148 +1020,148 @@ msgstr ""
 "vagy dokumentum nyomtatása, Önnek telepítenie kell egy nyomtatót. Please "
 "install one and retry."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Válasszon betûméretet %d és %d pont között."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Mentés"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Mentés &ide:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Mentés"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Fájl megnyitása"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "kész"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Szünet; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Hiba; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Törlés folyamatban; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Papír beragadás; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Elfogyott a papír; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Kézi papírbehelyezés; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Papír probléma; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "A nyomtató nem elérhetõ; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "I/O aktív; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Foglalt; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Nyomtatás; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Kimeneti tálca megtelt; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Nem elérhetõ; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Várakozik; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Feldolgozás; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Inicializálás; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Bemelegítés; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Alacsony toner szint; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Nincs toner; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Oldal becsavarozás; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Felhasználó által megszakítva; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Elfogyott a memória; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "A nyomtató fedele nyitva; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Nyomtató kiszolgáló ismeretlen; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "energiatakarékos mód; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Alapértelmezett nyomtató; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "%d dokumentum van a sorban"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Margók [hüvejk]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Margók [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -8240,6 +8188,21 @@ msgstr "Eredeti hely"
 msgid "Date deleted"
 msgstr "Törlési dátum"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Asztal"
+
+#: shell32.rc:154 regedit.rc:200
+#, fuzzy
+msgid "My Computer"
+msgstr ""
+"#-#-#-#-#  hu.po (Wine)  #-#-#-#-#\n"
+"Sajátgép\n"
+"#-#-#-#-#  hu.po (Wine)  #-#-#-#-#\n"
+"Számítógép"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Vezérlőpult"
@@ -8268,6 +8231,15 @@ msgstr "Le szeretné állítani a Wine munkamenetét?"
 msgid "Start Menu\\Programs"
 msgstr "Start Menu\\Programs"
 
+#: shell32.rc:200
+#, fuzzy
+msgid "My Documents"
+msgstr ""
+"#-#-#-#-#  hu.po (Wine)  #-#-#-#-#\n"
+"My Documents\n"
+"#-#-#-#-#  hu.po (Wine)  #-#-#-#-#\n"
+"Dokumentumok"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favorites"
@@ -13821,6 +13793,10 @@ msgstr "&Definiálás..."
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Betûtípusok"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 27d2a48da70..9fbc306c401 100644
--- a/po/it.po
+++ b/po/it.po
@@ -56,8 +56,8 @@ msgstr "&Rimuovi..."
 msgid "Support Information"
 msgstr "Informazioni di supporto"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -139,10 +139,10 @@ msgid "&Install"
 msgstr "&Installa"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -291,11 +291,11 @@ msgstr "Annullando..."
 msgid "Properties for %s"
 msgstr "Proprietà di %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Applica"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Aiuto"
 
@@ -328,9 +328,9 @@ msgstr "&Chiudi"
 msgid "R&eset"
 msgstr "R&eimpostare"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -384,459 +384,418 @@ msgstr "Oggi:"
 msgid "Go to today"
 msgstr "Vai a oggi"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Apri"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "&Nome del file:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Percorso:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "&Tipo del file:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Unità:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Sola lettura"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Salva con nome..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Salva con nome"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Stampa"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Stampante:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Pagine da stampare"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Tutti"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "S&elezione"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Pagine"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Configura"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&Da:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&A:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&Qualità di stampa:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Stampa su fi&le"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Condensato"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Impostazioni di stampa"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Stampante"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "Stampante pre&definita"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[nessuna]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Stampante s&pecifica"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Orientamento"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "&Ritratto"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Paesaggio"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Foglio"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "Dimen&sione"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Origine"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Carattere"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Carattere:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "&Stile:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "Dimen&sione:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Effetti"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Barrato"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "S&ottolineato"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Colore:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Esempio"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Sc&ript:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Colore"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "Colori di base:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Colori personalizzati:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Colore |  Sol&ido"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Rosso:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Verde:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Blu:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Tinta:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Sat:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Lum:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Aggiungi ai colori personalizzati"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Definisci i colori personalizzati >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Trova"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Trova:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Solo parole &intere"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "&Maiuscole/Minuscole"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Direzione"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "A&lto"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "&Basso"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "Trova &successivo"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "S&ostituisci con:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "Sostit&uisci"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Sostituisci &tutto"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Stampa su fi&le"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Proprietà"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Nome:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Stato:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Tipo:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Dove:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Commento:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Copie"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Numero di &copie:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "&Fascicola"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "Pa&gine"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Selezione"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&da:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&a:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "&Dimensione:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Origine:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "&Ritratto"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "P&aesaggio"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Impostazioni di pagina"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Vassoio:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Ritratto"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Bordi"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "Si&nistra:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Destro:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "S&uperiore:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Inferiore:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "&Stampante..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "Cerca &in:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "&Nome del file:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "&Tipo del file:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Apri in &sola lettura"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Apri"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr "Nome del file:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr "Tipo del file:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&Informazioni sul test FolderPicker"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Cartelle dei documenti"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Documenti"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Preferiti"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Percorso di sistema"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Scrivania"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Caratteri"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Risorse del computer"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Cartelle di sistema"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Dischi rigidi locali"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "File non trovato"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Controllare che il nome del file fornito sia corretto"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -844,7 +803,7 @@ msgstr ""
 "Il file non esiste\n"
 "Creare il file"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -852,11 +811,11 @@ msgstr ""
 "Il file esiste già.\n"
 "Sovrascriverlo?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Caratteri invalidi nel percorso"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -864,119 +823,119 @@ msgstr ""
 "Il nome di un file non può contenere i seguenti caratteri:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Il percorso specificato non esiste"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Il file non esiste"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Su di un livello"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Crea nuova cartella"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Lista"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Dettagli"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Vai alla Scrivania"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Regolare"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Grassetto"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Corsivo"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Grassetto corsivo"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Nero"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Marrone rossiccio"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Verde"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Verde oliva"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Blu oltremare"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Porpora"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Foglia di Tè"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Grigio"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Argento"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Rosso"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Verde cedro"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Giallo"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Blu"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Fucsia"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Acqua"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Bianco"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Elemento non leggibile"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
@@ -984,11 +943,11 @@ msgstr ""
 "Questo valore non si trova all'interno della pagina.\n"
 "Usare un valore compreso tra %1!d! e %2!d!."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "La voce 'da' non può eccedere la voce 'a'."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -996,11 +955,11 @@ msgstr ""
 "I margini si sovrappongono o si trovano oltre il limite del foglio.\n"
 "Per favore ridefinire i margini."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Il valore del numero 'Numero di copie' non può essere vuoto."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1008,31 +967,31 @@ msgstr ""
 "Questo alto numero di copie non è supportato dalla stampante.\n"
 "Inserire un valore compreso tra 1 e %d"
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Si è verificato un errore della stampante."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Non è stata impostata una stampante predefinita."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Stampante non trovata."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Memoria esaurita."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Si è verificato un errore."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Driver della stampante sconosciuto."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1041,147 +1000,147 @@ msgstr ""
 "o stampare un documento, bisogna installare una stampante. Si consiglia di "
 "installare la stampante e poi ritentare."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Scegli la dimensione del carattere tra %1!d! e %2!d! punti."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Salva"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Salva &in:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Salva"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Apri file"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Pronto"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "In pausa; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Errore; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "In attesa di annullamento; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Carta inceppata; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Carta esaurita; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Alimentazione manuale della carta; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Si è verificato un problema con la carta; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Stampante offline; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "I/O Attivo; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Stampante occupata; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Stampa in corso; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Il vassoio di uscita è pieno; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Non disponibile; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Attesa; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Elaborazione; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Inizializzazione; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "La stampante si sta riscaldando; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Il livello del toner è basso; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Manca il toner; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Punt della pagina; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Interrotto dall'utente; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Memoria esaurita; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "La porta stampante è aperta; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Server di stampa sconosciuto; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Modalità risparmio energetico; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Stampante predefinita; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Ci sono %d documenti nella coda di stampa"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Margini [pollici]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Margini [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -7862,6 +7821,15 @@ msgstr "Locazione originale"
 msgid "Date deleted"
 msgstr "Data di eliminazione"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Scrivania"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Risorse del computer"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Pannello di Controllo"
@@ -7890,6 +7858,10 @@ msgstr "Vuoi terminare la sessione di Wine?"
 msgid "Start Menu\\Programs"
 msgstr "Menu Start\\Programmi"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Documenti"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favoriti"
@@ -13699,6 +13671,10 @@ msgstr "&Definisci..."
 msgid "History"
 msgstr "Cronologia"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Caratteri"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Piccoli"
diff --git a/po/ja.po b/po/ja.po
index 94dd4917e36..2ce74f1aa20 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -56,8 +56,8 @@ msgstr "削除(&R)"
 msgid "Support Information"
 msgstr "サポート情報"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -137,10 +137,10 @@ msgid "&Install"
 msgstr "インストール(&I)"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -289,11 +289,11 @@ msgstr "キャンセル…"
 msgid "Properties for %s"
 msgstr "Properties for %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "適用(&A)"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "ヘルプ"
 
@@ -326,9 +326,9 @@ msgstr "閉じる(&C)"
 msgid "R&eset"
 msgstr "リセット(R&)"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -382,459 +382,418 @@ msgstr "今日:"
 msgid "Go to today"
 msgstr "今日へ移動"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "開く"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "ファイル名(&N):"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "ディレクトリ(&D):"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "ファイルの種類(&T):"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "ドライブ(&V):"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Read Only"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "名前をつけて保存"
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "名前を付けて保存"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "印刷"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "使用するプリンタ:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "印刷範囲"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "すべて(&A)"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "選択した部分(&E)"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "ページ設定(&P)"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "プリンタの設定(&S)"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "ページから(&F):"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "ページまで(&T):"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "印字品質(&Q):"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "ファイルへ出力(&L)"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Condensed"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "プリンタの設定"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "プリンタの選択"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "通常使うプリンタ(&D)"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "(通常使うプリンタが設定されていません)"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "その他のプリンタ(&P)"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "方向"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "縦(&R)"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "横(&L)"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "用紙"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "用紙サイズ(&Z)"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "給紙方法(&S)"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "フォントの指定"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "フォント名(&F):"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "スタイル(&Y):"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "サイズ(&S):"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "文字飾り"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "取り消し線(&K)"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "下線(&U)"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "配色(&C):"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "サンプル"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "文字セット(&I):"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "色の設定"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "基本色(&B):"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "作成した色(&C):"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "色 |  純色(&I)"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "赤(&R):"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "ç·‘(&G):"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "青(&B):"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "色合い(&H):"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "鮮やかさ(&S):"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "明るさ(&L):"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "色の追加(&A)"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "色の作成(&D) >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "検索"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "検索する文字列(&N):"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "単語単位で検索(&W)"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "大文字と小文字を区別する(&C)"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "検索する方向"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "上(&U)"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "下(&D)"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "次を検索(&F)"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "文字列の置換"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "置換後の文字列(&P):"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "置換して次に(&R)"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "すべてを置換(&A)"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "ファイルへ出力(&L)"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "プロパティ(&P)"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Name:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "状態:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "種類:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "場所:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "コメント:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "印刷部数"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "部数(&C):"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "部単位で印刷(&O)"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "ページ指定(&G)"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "選択した部分(&S)"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "ページから(&F):"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "ページまで(&T):"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "サイズ(&Z):"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Source:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "縦(&O)"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "横(&A)"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "ページ設定"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "給紙方法(&T):"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "縦(&P)"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "余白"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "å·¦(&E):"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "右(&R):"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "上(&O):"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "下(&B):"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "プリンタ(&R)..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "ファイルの場所(&I):"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "ファイル名(&N):"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "ファイルの種類(&T):"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "読み取り専用ファイルとして開く(&R)"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "開く(&O)"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr "ファイル名:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr "ファイルの種類:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "バージョン情報(&A)"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "ドキュメント フォルダ"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "My Documents"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "お気に入り"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "システム パス"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr "デスクトップ"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "フォント"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "マイ コンピュータ"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "システム フォルダ"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "ローカル ハード ドライブ"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "ファイルが見つかりません。"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "ファイル名を確認してください。"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -842,7 +801,7 @@ msgstr ""
 "このファイルは存在しません。\n"
 "作成しますか?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -850,11 +809,11 @@ msgstr ""
 "ファイルは既に存在します。\n"
 "上書きしますか?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "ファイル名に使えない文字"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -862,119 +821,119 @@ msgstr ""
 "ファイル名には以下の文字は使えません:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "パスが見つかりません"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "ファイルが見つかりません"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "一つ上のフォルダへ"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "新しいフォルダの作成"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "一覧"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "詳細"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "デスクトップを参照"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "標準"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "太字"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "斜体"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "太字 斜体"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "é»’"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "茶色"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "ç·‘"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "オリーブ"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "ç´º"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "ç´«"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "青緑"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "灰色"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "銀色"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "赤"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "黄緑"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "黄"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "青"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "赤紫"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "水色"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "白"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr ""
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
@@ -982,11 +941,11 @@ msgstr ""
 "この値はページの範囲に含まれません。\n"
 "%1!d! から %2!d! までの値を入力してください。"
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "開始ページの値は、終了ページの値を超えない値にしてください。"
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -994,11 +953,11 @@ msgstr ""
 "余白が重なっているか、用紙の境界を超えています。\n"
 "余白を再入力してください。"
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "部数は、空にできません。"
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1006,31 +965,31 @@ msgstr ""
 "部数がプリンタがサポートしている範囲を超えています。\n"
 "1 から %d までの値を入力してください。"
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "プリンタ エラーが発生しました。"
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "既定のプリンタが定義されていません。"
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "プリンタが見つかりません。"
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "メモリ不足です。"
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "エラーが発生しました。"
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "プリンタ ドライバが不明です。"
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1039,148 +998,148 @@ msgstr ""
 "をインストールする必要があります。 プリンタをインストールしてから再度実行して"
 "ください。"
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr ""
 "フォントサイズを %1!d! ポイントから %2!d! ポイントの間で選択してください。"
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "保存(&S)"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "保存する場所(&I):"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "保存"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "ファイルを開く"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "待機中"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "一時停止 -"
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "エラー -"
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "削除待ち -"
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "紙詰まり -"
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "用紙切れ -"
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "手差し -"
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "用紙の問題 -"
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "オフライン -"
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "入出力中 -"
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "ビジー -"
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "印刷中 -"
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "出力トレイが満杯 -"
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "利用不可 -"
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "待機中 -"
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "処理中 -"
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "初期化中 -"
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "ウォーミング アップ -"
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "トナー少量 -"
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "トナーなし -"
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "処理不能 -"
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "ユーザー操作が必要 -"
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "メモリ不足 -"
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "プリンタ カバー開放 -"
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "プリント サーバ不明 -"
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "省電力モード -"
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "既定のプリンタ "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "キューに %d つの文書"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "余白 [インチ]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "余白 [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -7842,6 +7801,15 @@ msgstr "元の場所"
 msgid "Date deleted"
 msgstr "削除日"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr "デスクトップ"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "マイ コンピュータ"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "コントロール パネル"
@@ -7870,6 +7838,10 @@ msgstr "Wine セッションをシャットダウンしますか?"
 msgid "Start Menu\\Programs"
 msgstr "Start Menu\\Programs"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "My Documents"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favorites"
@@ -13657,6 +13629,10 @@ msgstr "定義(&D)..."
 msgid "History"
 msgstr "履歴"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "フォント"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "小"
diff --git a/po/ko.po b/po/ko.po
index b96c4444457..6cbdc18feb1 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -55,8 +55,8 @@ msgstr "제거(&R)"
 msgid "Support Information"
 msgstr "지원 정보"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -136,10 +136,10 @@ msgid "&Install"
 msgstr "설치(&I)"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -288,11 +288,11 @@ msgstr "취소하는 중.."
 msgid "Properties for %s"
 msgstr "%s 속성"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "적용(&A)"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "도움말"
 
@@ -325,9 +325,9 @@ msgstr "닫기(&C)"
 msgid "R&eset"
 msgstr "재설정(&E)"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -381,459 +381,418 @@ msgstr "오늘:"
 msgid "Go to today"
 msgstr "오늘로 가기"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "열기"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "파일 이름(&N):"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "디렉토리(&D):"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "파일 형식 목록(&T):"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "드라이브(&V):"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "읽기 전용(&R)"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "다른 이름으로 저장..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "다른 이름으로 저장"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "인쇄"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "프린터:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "인쇄 범위"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "모두(&A)"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "선택(&E)"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "쪽(&P)"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "설정(&S)"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "시작(&F):"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "끝(&T):"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "인쇄 품질(&Q):"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "파일로 인쇄(&L)"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "폭이 좁게"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "인쇄 설정"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "프린터"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "기본 프린터(&D)"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[없음]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "선택한 프린터(&P)"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "ë°©í–¥"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "세로(&R)"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "가로(&L)"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "종이"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "크기(&Z)"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "원본(&S)"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "글꼴"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "글꼴(&F):"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "글꼴 스타일(&Y):"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "크기(&S):"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "효과"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "취소선(&K)"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "밑줄(&U)"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "색상(&C):"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "샘플"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "스크립트(&I):"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "색상"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "기본 색상(&B):"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "사용자 정의 색상(&C):"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "색상 | 단색(&I)"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "빨강(&R):"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "녹색(&G):"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "파랑(&B):"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "색상(&H):"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "채도(&S):"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "명도(&L):"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "사용자 정의 색상에 더하기(&A)"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "사용자 정의 색상 결정(&D) >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "찾기"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "찾을 내용(&N):"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "단어 단위로(&W)"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "대/소문자 구분(&C)"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "ë°©í–¥"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "위(&U)"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "아래(&D)"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "다음 찾기(&F)"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "바꾸기"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "바꿀 내용(&P):"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "바꾸기(&R)"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "모두 바꾸기(&A)"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "파일로 인쇄(&L)"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "등록 정보(&P)"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "이름(&N):"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "상태:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "형식:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "위치:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "설명:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "복사본"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "복사본 갯수(&C):"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "ì •ë ¬(&O)"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "페이지(&G)"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "선택 영역(&S)"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "시작(&F):"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "끝(&T):"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "크기(&Z):"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "원본(&S):"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "세로(&O)"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "가로(&A)"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "페이지 설정"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "트레이(&T):"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "세로(&P)"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "가장자리"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "왼쪽(&E):"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "오른쪽(&R):"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "위(&O):"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "아래(&B):"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "프린터(&R)..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "보기(&I):"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "파일 이름(&N):"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "파일 형식(&T):"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "읽기 전용으로 열기(&R)"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "열기(&O)"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr "파일 이름:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr "파일 형식:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "폴더-선택기-테스트 에 관하여(&A)"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "문서 폴더"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "내 문서"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "내 즐겨찾기"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "시스템 경로"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr "바탕화면"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "글꼴"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "내 컴퓨터"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "시스템 폴더"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "로컬 하드 드라이브"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "파일을 찾을 수 없음"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "파일 이름이 올바른지 확인하십시오"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -841,7 +800,7 @@ msgstr ""
 "파일이 존재하지 않습니다\n"
 "파일을 만들겠습니까?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -849,11 +808,11 @@ msgstr ""
 "파일은 이미 존재합니다.\n"
 "덮어쓰겠습니까?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "경로에 올바르지 않은 문자가 있습니다h"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -861,119 +820,119 @@ msgstr ""
 "파일이름에는 다음 문자만 포함될 수 있습니다:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "경로가 존재하지 않습니다."
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "파일이 존재하지 않습니다"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "한 단계 위로"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "새 폴더 만들기"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "목록"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "세부사항"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "데스크탑 열기"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "보통"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "굵게"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "기울임꼴"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "굵은 기움임꼴"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "검정"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "밤색"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "녹색"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "올리브색"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "짙은 남색"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "심홍색"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "검은 물오리색"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "회색"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "은색"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "빨강"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "라임색"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "노랑"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "파랑"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "자홍색"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "물색"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "하양"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "입력을 읽을 수 없습니다"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
@@ -981,11 +940,11 @@ msgstr ""
 "페이지 범위를 벗어나지 않아야 올바른 값입니다.\n"
 "%1!d! 과 %2!d! 사이의 값을 입력하시오 "
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr " '여기로부터'엔트리는  여기까지'엔트리에 도달 할 수 없습니다."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -993,11 +952,11 @@ msgstr ""
 "이 여백은 겹치거나 종이 밖으로 나갈 것입니다.\n"
 "여백을 다시 입력하시오."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr " '복사본 수'의 숫자값은 빈 값이 올 수 없습니다."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1005,31 +964,31 @@ msgstr ""
 "이 복사본의 많은 수는 당신의  프린터에서 지원하지 않습니다.\n"
 "  1 과 %d사이의 값을 입력하십시오."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "프린터 오류 발생."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "어떤 기본 프린터도 정의되지 않았습니다."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "프린터를 찾을 수 없습니다."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "메모리 부족"
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "오류 발생."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "알 수 없는 프린터 드라이버."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1037,147 +996,147 @@ msgstr ""
 "문서를 인쇄하거나 페이지 설정같은   프린터와 관련된  작업을 하기 전에, 당신"
 "은 먼저 프린터를 설치하시오. 설치하고 다시 시도하시오."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "%1!d! 와 %2!d! 포인트 사이에서 글꼴 크기 선택하십시오."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "저장(&S)"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "~에 저장(&I):"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "저장"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "파일 열기"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "준비"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "정지; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "오류; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "삭제 중; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "종이 걸림; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "종이 초과; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "수동 종이 공금; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "종이 문제; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "프린터 오프라인; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "I/O 활성; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "바쁨; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "인쇄중; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "출력 트레이가 꽉 찼습니다; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "가능하지 않음; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "대기중; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "작업중; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "초기화중; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "가열중; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "토너 부족; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "토너 없음; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "페이지 펀트; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "사용자에 의한 취소; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "메모리 초과; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "프린터 문이 열려있습니다; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "알수 없는 프린트 서버; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "전원 절약 모드; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "기본 프린터; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "대기열에는  %d의 문서가 존재합니다"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "여백 [인치]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "여백 [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -7827,6 +7786,15 @@ msgstr "원래 위치"
 msgid "Date deleted"
 msgstr "지워진 날짜"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr "바탕화면"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "내 컴퓨터"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "제어판"
@@ -7855,6 +7823,10 @@ msgstr "당신은 Wine 세션을 끄겠습니까?"
 msgid "Start Menu\\Programs"
 msgstr "시작 메뉴\\프로그램"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "내 문서"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "즐겨찾기"
@@ -13554,6 +13526,10 @@ msgstr "정의(&D)..."
 msgid "History"
 msgstr "기록"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "글꼴"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "작게"
diff --git a/po/lt.po b/po/lt.po
index 1e5ff14f01b..f507a71b290 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -58,8 +58,8 @@ msgstr "Pa&Å¡alinti"
 msgid "Support Information"
 msgstr "Priežiūros informacija"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -138,10 +138,10 @@ msgid "&Install"
 msgstr "&Įdiegti"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -290,11 +290,11 @@ msgstr "Atsisakoma..."
 msgid "Properties for %s"
 msgstr "%s savybÄ—s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Vykdyti"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Žinynas"
 
@@ -327,9 +327,9 @@ msgstr "&Užverti"
 msgid "R&eset"
 msgstr "A&tstatyti"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -383,459 +383,418 @@ msgstr "Å iandien:"
 msgid "Go to today"
 msgstr "Eiti į šiandien"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Atverti"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "Failo &vardas:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Aplankai:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Rodyti šių &tipų failus:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Diskai:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Tik skaitymui"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "IÅ¡saugoti kaip..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "IÅ¡saugoti kaip"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Spausdinti"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Spausdintuvas:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Spausdinimo rėžiai"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&VisÄ…"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "Pažymėtas &tekstas"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Puslapiai"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Nuostatos"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "n&uo:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&iki:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "Spausdinimo &kokybÄ—:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Spausdinti į fai&lą"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Suspaustas"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Spausdintuvo nuostatos"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Spausdintuvas"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Pagrindinis spausdintuvas"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[nÄ—ra]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Spe&cifinis spausdintuvas"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "PadÄ—tis"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "&Stačias"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Gulsčias"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Popierius"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Dydis"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Å altinis"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Å riftas"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Å riftas:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "Å rifto &stilius:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Dydis:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "SavybÄ—s"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "Per&braukimas"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Pabraukimas"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Spalva:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Pavyzdys"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaĄąZzŽž"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Si&mbolių rinkinys:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Spalva"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&PagrindinÄ—s spalvos:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "Pr&itaikytos spalvos:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Spal. | Vient."
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Raudona:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "Ža&lia:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&MÄ—lyna:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Atsp.:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Sodr.:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Å vies.:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Įdėti prie pritaikytų spalvų"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "Api&brėžti pritaikytas spalvas >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Ieškoti"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "Ko &ieškoti:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Tenkina tik &visas žodis"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "Skirti raidžių &dydį"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Kryptis"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Žemyn"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "&Aukštyn"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "Ieškoti &kito"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Pakeisti"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "Kuo pak&eisti:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Pakeisti"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "P&akeisti visus"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Spausdinti į fai&lą"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&SavybÄ—s"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Vardas:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "BÅ«sena:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Tipas:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Vieta:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Komentaras:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Kopijos"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "&Kopijų skaičius:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "Su&dÄ—st."
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "Pu&slapiai"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "Pažymėtas &tekstas"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "nuo:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "iki:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "D&ydis:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Å altinis:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "&Stačias"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "&Gulsčias"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Puslapio nuostatos"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "DÄ—k&las:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Stačias"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Paraštės"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&KairÄ—je:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Dešinėje:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&Viršutinė:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&ApatinÄ—:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "S&pausdintuvas..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "&Vieta:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "&Failo vardas:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Failų &tipai:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Atverti tik &skaitymui"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Atverti"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr "Failo vardas:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr "Failų tipai:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&Apie FolderPicker testÄ…"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Dokumentų aplankai"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Dokumentai"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Adresynas"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Sistemos kelias"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Darbalaukis"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Å riftai"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Kompiuteris"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Sistemos aplankai"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Vietiniai standieji diskai"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Failas nerastas"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Prašome patikrinti ar buvo pateiktas korektiškas failo vardas"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -843,7 +802,7 @@ msgstr ""
 "Failas neegzistuoja.\n"
 "Ar norite sukurti failÄ…?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -851,11 +810,11 @@ msgstr ""
 "Failas jau egzistuoja.\n"
 "Ar norite jį pakeisti?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Kelyje yra netinkamų simbolių"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -863,119 +822,119 @@ msgstr ""
 "Failo vardas negali turėti šių simbolių:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Kelias neegzistuoja"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Failas neegzistuoja"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Aukštyn vienu lygiu"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Sukurti naujÄ… aplankÄ…"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Sąrašas"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "IÅ¡samiai"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Pereiti į darbalaukį"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Normalus"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Pusjuodis"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Kursyvas"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Pusjuodis kursyvas"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Juoda"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Kaštoninė"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Tamsiai žalia"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Tamsiai geltona"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Tamsiai mÄ—lyna"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "VioletinÄ—"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Tamsiai žydra"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Pilka"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "SidabrinÄ—"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Raudona"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Žalia"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Geltona"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "MÄ—lyna"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "PurpurinÄ—"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Žydra"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Balta"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Neperskaitomas įrašas"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
@@ -983,11 +942,11 @@ msgstr ""
 "Ši reikšmė nepatenka į puslapių rėžį.\n"
 "Prašome įvesti reikšmę tarp %1!d! ir %2!d!."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "„Nuo“ reikšmė negali viršyti „iki“ reikšmės."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -995,11 +954,11 @@ msgstr ""
 "Paraštės persidengia arba išeina už popieriaus ribų.\n"
 "Prašome įvesti paraštes iš naujo."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Laukas „kopijų skaičius“ negali būti tuščias."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1007,31 +966,31 @@ msgstr ""
 "Toks didelis kopijų skaičius yra nepalaikomas jūsų spausdintuvo.\n"
 "Prašome įvesti reikšmę tarp 1 ir %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Įvyko spausdintuvo klaida."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Nenurodytas pagrindinis spausdintuvas."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Nepavyko rasti spausdintuvo."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Trūksta atminties."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Įvyko klaida."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Nežinoma spausdintuvo tvarkyklė."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1040,147 +999,147 @@ msgstr ""
 "nuostatų keitimas ar dokumento spausdinimas, turite įdiegti spausdintuvą. "
 "Prašome įdiegti spausdintuvą ir pakartoti."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Pasirinkite šrifto dydį tarp %1!d! ir %2!d! taškų."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&IÅ¡saugoti"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "&Kur išsaugoti:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "IÅ¡saugoti"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Atverti failÄ…"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Parengta"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Pristabdytas; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Klaida; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Laukia pašalinimo; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Užstrigęs popierius; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Pasibaigęs popierius; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Rankinis popieriaus padavimas; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Problema su popieriumi; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Spausdintuvas atjungtas; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "Aktyvus Ä®/I; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Spausdintuvas užimtas; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Spausdina; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "IÅ¡vedimo dÄ—klas pilnas; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Nepasiekiama; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Laukia; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Apdorojimas; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Inicijuojama; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Kaista; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Baigiasi dažai; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Nėra dažų; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Puslapis perkrautas; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Pertraukta naudotojo; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Trūksta atminties; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Spausdintuvo durelÄ—s atidarytos; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Spausdinimo serveris nežinomas; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Energijos taupymo režimas; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Pagrindinis spausdintuvas; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Eilėje yra %d dokumentų"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Paraštės [coliai]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Paraštės [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -7853,6 +7812,15 @@ msgstr "Originali vieta"
 msgid "Date deleted"
 msgstr "Pašalinimo data"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Darbalaukis"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Kompiuteris"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Valdymo skydelis"
@@ -7881,6 +7849,10 @@ msgstr "Ar norite sustabdyti šį Wine seansą?"
 msgid "Start Menu\\Programs"
 msgstr "Pradžios meniu\\Programos"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Dokumentai"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Adresynas"
@@ -13637,6 +13609,10 @@ msgstr "&Apibrėžti..."
 msgid "History"
 msgstr "Istorija"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Å riftai"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "&Mažas"
diff --git a/po/ml.po b/po/ml.po
index e9650f7cb39..07cbe93431d 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -51,8 +51,8 @@ msgstr ""
 msgid "Support Information"
 msgstr ""
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -126,10 +126,10 @@ msgid "&Install"
 msgstr ""
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -274,11 +274,11 @@ msgstr ""
 msgid "Properties for %s"
 msgstr "വി_വരം"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr ""
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr ""
 
@@ -311,9 +311,9 @@ msgstr ""
 msgid "R&eset"
 msgstr ""
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -367,796 +367,754 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr ""
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr ""
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr ""
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr ""
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr ""
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr ""
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr ""
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr ""
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr ""
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 #, fuzzy
 msgid "Printer:"
 msgstr "_അക്ഷരസഞ്ചയം..."
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 #, fuzzy
 msgid "Print range"
 msgstr "_അക്ഷരസഞ്ചയം..."
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr ""
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr ""
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr ""
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr ""
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr ""
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr ""
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr ""
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr ""
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr ""
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr ""
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 #, fuzzy
 msgid "Printer"
 msgstr "_അക്ഷരസഞ്ചയം..."
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr ""
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr ""
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr ""
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr ""
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr ""
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr ""
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr ""
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr ""
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr ""
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 #, fuzzy
 msgid "Font"
 msgstr "_അക്ഷരസഞ്ചയം..."
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 #, fuzzy
 msgid "&Font:"
 msgstr "_അക്ഷരസഞ്ചയം..."
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr ""
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr ""
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr ""
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr ""
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr ""
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr ""
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr ""
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr ""
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr ""
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr ""
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr ""
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr ""
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr ""
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr ""
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr ""
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr ""
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr ""
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr ""
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr ""
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr ""
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr ""
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr ""
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr ""
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr ""
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr ""
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr ""
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr ""
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr ""
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr ""
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr ""
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr ""
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr ""
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr ""
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "വി_വരം"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr ""
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr ""
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr ""
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr ""
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr ""
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr ""
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr ""
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr ""
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr ""
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr ""
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr ""
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr ""
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr ""
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr ""
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr ""
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr ""
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr ""
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr ""
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr ""
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr ""
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr ""
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr ""
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr ""
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr ""
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 #, fuzzy
 msgid "P&rinter..."
 msgstr "_അക്ഷരസഞ്ചയം..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr ""
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr ""
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr ""
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr ""
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr ""
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr ""
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr ""
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr ""
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr ""
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr ""
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr ""
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr ""
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr ""
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-#, fuzzy
-msgid "Fonts"
-msgstr "_അക്ഷരസഞ്ചയം..."
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr ""
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr ""
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr ""
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr ""
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr ""
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
 msgstr ""
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr ""
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
 msgstr ""
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr ""
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr ""
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr ""
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr ""
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr ""
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr ""
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr ""
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr ""
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr ""
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr ""
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr ""
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr ""
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr ""
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr ""
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr ""
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr ""
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr ""
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr ""
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr ""
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr ""
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr ""
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr ""
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr ""
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr ""
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
 msgstr ""
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr ""
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
 msgstr ""
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr ""
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
 msgstr ""
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr ""
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr ""
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr ""
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr ""
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr ""
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr ""
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 msgstr ""
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr ""
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr ""
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr ""
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr ""
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr ""
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr ""
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr ""
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr ""
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr ""
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr ""
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr ""
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr ""
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr ""
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr ""
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr ""
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr ""
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr ""
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr ""
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr ""
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr ""
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr ""
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr ""
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr ""
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr ""
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr ""
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr ""
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr ""
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr ""
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr ""
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr ""
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr ""
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr ""
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr ""
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr ""
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr ""
@@ -7721,6 +7679,15 @@ msgstr ""
 msgid "Date deleted"
 msgstr ""
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr ""
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr ""
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -7749,6 +7716,10 @@ msgstr ""
 msgid "Start Menu\\Programs"
 msgstr ""
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr ""
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr ""
@@ -13001,6 +12972,11 @@ msgstr ""
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+#, fuzzy
+msgid "Fonts"
+msgstr "_അക്ഷരസഞ്ചയം..."
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 617631b7ad1..7f8ce6732f2 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -55,8 +55,8 @@ msgstr "&Fjern"
 msgid "Support Information"
 msgstr "Støtteinformasjon"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -136,10 +136,10 @@ msgid "&Install"
 msgstr "&Installer"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -285,11 +285,11 @@ msgstr "Avbryter..."
 msgid "Properties for %s"
 msgstr "Egenskaper for %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Bruk"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Hjelp"
 
@@ -322,9 +322,9 @@ msgstr "&Lukk"
 msgid "R&eset"
 msgstr "Tilbak&estill"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -379,467 +379,420 @@ msgstr "Idag:"
 msgid "Go to today"
 msgstr "GÃ¥ til idag"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Ã…pne"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "Fil&navn:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Kateloger:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Vis filer av &typen:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Stasjoner:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "Sk&rivebeskyttet"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Lagre som"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Skriv ut"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Skriver:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Utskriftsområde"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Alt"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "M&erket område"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Sider"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "Opp&sett"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&Fra:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&Til:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&Utskriftskvalitet:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Skriv til fi&l"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Kondensert"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Utskriftsinnstillinger"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Skriver"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "Stan&dardskriver"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "(Ingen)"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "S&pesifik skriver"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Retning"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "&Stående"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Liggende"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Papir"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "Størr&else"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Kilde"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Skrift"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Skrift:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "Skriftst&il:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "Størrelse:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Effekter"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "Gjennomstre&ket"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Understreket"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "Farge:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Forhåndsvisning"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Skr&ipt:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Farge"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Basisfarger:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Egendefinerte farger:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Farge |  Sol&id"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Rød:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Grønn:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Blå:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Nyanse:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Metning:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Lum:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "Legg til i egendefinerte f&arger"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Definer egendefinerte farger >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Finn"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "Fi&nn:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Finn &kun hele ord"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "Skill &mellom store og små bokstaver"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Retning"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Opp"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "Ne&d"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Finn neste"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Erstatt"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "&Erstatt med:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "E&rsatt"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Erstatt &alle"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Skriv ti&l fil"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Egenskaper"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Navn:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Status:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Type:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Hvor:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Kopier"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Antall &kopier:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "S&orter"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "&Sider"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Merket område"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&Fra:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&Til:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Størrelse:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Kilde:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "S&tående"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "&Liggende"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Sideoppsett"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "Sku&ff:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Stående"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Rammer"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "V&enstre:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "Høy&re:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "T&opp:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Bunn:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "Sk&river..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "Se &i:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "Fil&navn:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Fil&type:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Ã…pne som sk&rivebeskyttet"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Ã…pne"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Filnavn:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "Fil&type:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "Om k&atalogvelger-test"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Dokumentmapper"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Mine dokumenter"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Mine favoritter"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Systemsti"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Skrivebord"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-#, fuzzy
-msgid "Fonts"
-msgstr ""
-"#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n"
-"Skriftstørrelse\n"
-"#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n"
-"Skrifter"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Min datamaskin"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Systemkataloger"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Lokale harddisker"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Fant ikke filen"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Kontroller at filnavnet som ble oppgitt er korrekt"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -847,7 +800,7 @@ msgstr ""
 "Filen finnes ikke.\n"
 "Skal den opprettes?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -855,11 +808,11 @@ msgstr ""
 "Filen finnes fra før.\n"
 "Skal den overskrives?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Ugyldige tegn i filnavnet"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -867,75 +820,75 @@ msgstr ""
 "Et filnavn kan ikke inneholder følgende tegn:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Stien finnes ikke"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Filen finnes ikke"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Opp ett nivå"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Lag ny katalog"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Liste"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Detaljer"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Bla til skrivebordet"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Normal"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Fet"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Kursiv"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Fet kursiv"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Svart"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Rødbrun"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Grønn"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Oliven"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Marineblå"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Purpur"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 #, fuzzy
 msgid "Teal"
 msgstr ""
@@ -944,35 +897,35 @@ msgstr ""
 "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n"
 "Teal"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Grå"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Sølv"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Rød"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Lime-grønn"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Gul"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Blå"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Fuchsia"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 #, fuzzy
 msgid "Aqua"
 msgstr ""
@@ -981,15 +934,15 @@ msgstr ""
 "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n"
 "Aqua"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Hvit"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Uleselig oppføring"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -998,11 +951,11 @@ msgstr ""
 "Denne verdien er ikke innenfor antall sider.\n"
 "Oppgi en verdi mellom %d og %d."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "'Fra'-verdien kan ikke være større en 'til'-verdien."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1010,12 +963,12 @@ msgstr ""
 "Margene overlapper hverandre eller faller utenfor siden.\n"
 "Skriv inn andre verdier."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Feltet 'Antall kopier' kan ikke være tomt."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1023,19 +976,19 @@ msgstr ""
 "Et så høyt antall kopier støttes ikke av den valgte skriveren.\n"
 "Velg en verdi mellom 1 og %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "En skriverfeil har oppstått."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Ingen standardskriver er definert."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Kunne ikke finne skriveren."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 #, fuzzy
 msgid "Out of memory."
 msgstr ""
@@ -1044,15 +997,15 @@ msgstr ""
 "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n"
 "Ikke mer minne."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "En feil har oppstått."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Ukjent skriverdriver."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1060,148 +1013,148 @@ msgstr ""
 "Du må installere en skriver før du kan gjøre skriver-relaterte oppgaver som "
 "å endre sideoppsettet og skrive ut et dokument. Installer en og prøv på nytt."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Velg en skriftstørrelse mellom %d og %d punkter."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Lagre"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Lagre &i:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Lagre"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Ã…pne fil"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Klar"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Satt på pause; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Feil; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Venter på sletting; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Papir sitter fast; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Tom for papir; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Fyll på papir manuelt; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Papirproblem; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Skriver frakoblet; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "Inn/Ut aktiv; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Opptatt; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Skriver ut; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Utskuffen er full; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Ikke tilgjengelig; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Venter; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Behandler; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Initaliserer; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Varmer opp; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Toner lav; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Ingen toner; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Avbrutt av bruker; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Ikke mer minne; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Skriverdøren er åpen; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Ukjent skrivertjener; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Strømsparingsmodus; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Standardskriver; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Det er %d dokumenter i køen"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Marger (tommer)"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Marger (mm)"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -8107,6 +8060,16 @@ msgstr "Opprinnelig plassering"
 msgid "Date deleted"
 msgstr "Dato slettet"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Skrivebord"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Min datamaskin"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Control Panel"
@@ -8135,6 +8098,10 @@ msgstr "Vil du avslutte Wine-økten?"
 msgid "Start Menu\\Programs"
 msgstr "Start-meny\\Programmer"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Mine dokumenter"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favoritter"
@@ -13972,6 +13939,15 @@ msgstr "&Definer..."
 msgid "History"
 msgstr "Historikk"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+#, fuzzy
+msgid "Fonts"
+msgstr ""
+"#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n"
+"Skriftstørrelse\n"
+"#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n"
+"Skrifter"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Liten"
diff --git a/po/nl.po b/po/nl.po
index 32421a6a76b..621495fe43f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -56,8 +56,8 @@ msgstr "&Verwijderen"
 msgid "Support Information"
 msgstr "Support Informatie"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -138,10 +138,10 @@ msgid "&Install"
 msgstr "&Installeren"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -290,11 +290,11 @@ msgstr "Annuleren..."
 msgid "Properties for %s"
 msgstr "Eigenschappen voor %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Toepassen"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Help"
 
@@ -327,9 +327,9 @@ msgstr "&Afsluiten"
 msgid "R&eset"
 msgstr "&Reset"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -383,459 +383,418 @@ msgstr "Vandaag:"
 msgid "Go to today"
 msgstr "Ga naar vandaag"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Openen"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "Bestands&naam:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Zoeken in:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Bestands&typen:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "Schij&ven:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "A&lleen-lezen"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Opslaan als..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "&Opslaan als"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Afdrukken"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Printer:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Afdrukbereik"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Alles"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "Sele&ctie"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Pagina's"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Eigenschappen"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&van:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&t/m:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "Afdruk&kwaliteit:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Naar &bestand"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Verkort"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Afdrukeigenschappen"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Printer"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "Stan&daardprinter"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[geen]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Specifieke &Printer"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Oriëntatie"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "S&taand"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Liggend"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Papier"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Formaat"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Bron"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Lettertype"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Lettertype:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "Teken&stijl:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "Tekstgrootte:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Effecten"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Doorhalen"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Onderstrepen"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "Kleuren:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Voorbeeld"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Schr&ift:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Kleur"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Basiskleuren:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Aangepaste kleuren:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Kleur |  &Effen"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Rood:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Groen:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "Blau&w:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "Ti&nt:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Intensiteit:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Helderheid:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Toevoegen aan Aangepaste kleuren"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Definieer Aangepaste kleuren >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Zoeken"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Zoek naar:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Heel &woord"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "Gelijke &hoofd-/kleine letters"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Zoekrichting"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Omhoog"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "O&mlaag"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Volgende zoeken"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Tekst vervangen"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "Vervang &door:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "Ve&rvangen"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "&Alles vervangen"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Naar &bestand"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Eigenschappen"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Naam:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Status:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Type:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Waar:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Opmerking:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Aantal"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Aantal e&xemplaren:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "&Sorteren"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "&Pagina's"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "Sele&ctie"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&van:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&t/m:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Grootte:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Bron:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "S&taand"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "L&iggend"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Pagina-instellingen"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "La&de:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Staand"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Randen"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "L&inks:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Rechts:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "B&oven:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Onder:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "P&rinter..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "&Zoeken in"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "Bestands&naam:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Bestands&typen:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Openen met als kenmerk &Alleen-lezen"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Openen"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr "Bestandsnaam:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr "Bestanden van het type:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&Info over FolderPicker"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Documenten Mappen"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Mijn Documenten"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Mijn Favorieten"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Systeem Pad"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Bureaublad"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Lettertype"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Deze Computer"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Systeemmappen"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Lokale vaste schijven"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Bestand niet gevonden"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Controleer of de juiste bestandsnaam is opgegeven"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -843,7 +802,7 @@ msgstr ""
 "Dit bestand bestaat nog niet\n"
 "Wilt u het bestand aanmaken?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -851,11 +810,11 @@ msgstr ""
 "Bestand bestaat al.\n"
 "Wilt u het vervangen?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "De naam van het pad bevat ongeldige tekens"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -863,119 +822,119 @@ msgstr ""
 "De volgende tekens mogen niet in de bestandsnaam voorkomen:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Het pad bestaat niet"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Kan het bestand niet vinden"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Bovenliggende map"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Nieuwe map aanmaken"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Lijst"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Details"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Ga naar Bureaublad"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Normaal"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Vet"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Cursief"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Vet-Cursief"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Zwart"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Kastanjebruin"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Groen"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Olijfgroen"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Marineblauw"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Paars"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Groenblauw"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Grijs"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Zilver"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Rood"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Lichtgroen"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Geel"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Blauw"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Fuchsiapaars"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Zeeblauw"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Wit"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Onleesbare ingave"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
@@ -983,11 +942,11 @@ msgstr ""
 "Deze waarde ligt niet binnen het paginabereik\n"
 "Voert u s.v.p. een waarde tussen %1!d! en %2!d! in."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "De VAN ingave kan niet groter zijn dan de TO waarde"
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -995,42 +954,42 @@ msgstr ""
 "De marges overlappen of vallen buiten het papier.\n"
 "Voer s.v.p. nieuwe marges in."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Het invoerveld 'Aantal kopieën' kan niet leeg zijn."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
 msgstr ""
 "Zoveel exemplaren kan de printer niet in een keer aan, het maximum is %d"
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Er heeft zich een fout voorgedaan met de printer."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Er is geen standaardprinter"
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "De printer werd niet gevonden"
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Onvoldoende geheugen beschikbaar"
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Er ontstond een niet nader gespecificeerde fout"
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "De printer driver is onbekend"
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1039,147 +998,147 @@ msgstr ""
 "printen van een document kun uitvoeren, moet u een printer installeren. "
 "Installeer een printer en probeer het opnieuw."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Selecteer een lettergrootte tussen %1!d! en %2!d! punten."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "Op&slaan"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Op&slaan in:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Opslaan"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Open bestand"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Gereed"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Gepauzeerd, "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Fout, "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Bezig met verwijderen, "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Papier-opstopping, "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Papier is op, "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Voer s.v.p. met de hand papier in, "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Papier-probleem, "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Printer offline, "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "I/O Actief, "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Druk bezig, "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Aan het printen, "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "De uitvoerlade is vol, "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Niet aanwezig, "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Aan het wachten, "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Aan het verwerken, "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Aan het opstarten, "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Aan het opwarmen, "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Er is nog maar weinig toner, "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Toner is op, "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Storing in papieruitvoer, "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Onderbroken door een gebruiker, "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Onvoldoende geheugen beschikbaar, "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "De printer staat is open, "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Print server onbekend; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Power save modus; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Standaard Printer, "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Er staan %d documenten in de wachtrij"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Marges [inch]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Marges [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -7865,6 +7824,15 @@ msgstr "Originele locatie"
 msgid "Date deleted"
 msgstr "Datum verwijderd"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Bureaublad"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Deze Computer"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Configuratiescherm"
@@ -7893,6 +7861,10 @@ msgstr "Wilt u uw Wine sessie afsluiten?"
 msgid "Start Menu\\Programs"
 msgstr "Start Menu\\Programma's"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Mijn Documenten"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favorieten"
@@ -13733,6 +13705,10 @@ msgstr "&Aanmaken..."
 msgid "History"
 msgstr "Geschiedenis"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Lettertype"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Klein"
diff --git a/po/or.po b/po/or.po
index 77f3f32b492..e59a7ac5c9d 100644
--- a/po/or.po
+++ b/po/or.po
@@ -51,8 +51,8 @@ msgstr ""
 msgid "Support Information"
 msgstr ""
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -126,10 +126,10 @@ msgid "&Install"
 msgstr ""
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -274,11 +274,11 @@ msgstr ""
 msgid "Properties for %s"
 msgstr "ସୂଚନା (&o)"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr ""
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr ""
 
@@ -311,9 +311,9 @@ msgstr ""
 msgid "R&eset"
 msgstr ""
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -367,796 +367,754 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr ""
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr ""
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr ""
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr ""
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr ""
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr ""
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr ""
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr ""
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr ""
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 #, fuzzy
 msgid "Printer:"
 msgstr "ଅକ୍ଷରରୂପ (&F)..."
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 #, fuzzy
 msgid "Print range"
 msgstr "ଅକ୍ଷରରୂପ (&F)..."
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr ""
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr ""
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr ""
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr ""
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr ""
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr ""
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr ""
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr ""
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr ""
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr ""
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 #, fuzzy
 msgid "Printer"
 msgstr "ଅକ୍ଷରରୂପ (&F)..."
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr ""
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr ""
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr ""
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr ""
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr ""
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr ""
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr ""
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr ""
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr ""
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 #, fuzzy
 msgid "Font"
 msgstr "ଅକ୍ଷରରୂପ (&F)..."
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 #, fuzzy
 msgid "&Font:"
 msgstr "ଅକ୍ଷରରୂପ (&F)..."
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr ""
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr ""
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr ""
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr ""
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr ""
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr ""
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr ""
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr ""
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr ""
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr ""
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr ""
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr ""
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr ""
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr ""
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr ""
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr ""
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr ""
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr ""
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr ""
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr ""
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr ""
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr ""
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr ""
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr ""
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr ""
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr ""
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr ""
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr ""
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr ""
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr ""
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr ""
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr ""
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr ""
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "ସୂଚନା (&o)"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr ""
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr ""
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr ""
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr ""
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr ""
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr ""
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr ""
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr ""
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr ""
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr ""
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr ""
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr ""
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr ""
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr ""
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr ""
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr ""
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr ""
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr ""
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr ""
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr ""
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr ""
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr ""
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr ""
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr ""
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 #, fuzzy
 msgid "P&rinter..."
 msgstr "ଅକ୍ଷରରୂପ (&F)..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr ""
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr ""
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr ""
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr ""
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr ""
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr ""
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr ""
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr ""
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr ""
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr ""
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr ""
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr ""
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr ""
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-#, fuzzy
-msgid "Fonts"
-msgstr "ଅକ୍ଷରରୂପ (&F)..."
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr ""
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr ""
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr ""
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr ""
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr ""
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
 msgstr ""
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr ""
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
 msgstr ""
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr ""
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr ""
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr ""
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr ""
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr ""
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr ""
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr ""
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr ""
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr ""
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr ""
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr ""
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr ""
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr ""
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr ""
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr ""
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr ""
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr ""
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr ""
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr ""
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr ""
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr ""
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr ""
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr ""
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr ""
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
 msgstr ""
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr ""
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
 msgstr ""
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr ""
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
 msgstr ""
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr ""
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr ""
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr ""
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr ""
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr ""
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr ""
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 msgstr ""
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr ""
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr ""
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr ""
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr ""
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr ""
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr ""
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr ""
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr ""
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr ""
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr ""
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr ""
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr ""
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr ""
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr ""
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr ""
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr ""
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr ""
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr ""
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr ""
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr ""
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr ""
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr ""
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr ""
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr ""
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr ""
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr ""
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr ""
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr ""
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr ""
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr ""
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr ""
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr ""
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr ""
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr ""
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr ""
@@ -7721,6 +7679,15 @@ msgstr ""
 msgid "Date deleted"
 msgstr ""
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr ""
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr ""
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -7749,6 +7716,10 @@ msgstr ""
 msgid "Start Menu\\Programs"
 msgstr ""
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr ""
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr ""
@@ -13001,6 +12972,11 @@ msgstr ""
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+#, fuzzy
+msgid "Fonts"
+msgstr "ଅକ୍ଷରରୂପ (&F)..."
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index ce75328e1f7..b81578a2dc5 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -51,8 +51,8 @@ msgstr ""
 msgid "Support Information"
 msgstr ""
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -126,10 +126,10 @@ msgid "&Install"
 msgstr ""
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -274,11 +274,11 @@ msgstr ""
 msgid "Properties for %s"
 msgstr "ਜਾਣਕਾਰੀ(&o)"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr ""
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr ""
 
@@ -311,9 +311,9 @@ msgstr ""
 msgid "R&eset"
 msgstr ""
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -367,796 +367,754 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr ""
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr ""
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr ""
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr ""
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr ""
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr ""
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr ""
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr ""
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr ""
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 #, fuzzy
 msgid "Printer:"
 msgstr "ਫੌਂਟ(&F)..."
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 #, fuzzy
 msgid "Print range"
 msgstr "ਫੌਂਟ(&F)..."
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr ""
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr ""
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr ""
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr ""
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr ""
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr ""
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr ""
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr ""
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr ""
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr ""
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 #, fuzzy
 msgid "Printer"
 msgstr "ਫੌਂਟ(&F)..."
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr ""
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr ""
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr ""
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr ""
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr ""
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr ""
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr ""
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr ""
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr ""
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 #, fuzzy
 msgid "Font"
 msgstr "ਫੌਂਟ(&F)..."
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 #, fuzzy
 msgid "&Font:"
 msgstr "ਫੌਂਟ(&F)..."
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr ""
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr ""
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr ""
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr ""
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr ""
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr ""
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr ""
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr ""
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr ""
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr ""
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr ""
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr ""
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr ""
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr ""
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr ""
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr ""
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr ""
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr ""
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr ""
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr ""
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr ""
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr ""
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr ""
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr ""
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr ""
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr ""
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr ""
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr ""
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr ""
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr ""
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr ""
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr ""
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr ""
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "ਜਾਣਕਾਰੀ(&o)"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr ""
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr ""
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr ""
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr ""
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr ""
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr ""
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr ""
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr ""
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr ""
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr ""
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr ""
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr ""
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr ""
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr ""
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr ""
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr ""
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr ""
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr ""
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr ""
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr ""
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr ""
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr ""
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr ""
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr ""
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 #, fuzzy
 msgid "P&rinter..."
 msgstr "ਫੌਂਟ(&F)..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr ""
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr ""
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr ""
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr ""
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr ""
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr ""
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr ""
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr ""
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr ""
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr ""
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr ""
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr ""
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr ""
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-#, fuzzy
-msgid "Fonts"
-msgstr "ਫੌਂਟ(&F)..."
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr ""
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr ""
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr ""
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr ""
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr ""
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
 msgstr ""
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr ""
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
 msgstr ""
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr ""
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr ""
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr ""
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr ""
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr ""
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr ""
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr ""
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr ""
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr ""
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr ""
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr ""
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr ""
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr ""
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr ""
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr ""
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr ""
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr ""
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr ""
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr ""
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr ""
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr ""
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr ""
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr ""
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr ""
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
 msgstr ""
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr ""
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
 msgstr ""
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr ""
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
 msgstr ""
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr ""
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr ""
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr ""
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr ""
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr ""
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr ""
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 msgstr ""
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr ""
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr ""
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr ""
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr ""
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr ""
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr ""
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr ""
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr ""
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr ""
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr ""
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr ""
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr ""
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr ""
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr ""
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr ""
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr ""
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr ""
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr ""
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr ""
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr ""
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr ""
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr ""
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr ""
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr ""
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr ""
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr ""
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr ""
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr ""
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr ""
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr ""
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr ""
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr ""
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr ""
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr ""
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr ""
@@ -7721,6 +7679,15 @@ msgstr ""
 msgid "Date deleted"
 msgstr ""
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr ""
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr ""
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -7749,6 +7716,10 @@ msgstr ""
 msgid "Start Menu\\Programs"
 msgstr ""
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr ""
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr ""
@@ -13001,6 +12972,11 @@ msgstr ""
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+#, fuzzy
+msgid "Fonts"
+msgstr "ਫੌਂਟ(&F)..."
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 7a13426390b..a1bae6c6e41 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -60,8 +60,8 @@ msgstr "&Usuń..."
 msgid "Support Information"
 msgstr "Informacje o wsparciu"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -143,10 +143,10 @@ msgid "&Install"
 msgstr "&Zainstaluj"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -295,11 +295,11 @@ msgstr "Trwa anulowanie..."
 msgid "Properties for %s"
 msgstr "Właściwości: %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Zastosuj"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Pomoc"
 
@@ -332,9 +332,9 @@ msgstr "&Zamknij"
 msgid "R&eset"
 msgstr "Z&resetuj"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -388,459 +388,418 @@ msgstr "DziÅ›:"
 msgid "Go to today"
 msgstr "Idź do dziś"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Otwórz"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "&Nazwa pliku:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Katalogi:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Wyświetl pliki &typu:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Dyski:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "Tylko do &odczytu"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Zapisz jako"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Drukuj"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Drukarka:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Zakres wydruku"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Cały rejestr"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "W&ybór"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Strony"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Ustawienia"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&Od:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&Do:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "Jakość &wydruku:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Drukuj do pli&ku"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Sortuj kopie"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Ustawienia wydruku"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Drukarka"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Domyślna drukarka"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[brak]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "&Inna drukarka"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Orientacja"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "W p&ionie"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "Po&ziomo"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Papier"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Wielkość"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Źródło"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Czcionka"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Czcionka:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "&Styl:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "Wielkość:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Efekty specialne"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "Prz&ekreślona"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "P&odkreślona"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "Kolor:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Przykład"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Skr&ypt:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Kolor"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Podstawowe kolory:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "Dowolne &kolory:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Kolor"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Czerw:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Ziel:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Nieb:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Odcie:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Nasyc:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Jaskr:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Dodaj do dowolnych"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "Z&definiuj kolor >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Wyszukaj w rejestrze"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Znajdź:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Uwzględniaj tylko całe wyrazy"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "&Uwzględniaj wielkość liter"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Kierunek"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "Przesuń w &górę"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "Przesuń w &dół"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Znajdź następny"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Zamień"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "Zamień &na:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Zamień"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Zamień &wszystkie"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Drukuj do pli&ku"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "Właś&ciwości"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Nazwa:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Stan:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Typ:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Gdzie:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Komentarz:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Kopie"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Lczba &kopii:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "&Sortuj"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "&Strony"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Zaznaczenie"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&od:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&do:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Wielkość:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "Źró&dło:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "P&ionowa"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "P&ozioma"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Ustawienia Strony"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "Źródł&o:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "P&ionowo"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Marginesy"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&Lewy:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "P&rawy:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&Górny:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Dolny:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "Dr&ukarka..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "&Szukaj w:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "&Nazwa pliku:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "&Pliki typu:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Otwórz &tylko do odczytu"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Otwórz"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr "Nazwa pliku:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr "Pliki typu:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "FolderPicker Test - i&nformacje"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Katalog Dokumentów"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Moje Dokumenty"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Moje Ulubione"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Ścieżka systemowa"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Pulpit"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Czcionki"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Mój komputer"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Katalogi systemowe"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Lokalne dyski twarde"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Nie znaleziono pliku"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Sprawdź, czy podana nazwa pliku jest prawidłowa."
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -848,7 +807,7 @@ msgstr ""
 "Plik nie istnieje.t\n"
 "Czy chcesz go utworzyć?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -856,11 +815,11 @@ msgstr ""
 "Plik istnieje.\n"
 "Czy chcesz go zastąpić?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Błędny(e) znak(i) w nazwie"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -868,119 +827,119 @@ msgstr ""
 "Nazwa pliku nie może zawierać znaków:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Katalog nie istnieje"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Plik nie istnieje"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Poziom w górę"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Utwórz nowy folder"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Lista"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Szczegóły"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "PrzeglÄ…daj pulpit"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Regularny"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Pogrubiony"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Kursywa"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Pogrubiona kursywa"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Czarny"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Kasztanowy"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Zielony"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Oliwkowy"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Granatowy"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Purpurowy"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Zielono-modry"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Szary"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Srebrny"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Czerwony"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Limonowy"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Żółty"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Niebieski"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Fuksja"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Akwamaryna"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Biały"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Składnia zakresu stron jest nieprawidłowa."
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
@@ -988,11 +947,11 @@ msgstr ""
 "Ta wartość nie leży w zakresie stron.\n"
 "Wprowadź wartość pomiędzy %1!d! i %2!d!.."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "Wartość „od” nie może być większa niż wartość „do”."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1000,11 +959,11 @@ msgstr ""
 "Marginesy znajdujÄ… siÄ™ poza stronÄ….\n"
 "Wprowadź inną wielkość marginesu."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Pole „liczba kopii” nie może być puste."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1012,31 +971,31 @@ msgstr ""
 "Drukarka nie może wydrukować tylu kopii.\n"
 "Proszę podać wartość pomiędzy 1 a %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "BÅ‚Ä…d drukowania."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Domyślna drukarka nie została zdefiniowana."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Nie można odnaleźć drukarki."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Za mało pamięci dla tej operacji."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Podczas tej operacji wystąpił błąd."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Nieznany sterownik drukarki."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1045,147 +1004,147 @@ msgstr ""
 "ustawienie strony lub wydruk dokumentu, należy zainstalować drukarkę. Po "
 "zainstalowaniu spróbuj ponownie."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Wybierz czcionkę o rozmiarze pomiędzy %1!d! i %2!d! punktami."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Zapisz"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Zapisz &w:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Zapisz"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Otwórz plik"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Gotowe"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Wstrzymane; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "BÅ‚Ä…d; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Oczekiwanie na usunięcie"
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Zakleszczenie papieru; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Brak papieru; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Podawanie ręczne; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Problem z papierem; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Drukarka jest offline; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "We/Wy aktywne; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Zajęty; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Drukowanie; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Pojemnik wyjściowy jest zapełniony; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Niedostępne; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Oczekiwanie; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Przetwarzanie; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Inicjowanie; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Rozgrzewanie; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Mało toneru; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Brak toneru; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Strona wysłana; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Przerwane przez użytkownika; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Za mało pamięci; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Klapka drukarki jest otwarta; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Nieznany serwer wydruku; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Tryb oszczędzania energii; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Domyślna drukarka; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "W kolejce znajdujÄ… siÄ™ %d dokumenty"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Marginesy [cale]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Marginesy [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -7866,6 +7825,15 @@ msgstr "Oryginalne położenie"
 msgid "Date deleted"
 msgstr "Data usunięcia"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Pulpit"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Mój komputer"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Panel sterowania"
@@ -7894,6 +7862,10 @@ msgstr "Czy chcesz wyłączyć sesję Wine'a?"
 msgid "Start Menu\\Programs"
 msgstr "Menu Start\\Programy"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Moje Dokumenty"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Ulubione"
@@ -13681,6 +13653,10 @@ msgstr "&Definiuj..."
 msgid "History"
 msgstr "Historia"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Czcionki"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Małe"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b6620a77a0d..37bf4d5cfca 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -56,8 +56,8 @@ msgstr "&Remover"
 msgid "Support Information"
 msgstr "Informação de Suporte"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -138,10 +138,10 @@ msgid "&Install"
 msgstr "&Instalar"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -289,11 +289,11 @@ msgstr "Cancelando..."
 msgid "Properties for %s"
 msgstr "Propriedades de %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Aplicar"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Ajuda"
 
@@ -326,9 +326,9 @@ msgstr "&Fechar"
 msgid "R&eset"
 msgstr "R&estaurar"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -387,466 +387,420 @@ msgstr "Hoje:"
 msgid "Go to today"
 msgstr "Ir para hoje"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Abrir"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "Nome do &Arquivo:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Diretórios:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Listar Arquivos do &Tipo:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "Dri&ves:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Apenas leitura"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Salvar Como..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Salvar &Como"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Imprimir"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Impressora:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Faixa de impressão"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Todos"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "S&eleção"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Páginas"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Configurar"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&De:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&Até:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&Qualidade de Impressão:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Imprimir para Arquivo"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "C&ondensado"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Configurações de Impressão"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Impressora"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Impressora Padrão"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[none]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Impressora &Específica"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Orientação"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "&Retrato"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Paisagem"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Papel"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Tamanho"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Fonte de Alimentação"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Fonte"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Fonte:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "&Estilo da Fonte:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Tamanho:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Efeitos"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Riscado"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Sublinhado"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Cor:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Exemplo"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Scr&ipt:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Cor"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "Cores &Básicas:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Cores do Usuário:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Colorido|Sólid&o"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "Ver&melho:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Verde:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "A&zul:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "Mat&iz:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "Sa&t:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Lum:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Adicionar Cor Personalizada"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Definir Cores Personalizadas >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Procurar"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Procurar:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Palavra &Inteira"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "&Maiúsculas/minúsculas"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Direção"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Acima"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "A&baixo"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Procurar"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Substituir"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "Substituir Po&r:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Substituir"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Substituir &Tudo"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Para arqui&vo"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Propriedades"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Nome:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Status:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Tipo:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Local:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Nota:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Cópias"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Número de &cópias:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "&Agrupar"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "Pá&ginas"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "Seleção"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&de:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&até:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Ta&manho:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Origem:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "&Retrato"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "&Paisagem"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Configurações de Página"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Bandeja:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Retrato"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Bordas"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&Esquerda:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Direita:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&Superior:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Inferior:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "Im&pressora..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "&Examinar:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "&Nome do arquivo:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Arquivos do &tipo:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Abrir como &somente-leitura"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Abrir"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Nome do arquivo:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "Arquivos do &tipo:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&Sobre FolderPicker Test"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Pastas de Documentos"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Meus Documentos"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Favoritos"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Caminho do Sistema"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr ""
-"#-#-#-#-#  pt_BR.po (Wine)  #-#-#-#-#\n"
-"Área de trabalho\n"
-"#-#-#-#-#  pt_BR.po (Wine)  #-#-#-#-#\n"
-"Área de Trabalho"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Fontes"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Meu Computador"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Pastas do Sistema"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Discos Rígidos Locais"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Arquivo não encontrado"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Por favor verifique se foi fornecido o nome correto do arquivo"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -854,7 +808,7 @@ msgstr ""
 "Arquivo não existe\n"
 "Você gostaria de cria-lo"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -862,11 +816,11 @@ msgstr ""
 "Arquivo já existe.\n"
 "Gostaria de substituí-lo?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Caracter(es) inválidos no caminho"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -874,119 +828,119 @@ msgstr ""
 "Um nome de arquivo não pode conter quaisquer dos seguintes caracteres:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "O caminho não existe"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "O arquivo não existe"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Um Nível Acima"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Criar Nova Pasta"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Lista"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Detalhes"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Área de Trabalho"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Normal"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Negrito"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Itálico"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Negrito Itálico"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Preto"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Castanho"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Verde"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Verde-oliva"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Azul-marinho"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Roxo"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Azul-petróleo"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Cinza"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Prateado"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Vermelho"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Verde-limão"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Amarelo"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Azul"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Fúcsia"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Azul-piscina"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Branco"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Entrada Ilegível"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -995,11 +949,11 @@ msgstr ""
 "Este valor não se encaixa na faixa de páginas.\n"
 "Por favor insira um valor entre %d e %d."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "A entrada 'de' não pode exceder 'até'."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1007,12 +961,12 @@ msgstr ""
 "As margens estão fora das medidas do papel.\n"
 "Por favor reinsira as margens."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "O número de cópias não pode ter valor vazio."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1020,19 +974,19 @@ msgstr ""
 "Esta quantidade de cópias é muito grande para a sua impressora.\n"
 "Por favor insira um valor entre 1 e %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Ocorreu um erro de impressão."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Não existe uma impressora padrão."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Não é possível encontrar uma impressora."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 #, fuzzy
 msgid "Out of memory."
 msgstr ""
@@ -1041,15 +995,15 @@ msgstr ""
 "#-#-#-#-#  pt_BR.po (Wine)  #-#-#-#-#\n"
 "Memória insuficiente."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Ocorreu algum erro."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Driver de impressora desconhecido."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1058,148 +1012,148 @@ msgstr ""
 "configuração de páginas ou imprimir um documento, é necessário instalar uma "
 "impressora. Por favor instale uma e tente novamente."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Selecione o tamanho da fonte entre %d e %d pontos."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Salvar"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Salvar &em:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Salvar"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Abrir Arquivo"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Pronto"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Pausada; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Erro; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Exclusão pendente; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Papel atolado; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Sem papel; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Alimentação manual; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Problemas com o papel; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Impressora desligada; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "E/S Ativa; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Ocupada; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Imprimindo; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "A bandeja de saída está cheia; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Não disponível; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Esperando; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Processando; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Inicializando; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Aquecendo; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Pouco toner; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Sem toner; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Lançar página; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Intervenção do usuário; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Memória insuficiente; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "A impressora está aberta; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Servidor de impressão desconhecido; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Modo econômico; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Impressora Padrão; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Existem %d documentos na fila"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Margens [polegadas]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Margens [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -8102,6 +8056,20 @@ msgstr "Localização original"
 msgid "Date deleted"
 msgstr "Data de exclusão"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr ""
+"#-#-#-#-#  pt_BR.po (Wine)  #-#-#-#-#\n"
+"Área de trabalho\n"
+"#-#-#-#-#  pt_BR.po (Wine)  #-#-#-#-#\n"
+"Área de Trabalho"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Meu Computador"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Painel de Controle"
@@ -8130,6 +8098,10 @@ msgstr "Deseja finalizar a sessão do Wine?"
 msgid "Start Menu\\Programs"
 msgstr "Menu Iniciar\\Programas"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Meus Documentos"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favoritos"
@@ -14057,6 +14029,10 @@ msgstr "&Definir..."
 msgid "History"
 msgstr "Histórico"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Fontes"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Pequeno"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index b2548edb86f..2baaedc0903 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -56,8 +56,8 @@ msgstr "&Remover"
 msgid "Support Information"
 msgstr "Informação de Suporte"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -138,10 +138,10 @@ msgid "&Install"
 msgstr "&Instalar"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -294,11 +294,11 @@ msgstr "A cancelar..."
 msgid "Properties for %s"
 msgstr "Propriedades de %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Aplicar"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Ajuda"
 
@@ -331,9 +331,9 @@ msgstr "&Fechar"
 msgid "R&eset"
 msgstr "R&estaurar"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -392,471 +392,420 @@ msgstr "Hoje:"
 msgid "Go to today"
 msgstr "Ir para hoje"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Abrir"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "Nome do &Ficheiro:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Directórios:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Listar Ficheiros do &Tipo:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "Con&troladores:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Apenas de leitura"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Gravar Como..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Gravar Como"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Imprimir"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Impressora:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Faixa de impressão"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Todos"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "S&elecção"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Páginas"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Configurar"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&De:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&Até:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&Qualidade de Impressão:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Imprimir para Ficheiro"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "C&ondensado"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Configurações de Impressão"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Impressora"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Impressora Predefinida"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[none]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Impressora &Específica"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Orientação"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "&Retrato"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Paisagem"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Papel"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Tamanho"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Fonte de Alimentação"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Tipo de Letra"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Tipo de Letra:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "&Estilo do Tipo de Letra:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Tamanho:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Efeitos"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Riscado"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Sublinhado"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Cor:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Exemplo"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Scr&ipt:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Cor"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "Cores &Básicas:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Cores do Utilizador:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Colorido|Sólid&o"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "Ver&melho:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Verde:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "A&zul:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "Mat&iz:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "Sa&t:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Lum:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Adicionar Cor Personalizada"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Definir Cores Personalizadas >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Procurar"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Procurar:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Palavra &Inteira"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "&Maiúsculas/minúsculas"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Direção"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Acima"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "A&baixo"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Procurar"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Substituir"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "Substituir Po&r:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Substituir"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Substituir &Tudo"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Para &ficheiro"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Propriedades"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Nome:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Status:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Tipo:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Local:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Nota:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Cópias"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Número de &cópias:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "&Agrupar"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "Páginas"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "Selecção"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&de:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&até"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Tama&nho:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Origem:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "&Retrato"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "&Paisagem"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Configurações de Página"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Bandeja:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Retrato"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Bordas"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&Esquerda:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Direita:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&Superior:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Inferior:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "Im&pressora..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "&Examinar:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "&Nome do ficheiro:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Ficheiros do &tipo:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Abrir como &apenas-leitura"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Abrir"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Nome do ficheiro:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "Ficheiros do &tipo:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&Acerca do Teste FolderPicker"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Pastas de Documentos"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Os Meus Documentos"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Favoritos"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Localização do Sistema"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr ""
-"#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n"
-"Área de trabalho\n"
-"#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n"
-"Ambiente de trabalho"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Tipos de Letra"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-#, fuzzy
-msgid "My Computer"
-msgstr ""
-"#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n"
-"O Meu Computador\n"
-"#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n"
-"Meu Computador"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Pastas do Sistema"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Discos Rígidos Locais"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Ficheiro não encontrado"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Por favor verifique se foi fornecido o nome correcto do ficheiro"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -864,7 +813,7 @@ msgstr ""
 "O ficheiro não existe\n"
 "Gostaria de o criar"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -872,11 +821,11 @@ msgstr ""
 "O ficheiro já existe.\n"
 "Gostaria de o substituir?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Caracter(es) inválidos na localização"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -884,119 +833,119 @@ msgstr ""
 "Um nome de ficheiro não pode conter quaisquer dos seguintes caracteres:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "A localização não existe"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "O ficheiro não existe"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Um Nível Acima"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Criar Nova Pasta"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Lista"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Detalhes"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Ecrã"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Normal"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Negrito"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Itálico"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Negrito Itálico"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Preto"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Castanho"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Verde"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Verde-oliva"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Azul-marinho"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Roxo"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Azul-petróleo"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Cinza"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Prateado"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Vermelho"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Verde-limão"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Amarelo"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Azul"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Fúcsia"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Azul-piscina"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Branco"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Entrada Ilegível"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -1005,11 +954,11 @@ msgstr ""
 "Este valor não se encaixa na faixa de páginas.\n"
 "Por favor indique um valor entre %d e %d."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "A entrada 'de' não pode exceder 'até'."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1017,12 +966,12 @@ msgstr ""
 "As margens estão fora das medidas do papel.\n"
 "Por favor indique as margens."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "O número de cópias não pode ter valor vazio."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1030,19 +979,19 @@ msgstr ""
 "Esta grande quantidade de cópias não é suportada pela sua impressora.\n"
 "Por favor indique um valor entre 1 e %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Ocorreu um erro de impressão."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Não existe uma impressora predefinida."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Não é possível encontrar uma impressora."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 #, fuzzy
 msgid "Out of memory."
 msgstr ""
@@ -1051,15 +1000,15 @@ msgstr ""
 "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n"
 "Memória insuficiente."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Ocorreu algum erro."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Controlador de impressora desconhecido."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1068,148 +1017,148 @@ msgstr ""
 "configuração de páginas ou imprimir um documento, precisa instalar uma "
 "impressora. Por favor instale uma e tente novamente."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Seleccione o tamanho do tipo de letra entre %d e %d pontos."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Gravar"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Gravar &em:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Gravar"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Abrir Ficheiro"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Pronto"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Pausada; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Erro; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Exclusão pendente; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Papel atolado; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Sem papel; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Alimentação manual; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Problemas com o papel; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Impressora desligada; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "E/S Activa; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Ocupada; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "A imprimir; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "A bandeja de saida encontra-se cheia; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Não disponível; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "A esperar; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "A processar; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "A inicializar; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "A aquecer; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Pouco toner; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Sem toner; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Lançar página; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Intervenção do utilizador; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Memória insuficiente; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "A impressora está aberta; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Servidor de impressão desconhecido; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Modo económico; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Impressora Predefinida; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Existem %d documentos na fila"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Margens [polegadas]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Margens [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -8123,6 +8072,25 @@ msgstr "Localização original"
 msgid "Date deleted"
 msgstr "Data de exclusão"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr ""
+"#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n"
+"Área de trabalho\n"
+"#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n"
+"Ambiente de trabalho"
+
+#: shell32.rc:154 regedit.rc:200
+#, fuzzy
+msgid "My Computer"
+msgstr ""
+"#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n"
+"O Meu Computador\n"
+"#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n"
+"Meu Computador"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Painel de controlo"
@@ -8151,6 +8119,10 @@ msgstr "Deseja finalizar esta sessão do Wine?"
 msgid "Start Menu\\Programs"
 msgstr "Menu Iniciar\\Programas"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Os Meus Documentos"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favoritos"
@@ -14070,6 +14042,10 @@ msgstr "&Definir..."
 msgid "History"
 msgstr "Histórico"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Tipos de Letra"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Pequeno"
diff --git a/po/rm.po b/po/rm.po
index b4af526acb7..5353fdb66e4 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -55,8 +55,8 @@ msgstr "&Annotaziun..."
 msgid "Support Information"
 msgstr "INFUORMAZIUN"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -131,10 +131,10 @@ msgid "&Install"
 msgstr "&Annotaziun..."
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -279,11 +279,11 @@ msgstr ""
 msgid "Properties for %s"
 msgstr ""
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr ""
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 #, fuzzy
 msgid "Help"
 msgstr "&Ag�d"
@@ -318,9 +318,9 @@ msgstr ""
 msgid "R&eset"
 msgstr ""
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -375,817 +375,776 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 #, fuzzy
 msgid "Open"
 msgstr "&Rivir"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 #, fuzzy
 msgid "File &Name:"
 msgstr "&Datoteca"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr ""
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 #, fuzzy
 msgid "List Files of &Type:"
 msgstr "&Datoteca"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr ""
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr ""
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 #, fuzzy
 msgid "Save As..."
 msgstr "&Options"
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 #, fuzzy
 msgid "Save As"
 msgstr "&Options"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 #, fuzzy
 msgid "Print"
 msgstr "&Stampar tema"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 #, fuzzy
 msgid "Printer:"
 msgstr "&Stampar tema"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 #, fuzzy
 msgid "Print range"
 msgstr "&Stampar tema"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr ""
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 #, fuzzy
 msgid "S&election"
 msgstr "&Options"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr ""
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 #, fuzzy
 msgid "&Setup"
 msgstr "&Installaziun dal stampader..."
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr ""
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr ""
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr ""
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 #, fuzzy
 msgid "Print to Fi&le"
 msgstr "Tuot las datotecas (*.*)"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr ""
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 #, fuzzy
 msgid "Print Setup"
 msgstr "&Installaziun dal stampader..."
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 #, fuzzy
 msgid "Printer"
 msgstr "&Stampar tema"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr ""
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr ""
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr ""
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 #, fuzzy
 msgid "Orientation"
 msgstr "&Annotaziun..."
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr ""
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr ""
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr ""
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr ""
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr ""
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 #, fuzzy
 msgid "Font"
 msgstr "Fonts"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 #, fuzzy
 msgid "&Font:"
 msgstr "Fonts"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr ""
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr ""
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr ""
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr ""
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr ""
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr ""
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr ""
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr ""
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr ""
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr ""
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr ""
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr ""
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr ""
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr ""
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr ""
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr ""
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr ""
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr ""
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr ""
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr ""
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr ""
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr ""
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr ""
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr ""
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 #, fuzzy
 msgid "Direction"
 msgstr "&Options"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr ""
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr ""
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr ""
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr ""
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr ""
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr ""
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr ""
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 #, fuzzy
 msgid "Print to fi&le"
 msgstr "Tuot las datotecas (*.*)"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr ""
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr ""
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr ""
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr ""
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr ""
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr ""
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr ""
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr ""
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr ""
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr ""
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 #, fuzzy
 msgid "&Selection"
 msgstr "&Options"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr ""
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr ""
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr ""
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr ""
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr ""
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr ""
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr ""
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr ""
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr ""
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr ""
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr ""
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr ""
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr ""
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr ""
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 #, fuzzy
 msgid "P&rinter..."
 msgstr "&Stampar tema"
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr ""
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 #, fuzzy
 msgid "File &name:"
 msgstr "&Datoteca"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 #, fuzzy
 msgid "Files of &type:"
 msgstr "&Datoteca"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr ""
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Rivir"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Datoteca"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "&Datoteca"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr ""
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr ""
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr ""
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr ""
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr ""
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr ""
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Fonts"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr ""
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr ""
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr ""
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr ""
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr ""
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
 msgstr ""
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr ""
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
 msgstr ""
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr ""
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr ""
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr ""
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr ""
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr ""
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr ""
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr ""
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr ""
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr ""
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr ""
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr ""
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr ""
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr ""
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr ""
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr ""
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr ""
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr ""
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr ""
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr ""
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr ""
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr ""
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr ""
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr ""
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr ""
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
 msgstr ""
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr ""
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
 msgstr ""
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr ""
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
 msgstr ""
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr ""
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr ""
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr ""
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr ""
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr ""
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr ""
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 msgstr ""
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr ""
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr ""
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr ""
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr ""
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 #, fuzzy
 msgid "Open File"
 msgstr "Wine ag�d"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr ""
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr ""
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr ""
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr ""
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr ""
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr ""
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr ""
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr ""
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 #, fuzzy
 msgid "Printer offline; "
 msgstr "Tuot las datotecas (*.*)"
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr ""
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr ""
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 #, fuzzy
 msgid "Printing; "
 msgstr "&Stampar tema"
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr ""
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 #, fuzzy
 msgid "Not available; "
 msgstr "INFUORMAZIUN"
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr ""
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr ""
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr ""
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr ""
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr ""
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr ""
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr ""
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr ""
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr ""
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr ""
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr ""
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr ""
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr ""
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr ""
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr ""
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr ""
@@ -7786,6 +7745,15 @@ msgstr ""
 msgid "Date deleted"
 msgstr ""
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr ""
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr ""
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -7814,6 +7782,10 @@ msgstr ""
 msgid "Start Menu\\Programs"
 msgstr ""
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr ""
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr ""
@@ -13109,6 +13081,10 @@ msgstr "&Definir..."
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Fonts"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index ed7952f00d7..5ed3a8cde3f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -56,8 +56,8 @@ msgstr "&Elimină"
 msgid "Support Information"
 msgstr "Informații de asistență"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -139,10 +139,10 @@ msgid "&Install"
 msgstr "&Instalează"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -289,11 +289,11 @@ msgstr "RenunÈ›..."
 msgid "Properties for %s"
 msgstr "Proprietăți pentru %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "A&plică"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "&Ajutor"
 
@@ -326,9 +326,9 @@ msgstr "ÃŽn&chide"
 msgid "R&eset"
 msgstr "&Resetează"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -387,476 +387,420 @@ msgstr "Azi:"
 msgid "Go to today"
 msgstr "Mergi la Azi"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Deschide"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "&Nume fișier:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Dosare:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "&Tip de fișier:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "D&iscuri:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "Doar citi&re"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Salvare ca..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Salvează ca"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Tipărire"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Imprimantă:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Interval tipărire"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "To&ate"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "S&elecție"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Pagini"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Setează"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&De la:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&La:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&Calitate tipărire:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Tipăreşte în fişier"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Comprimat"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Setări tipărire"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Imprimantă"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Imprimantă implicită"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[nimic]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "I&mprimantă specifică"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Orientare"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "P&ortret"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Peisaj"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Hârtie"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Mărime"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Sursă"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Font"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Font:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "&Stil font:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "Mărime:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Efecte"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Linie mijloc"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Subliniat"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "Culoare:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Eșantion"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Scr&ipt:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Culoare"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "Culori de &bază:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Culori personalizate:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Culoare |  Sol&id"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Roșu:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Verde:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Albastru:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Nuanță:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Sat:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Lum:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Adaugă culori personalizate"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Definește colori personalizate >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Căutare"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Caută:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "&Numai cuvinte întregi"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "Sensibil la registru"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Direcție"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Sus"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "&Jos"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "Caută &înainte"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "ÃŽnlocuire"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "ÃŽn&locuieÅŸte cu:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&ÃŽnlocuieÅŸte"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "ÃŽnlocuieÅŸte &tot"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Tipăreşte în &fişier"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Proprietăți"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Nume:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Stare:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Tip:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Loc:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Comentariu:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Copii"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Număr de &copii:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "C&olaționate"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "Pa&ginile"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Selecție"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&de la:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&la:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Mărime:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Sursă:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "P&ortret"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "&Peisaj"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Setare Pagină"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "S&ertar:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "P&ortret"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Margini"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "S&tânga:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Dreapta:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&Sus:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Jos:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "&Imprimantă..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "Caută &în:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "&Nume fișier:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "&Tip de fișier:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Deschide pentru &numai-citire"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Deschide"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "Nume &fișier:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "&Tip de fișier:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&Despre testul FolderPicker"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Dosarele de documente"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Documentele mele"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Favoritele mele"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Calea de sistem"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr ""
-"#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
-"Desktop\n"
-"#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
-"Birou"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-#, fuzzy
-msgid "Fonts"
-msgstr ""
-"#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
-"&Font\n"
-"#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
-"Fonturi"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-#, fuzzy
-msgid "My Computer"
-msgstr ""
-"#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
-"Computerul meu\n"
-"#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
-"Calculatorul meu"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Dosarele de sistem"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Discurile locale"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Fișierul nu a fost găsit"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Verificați vă rog că numele de fișier este corect"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -864,7 +808,7 @@ msgstr ""
 "Fişierul nu există.\n"
 "Doriți să creați acest fișier?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -872,11 +816,11 @@ msgstr ""
 "Fișierul există deja.\n"
 "Doriți să îl înlocuiți?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Caracter(e) invalid(e) în cale"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -884,63 +828,63 @@ msgstr ""
 "Numele de fișier nu poate conține caracterele următoare:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Calea nu există"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Fişierul nu există"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Un nivel de dosare mai sus"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Creează un dosar nou"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Listă"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Detalii"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Navigează la birou"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Normal"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Aldin"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Cursiv"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Aldin cursiv"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Negru"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Maro"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Verde"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 #, fuzzy
 msgid "Olive"
 msgstr ""
@@ -949,7 +893,7 @@ msgstr ""
 "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
 "Oliviu"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 #, fuzzy
 msgid "Navy"
 msgstr ""
@@ -958,11 +902,11 @@ msgstr ""
 "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
 "Ultramarin"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Violet"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 #, fuzzy
 msgid "Teal"
 msgstr ""
@@ -971,7 +915,7 @@ msgstr ""
 "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
 "Verde-albastru"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 #, fuzzy
 msgid "Gray"
 msgstr ""
@@ -980,15 +924,15 @@ msgstr ""
 "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
 "Griu"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Argintiu"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Roșu"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 #, fuzzy
 msgid "Lime"
 msgstr ""
@@ -997,15 +941,15 @@ msgstr ""
 "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
 "Verde deschis"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Galben"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Albastru"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 #, fuzzy
 msgid "Fuchsia"
 msgstr ""
@@ -1014,7 +958,7 @@ msgstr ""
 "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
 "Roz"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 #, fuzzy
 msgid "Aqua"
 msgstr ""
@@ -1023,15 +967,15 @@ msgstr ""
 "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
 "Azur"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Alb"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Înregistrare necitibilă"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -1040,11 +984,11 @@ msgstr ""
 "Această valoare nu este inclusă în intervalul de tipărire.\n"
 " Introduceți vă rog un număr între %d și %d."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "Numărul 'de la' nu poate fi mai mare decât numărul 'la'."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1052,12 +996,12 @@ msgstr ""
 "Marginile se suprapun sau sunt in afara hârtiei.\n"
 "Introduceți vă rog din nou marginile."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Numărul de copii nu poate fi nul."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1065,31 +1009,31 @@ msgstr ""
 "Imprimanta nu suportă un număr așa de mare de copii.\n"
 "Introduceți vă rog un număr între 1 și %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "S-a produs o eroare la tipărire."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Imprimanta implicită n-a fost definită."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Nu pot găsi imprimanta."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Memorie insuficientă."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "S-a produs o eroare."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Driver de imprimantă necunoscut."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1098,28 +1042,28 @@ msgstr ""
 "referință cu imprimanta ca spre exemplu setări pagină sau tipărirea unui "
 "document. Instalați va rog o imprimantă și reincercați."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Alegeți o mărime de font între %d și %d puncte."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Salvează"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Salvează &în:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Salvează"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Deschide fișier"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 #, fuzzy
 msgid "Ready"
 msgstr ""
@@ -1128,123 +1072,123 @@ msgstr ""
 "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
 "Gata"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Pauză; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Eroare; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Aștept stergerea; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Hârtie blocată în imprimantă; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Fără hârtia; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Alimentați hârtia manual; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Problemă cu hârtia; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Imprimantă deconectată; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "I/O activ; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Ocupat; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Tipăresc; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Sertarul de ieșire este plin; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Indisponibil; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Aștept; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Procesez; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Initializez; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Încălzesc; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Toner puțin; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Fără toner; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "ÃŽntrerupere utilizator; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Memorie insuficientă; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Carcasa imprimantei este deschisă; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Server de tipărire necunoscut; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Economisire de energie; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Imprimantă implicită; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "%d documente sunt în coadă"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Margini [țoli]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Margini [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -8359,6 +8303,25 @@ msgstr "Locația originală"
 msgid "Date deleted"
 msgstr "Data ștergerii"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr ""
+"#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
+"Desktop\n"
+"#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
+"Birou"
+
+#: shell32.rc:154 regedit.rc:200
+#, fuzzy
+msgid "My Computer"
+msgstr ""
+"#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
+"Computerul meu\n"
+"#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
+"Calculatorul meu"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Panoul de control"
@@ -8387,6 +8350,10 @@ msgstr "Vreți să opriți sesiunea de Wine?"
 msgid "Start Menu\\Programs"
 msgstr "Meniu Start\\Programe"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Documentele mele"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favorite"
@@ -14298,6 +14265,15 @@ msgstr "&Definește..."
 msgid "History"
 msgstr "Istorie"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+#, fuzzy
+msgid "Fonts"
+msgstr ""
+"#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
+"&Font\n"
+"#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
+"Fonturi"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Mic"
diff --git a/po/ru.po b/po/ru.po
index 60a19d8fe53..2494fcc58c5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -56,8 +56,8 @@ msgstr "&Удалить"
 msgid "Support Information"
 msgstr "Сведения о поддержке"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -139,10 +139,10 @@ msgid "&Install"
 msgstr "&Установить"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -290,11 +290,11 @@ msgstr "Отмена..."
 msgid "Properties for %s"
 msgstr "Свойства %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "При&менить"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "&Справка"
 
@@ -327,9 +327,9 @@ msgstr "&Закрыть"
 msgid "R&eset"
 msgstr "С&бросить"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -383,459 +383,418 @@ msgstr "Сегодня:"
 msgid "Go to today"
 msgstr "Текущая дата"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Открыть"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "&Имя файла:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Каталоги:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Показывать файлы &типа:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Диски:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Только для чтения"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Сохранить как..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Сохранить как"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Печать"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Принтер:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Печатать"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Весь реестр"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "В&ыделенный фрагмент"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Страницы"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "Сво&йства"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&с:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&по:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&Качество печати:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "П&ечать в файл"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Сжато"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Настройка принтера"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Принтер"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "Принтер по &умолчанию"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[нет]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "&Другой принтер"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Ориентация"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "&Книжная"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Альбомная"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Бумага"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "Ра&змер"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Источник"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Шрифт"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Шрифт:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "&Начертание:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "Размер:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Атрибуты"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Зачёркнутый"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "Под&чёркнутый"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "Цвет:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Образец"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "АаБбAaBb"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "На&бор символов:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Выбор цвета"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Базовая палитра:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "До&полнительные цвета:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Цвет|За&ливка"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "Крас&н:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Зелёный:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "С&иний:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "О&ттенок:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Контраст:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Яркость:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Добавить в набор"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Определить цвет >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Поиск"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Образец:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "&Только слово целиком"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "C &учетом регистра"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Направление"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "В&верх"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "В&низ"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Найти далее"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Замена"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "З&аменить на:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Заменить"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Заменить &всё"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Печать в фай&л"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Свойства"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Имя:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Статус:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Тип:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Место:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Примечание:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Копии"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Число &копий:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "&Разбить"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "&Страницы"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Выделение"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&от:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&до:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Размер:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Источник:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "&Портрет"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "Л&андшафт"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Параметры страницы"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "Пода&ча:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Книжная"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Поля"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&Слева:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Правое:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "Спр&ава:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Нижнее:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "&Принтер..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "Искать &в:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "Имя &файла:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "&Тип файлов:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Только для &чтения"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Открыть"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr "Имя файла:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr "Файлы типа:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&О тесте ВыборПапки"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Папки документов"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Мои документы"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Избранное"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Системный путь"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Рабочий стол"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Шрифты"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Мой компьютер"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Системные папки"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Локальные жесткие диски"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Файл не найден"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Проверьте, правильно ли указано имя файла"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -843,7 +802,7 @@ msgstr ""
 "Файла не существует.\n"
 "Хотите ли вы его создать?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -851,11 +810,11 @@ msgstr ""
 "Файл уже существует.\n"
 "Заменить его?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Некорректный символ в записи пути"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -863,119 +822,119 @@ msgstr ""
 "Имя файла не может содержать следующие символы:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Путь не существует"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Файл не существует"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Вверх на один уровень"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Создать новую папку"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Список"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Подробности"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Переход на рабочий стол"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Нормальный"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Жирный"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Курсив"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Жирный курсив"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Чёрный"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Тёмно-бордовый"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Зелёный"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Оливковый"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Тёмно-синий"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Пурпурный"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Морской волны"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Серый"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Серебряный"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Красный"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Лимонный"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Жёлтый"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Синий"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Ярко-розовый"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Голубой"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Белый"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Нечитаемый элемент"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
@@ -983,11 +942,11 @@ msgstr ""
 "Это значение не лежит внутри диапазона страниц.\n"
 "Введите значение между %1!%d! и %2!d!."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "Значение \"от\" не должно превышать значения \"до\"."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -995,11 +954,11 @@ msgstr ""
 "Границы перекрывают или превышают размеры бумаги.\n"
 "Введите их заново."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Число копий не может быть пустым."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1007,31 +966,31 @@ msgstr ""
 "Такое большое количество копий не может быть напечатано вашим принтером.\n"
 "Введите значение от 1 до %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Произошла ошибка принтера."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Не задан принтер по умолчанию."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Не удалось найти принтер."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Мало памяти."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Произошла ошибка."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Неизвестный драйвер принтера."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1039,147 +998,147 @@ msgstr ""
 "Перед тем как настраивать страницу печати или печатать документ "
 "нужноустановить принтеры. Пожалуйста установите его и попробуйте еще раз."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Выберите шрифт размером от %1!d! до %2!d! пунктов."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Сохранить"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Сохранить &в:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Сохранить"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Открыть файл"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Готово"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Приостановлено; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Ошибка; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Ожидание удаления; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Бумага застряла; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Не хватило бумаги; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Вставьте бумагу вручную; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Проблема с бумагой; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Принтер в автономном режиме; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "Ввод/Вывод активен; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Занят; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Идет печать; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Лоток переполнен бумагой; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Не доступен; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Ожидание; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Обработка; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Подготовка; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Прогрев; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Тонер на исходе; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Нет тонера; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Страница не напечатана; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Прервано пользователем; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Мало памяти; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Крышка принтера открыта; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Неизвестный принт-сервер; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Режим экономии энергии; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Принтер по умолчанию; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Документов в очереди: %d"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Границы [дюймы)"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Границы [мм]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "мм"
@@ -7850,6 +7809,15 @@ msgstr "Исходное местонахождение"
 msgid "Date deleted"
 msgstr "Время удаления"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Рабочий стол"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Мой компьютер"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Панель Управления"
@@ -7878,6 +7846,10 @@ msgstr "Закончить работу с Wine?"
 msgid "Start Menu\\Programs"
 msgstr "Главное меню\\Программы"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Мои документы"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Избранное"
@@ -13626,6 +13598,10 @@ msgstr "&Определить..."
 msgid "History"
 msgstr "История"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Шрифты"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Мелкий"
diff --git a/po/sk.po b/po/sk.po
index 841ba15e0ce..fbe4c6b3d72 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -55,8 +55,8 @@ msgstr "&Skomentovať..."
 msgid "Support Information"
 msgstr "Informácie"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -133,10 +133,10 @@ msgid "&Install"
 msgstr "&Skomentovať..."
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -282,11 +282,11 @@ msgstr ""
 msgid "Properties for %s"
 msgstr "%s - vlastnosti"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Použiť"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Pomocník"
 
@@ -319,9 +319,9 @@ msgstr "&Zavrieť"
 msgid "R&eset"
 msgstr "Pr&edvolené"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -376,478 +376,436 @@ msgstr "Dnes:"
 msgid "Go to today"
 msgstr "Choď na dnešok"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Otvoriť"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "&Názov súboru:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Adresáre:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "&Typ zobrazených súborov:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Diskové jednotky:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Len na čítanie"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Uložiť ako"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Tlač"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Tlačiareň:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Rozsah tlače"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "Vytlačiť &všetko"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "Vytlačiť vý&ber"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "Vytlačiť &zadané strany"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Nastaviť..."
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&Od:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&Do:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&Kvalita tlače:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Tlačiť do &súboru"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Kondenzované"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Nastavenie spôsobu tlače"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Tlačiareň"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Predvolená tlačiareň"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[žiadna]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Špecifická &tlačiareň"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Orientácia"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "Na &výšku"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Na šírku"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Papier"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Formát"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Odkiaľ"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Písmo"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Písmo:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "Š&týl písma:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Veľkosť:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Efekty"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "P&rečiarknuté"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Podčiarknuté"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Farba:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Vzorka"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Scr&ipt:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Farby"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "Základné &farby:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Vlastné farby:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Farba | Pl&ná"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "Če&rvená:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Zelená:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Modrá:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "Od&tieň:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Sýtosť:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Jas:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "Prid&ať medzi vlastné farby"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Definovať vlastné farby >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Hľadanie"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Nájsť:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Len &celé slová"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "&Rozlišovať malé a veľké písmená"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Smer"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "H&ore"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "&Dole"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "Nájsť ď&alšie"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Zámena"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "&Zameniť za:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "Za&meniť"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Zameniť vo vý&bere"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "tlačiť do &súboru"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Vlastnosti"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Názov:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Stav:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Typ:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Kam:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Komentár:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Kópie"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Počet &kópií:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "C&ollate"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "St&rany"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "Vý&ber"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&od:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&do:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "&Veľkosť:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Zdroj:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "&Na výšku"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "Na ší&rku"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Setup Page"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Tray:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "Na výš&ku"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Borders"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "L&eft:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Right:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "T&op:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Bottom:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "P&rinter..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "Hľadať &v"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "&Názov súboru:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "&Typ súborov"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Otvo&riť iba na čítanie"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Otvoriť..."
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Súbor"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "&Typ súborov"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&O teste uchopovania adresárov"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Adresár dokumentov"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Moje dokumenty"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Obľúbené položky"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Systémová cesta"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Pracovná plocha"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Písma"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Tento počítač"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Systémové adresáre"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Lokálne pevné disky"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Súbor nenájdený"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr ""
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
 msgstr ""
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr ""
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -855,315 +813,315 @@ msgstr ""
 "Názov súboru nemôže obsahovať žiadny z nasledovných znakov:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Cesta neexistuje"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Súbor neexistuje"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "O úroveň vyššie"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Vytvoriť nový adresár"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Zoznam"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Detaily"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Listovať pracovnú plochu"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Tučné"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Kurzíva"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Tučné kurzíva"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "ÄŒierna"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Maroon"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Zelená"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr ""
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Navy"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr ""
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Teal"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr ""
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr ""
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Červená"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr ""
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Žltá"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Modrá"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr ""
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Aqua"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Biela"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr ""
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
 msgstr ""
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr ""
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
 msgstr ""
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr ""
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
 msgstr ""
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr ""
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Nie je nastavená implicitná tlačiareň"
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Nemožno nájsť tlačiareň"
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Nedostatok pamäte"
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Vyskytla sa chyba"
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Neznámy ovládač tlačiarne"
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 msgstr ""
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr ""
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr ""
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr ""
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Uložiť"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Otvoriť súbor"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Pripravená"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Pozastavená; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Chyba; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr ""
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Uviaznutý papier; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Chýba papier; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr ""
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Problém s papierom; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Tlačiareň v stave offline; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr ""
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Zaneprázdnená; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Prebieha tlač; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr ""
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Nie je k dispozícii; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Čaká sa; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Prebieha spracovanie; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Inicializácia; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Zahrievanie; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Primálo toneru; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Chýba toner; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Prerušenie užívateľom; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Nedostatok pamäte; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Dvierka tlačiarne sú otvorené; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Neznámy print server; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Úsporný režim; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Implicitná tlačiareň; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr ""
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Okraje [palce]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Okraje [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 #, fuzzy
 msgctxt "unit: millimeters"
 msgid "mm"
@@ -7865,6 +7823,16 @@ msgstr ""
 msgid "Date deleted"
 msgstr ""
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Pracovná plocha"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Tento počítač"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -7893,6 +7861,10 @@ msgstr ""
 msgid "Start Menu\\Programs"
 msgstr ""
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Moje dokumenty"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr ""
@@ -13261,6 +13233,10 @@ msgstr "&Definovať..."
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Písma"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 6d07f739565..2a8fa961c9f 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -56,8 +56,8 @@ msgstr "&Odstrani"
 msgid "Support Information"
 msgstr "Informacije"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -139,10 +139,10 @@ msgid "&Install"
 msgstr "&Namesti"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -292,11 +292,11 @@ msgstr "Preklicevanje ..."
 msgid "Properties for %s"
 msgstr "Lastnosti %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Uporabi"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Pomoč"
 
@@ -329,9 +329,9 @@ msgstr "&Zapri"
 msgid "R&eset"
 msgstr "Po&nastavi"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -386,462 +386,420 @@ msgstr "Danes:"
 msgid "Go to today"
 msgstr "Pojdi na današnji dan"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Odpri"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "Ime &datoteke:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Mape:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "&Vrsta datotek:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "Pog&oni:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "Samo za &branje"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Shrani kot ..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Shrani kot"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Natisni"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Tiskalnik:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Obseg tiskanja"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Vse"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "I&zbor"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "St&rani"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Nastavitve"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&od:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&do:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "Kakovost ti&skanja:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Na&tisni v datoteko"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Zbiranje kopij"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Nastavitve tiskanja"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Tiskalnik"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "Privzeti &tiskalnik"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[brez]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Določen ti&skalnik"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Usmerjenost"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "P&okončno"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "L&ežeča"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Papir"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "Veli&kost"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Vir"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Pisava"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "Pis&ava:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "Slog pi&save:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Velikost:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Učinki"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "Pr&ečrtano"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "P&odčrtano"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Barva:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Vzorec"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Sis&tem pisave:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Barva"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "Osno&vne barve:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "Namešane &barve:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Barva |  T&emelj"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Rdeča:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Zelena:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Modra:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "Od&tn.:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Nasič.:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Svetl.:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Dodaj med namešane barve"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "M&ešanje barv >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Iskanje"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "N&ajdi:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "&Samo cele besede"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "&Razlikuj velikost črk"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Smer iskanja"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "Navz&gor"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "Navz&dol"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Najdi naslednje"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Zamenjava"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "Zamenjaj &z:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Zamenjaj"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Zamenjaj &vse"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Na&tisni v datoteko"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Lastnosti"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Ime:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Stanje:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Vrsta:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Kje:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Komentar:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Kopije"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Å tevilo &kopij:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "Z&biranje"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "St&rani"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "I&zbor"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&od:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&do:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "V&elikost:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Vir:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "P&okončno"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "L&ežeče"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Nastavitev strani"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Vir:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "P&okončna"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Robovi"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&Levo:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Desno:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&Zgoraj:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Spodaj:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "&Tiskalnik ..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "&Išči v:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "Ime &datoteke:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Vrsta da&totek:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "&Samo za branje"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Odpri"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Ime datoteke:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "Vrsta da&totek:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&O FolderPicker Test"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Mape z dokumenti"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Moji dokumenti"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Priljubljene"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Sistemska pot"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Namizje"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Pisave"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Moj računalnik"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Sistemske mape"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Krajevni trdi diski"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Datoteke ni mogoče najti"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Preverite, ali ste vnesli pravilno ime datoteke"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -849,7 +807,7 @@ msgstr ""
 "Datoteka ne obstaja.\n"
 "Ali jo želite ustvariti?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -857,11 +815,11 @@ msgstr ""
 "Datoteka že obstaja.\n"
 "Ali jo želite zamenjati?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Neveljavni znaki v poti"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -869,119 +827,119 @@ msgstr ""
 "Ime datoteke ne sme vsebovati naslednjih znakov:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Pot ne obstaja"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Datoteka ne obstaja"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Eno raven navzgor"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Ustvari novo mapo"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Seznam"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Brskaj po namizju"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Navadno"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Krepko"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Ležeče"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Krepko ležeče"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "ÄŒrna"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Kostanjeva"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Zelena"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Olivna"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Mornariška"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Vijolična"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Zelenomodra"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Siva"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Srebrna"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Rdeča"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Citronska"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Rumena"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Modra"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Roza"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Akvamarin"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Bela"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Neberljiv vnos"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -990,11 +948,11 @@ msgstr ""
 "Ta vrednost ne leži znotraj obsega strani.\n"
 "Podajte vrednost med %d in %d."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "Vrednost 'od' ne more biti večja od vrednosti 'do'."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1002,12 +960,12 @@ msgstr ""
 "Robovi se prekrivajo ali pa niso znotraj meja papirja.\n"
 "Ponovno vnesite vrednosti robov."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Polje 'Å tevilo kopij' ne sme biti prazno."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1015,31 +973,31 @@ msgstr ""
 "Tiskalnik ne podpira tako velikega Å¡tevila kopij.\n"
 "Vnesite vrednost med 1 in %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Prišlo je do napake tiskanja."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Privzeti tiskalnik ni določen."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Tiskalnika ni mogoče najti."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Zmanjkalo je pomnilnika."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Prišlo je do napake."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Neznan gonilnik tiskalnika."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1047,148 +1005,148 @@ msgstr ""
 "Preden lahko izvajate s tiskalniki povezana opravila, povezane s tiskanjem, "
 "morate namestiti tiskalnik. Po namestitvi tiskalnika poskusite znova."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Izberite velikost pisave med %d in %d točkami."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Shrani"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Shrani &v:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Shrani"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Odpri datoteko"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Pripravljen"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "V premoru,"
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Napaka; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Brisanje je na čakanju,"
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Papir se je zataknil,"
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Zmanjkalo je papirja,"
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Podajanje papirja je ročno,"
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Težava s papirjem,"
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Tiskalnik ni povezan,"
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "V/I je dejaven."
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Zaposleno,- "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Tiskanje, "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Izhodni pladenj je poln,"
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Ni na voljo; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "ÄŒakanje, "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Obdelovanje, "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Začenjanje,"
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Ogrevanje,"
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Zmanjkuje črnila,"
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Ni črnila, "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Upor strani,"
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Preklic s strani uporabnika,"
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Zmanjkalo je pomnilnika, "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Ohišje tiskalnika je odprto ,"
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Strežnik tiskanja ni znan,"
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Način varčevanja z energijo,"
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Privzeti tiskalnik; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "V čakalni vrsti je %d dokumentov"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Beli robovi [palci]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Robovi [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -7914,6 +7872,16 @@ msgstr "Izvirno mesto"
 msgid "Date deleted"
 msgstr "Datum je bil izbrisan"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Namizje"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Moj računalnik"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Nadzorna plošča"
@@ -7942,6 +7910,10 @@ msgstr "Ali želite končati svojo Wine sejo?"
 msgid "Start Menu\\Programs"
 msgstr "Meni Start\\Programi"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Moji dokumenti"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Priljubljene"
@@ -13774,6 +13746,10 @@ msgstr "Do&loči ..."
 msgid "History"
 msgstr "Zgodovina"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Pisave"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Majhna"
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index 0ad4c3cefde..0027f8c8fde 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -55,8 +55,8 @@ msgstr "&Уклони"
 msgid "Support Information"
 msgstr "Подршка"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -136,10 +136,10 @@ msgid "&Install"
 msgstr "&Инсталирај"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -290,11 +290,11 @@ msgstr "Отказивање..."
 msgid "Properties for %s"
 msgstr "Својства за %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Примени"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Помоћ"
 
@@ -327,9 +327,9 @@ msgstr "&Затвори"
 msgid "R&eset"
 msgstr "&Поништи"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -384,462 +384,420 @@ msgstr "Данас:"
 msgid "Go to today"
 msgstr "Пређи на данашњи дан"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Отвори"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "&Назив датотеке:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Фасцикле:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Списак датотека &врсте:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Јединице:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Само за читање"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Сачувај као..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Сачувај као"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Штампање"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Штампач:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Опсег штампе"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Све"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "&Одабир"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Странице"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Подеси"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&Од:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&До:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&Квалитет штампања:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Штампај на &датотеку"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Сужено"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Поставке штампе"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Штампач"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Подразумевани штампач"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[ништа]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Одређени &штампач"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Усмерење"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "&Усправно"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Водоравно"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Папир"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Величина"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Извор"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Фонт"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Фонт:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "&Стил фонта:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Величина:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Ефекти"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Прецртај"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Подвуци"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Боја:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Пример"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "АаБбЏџШш"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "&Скрипта:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Боја"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Основне боје:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Прилагођене боје:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Боја |  &Чиста"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Црвена:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Зелена:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Плава:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Нијанса:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Засићење:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Осветљење:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Додај у прилагођене боје"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Подеси прилагођене боје >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Проналажење"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Пронађи шта:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Пронађи само &целу реч"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "Подударање &малих и великих слова"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Правац"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Горе"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "&Доле"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Пронађи следеће"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Замена"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "&Замени са:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Замени"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Замени &све"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Штампај на &датотеку"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Својства"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Назив:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Стање:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Врста:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Где:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Коментар:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Примерци"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Број &примерака:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "&Сложи"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "Ст&ране"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Одабир"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&од:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&до:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "&Величина:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Извор:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "&Усправно"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "&Водоравно"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Поставке папира"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Фиока:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Усправно"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Ивице"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&Лево:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Десно:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&Врх:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Дно:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "&Штампач..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "Потражи &у:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "Назив &датотеке:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Датотеке &врсте:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Отвори као „&само за читање“"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Отвори"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Датотека"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "Датотеке &врсте:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&О FolderPicker тесту"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Фасцикле за документа"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Документи"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Омиљено"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Системска путања"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Радна површина"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Фонтови"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Рачунар"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Системске фасцикле"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Тврди дискови"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Датотека није пронађена"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Проверите назив датотеке"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -847,7 +805,7 @@ msgstr ""
 "Датотека не постоји.\n"
 "Желите ли да је направите?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -855,11 +813,11 @@ msgstr ""
 "Датотека већ постоји.\n"
 "Желите ли да је замените?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Неисправан знак у путањи"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -867,119 +825,119 @@ msgstr ""
 "Назив датотеке не сме садржати следеће знакове:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Путања не постоји"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Датотека не постоји"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Један ниво горе"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Направи нову фасциклу"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Списак"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Детаљи"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Потражи на радној површини"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Обично"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Подебљано"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Укошено"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Подебљано укошено"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Црна"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Кестењаста"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Зелена"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Маслинаста"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Тамно плава"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Љубичаста"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Зеленкаста"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Сива"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Сребрна"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Црвена"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Лимун зелена"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Жута"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Плава"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Розе-љубичаста"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Светло плава"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Бела"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Унос је нечитљив"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -988,11 +946,11 @@ msgstr ""
 "Ова вредност не лежи на опсегу стране.\n"
 "Унесите вредност између %d и %d."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "Унос „од“ не сме бити после „до“ уноса."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1000,12 +958,12 @@ msgstr ""
 "Маргине се преклапају или прелазе ван граница папира.\n"
 "Поново унесите маргине."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Вредност за „Број примерака“ не сме бити празна."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1013,31 +971,31 @@ msgstr ""
 "Оволики број примерака није подржан од стране Вашег штампача.\n"
 "Унесите вредност између 1 и %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Дошло је до грешке у штампачу."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Подразумевани штампач није изабран."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Штампач није пронађен."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Нема више меморије."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Дошло је до грешке."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Везник за штампач није препознат."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1045,148 +1003,148 @@ msgstr ""
 "Пре подешавања стране и штампања, морате да инсталирате управљачки програм. "
 "Инсталирајте га и покушајте поново."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Изаберите величину фонта између %d и %d тачака."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Сачувај"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Сачувај &у:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Сачувај"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Отвори датотеку"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Спремно"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Паузирано; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Грешка; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Чека на брисање; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Улаз за папир; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Нема папира; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Додајте папир; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Проблем с папиром; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Штампач није повезан; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "I/O активан; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Заузет; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Штампа; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Излаз је пун; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Недоступно; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Чекање; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Обрађивање; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Покретање; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Загревање; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Тонер је при крају; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Нема тонера; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Фунта стране; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Прекинуто од стране корисника; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Нема више меморије; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Улаз на штампачу је отворен; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Сервер за штампање није познат; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Режим за уштеду струје; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Подразумевани штампач; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "%d докумената је у реду за чекање"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Маргине (у инчима)"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Маргине (у милиметрима)"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "мм"
@@ -8119,6 +8077,16 @@ msgstr "Оригинална локација"
 msgid "Date deleted"
 msgstr "Датум брисања"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Радна површина"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Рачунар"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Управљачки панел"
@@ -8147,6 +8115,10 @@ msgstr "Желите ли да изгасите Wine сесију?"
 msgid "Start Menu\\Programs"
 msgstr "„Старт“ мени\\Програми"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Документи"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Омиљено"
@@ -13677,6 +13649,10 @@ msgstr ""
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Фонтови"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index 70e967a9d07..526d6418f57 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -55,8 +55,8 @@ msgstr "&Ukloni"
 msgid "Support Information"
 msgstr "Podrška"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -136,10 +136,10 @@ msgid "&Install"
 msgstr "&Instaliraj"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -295,11 +295,11 @@ msgstr "Otkazivanje..."
 msgid "Properties for %s"
 msgstr "Svojstva za %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Primeni"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Pomoć"
 
@@ -332,9 +332,9 @@ msgstr "&Zatvori"
 msgid "R&eset"
 msgstr "&Poništi"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -393,45 +393,45 @@ msgstr "Danas:"
 msgid "Go to today"
 msgstr "Pređi na današnji dan"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Otvori"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 #, fuzzy
 msgid "File &Name:"
 msgstr "&Datoteka"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr ""
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 #, fuzzy
 msgid "List Files of &Type:"
 msgstr "Po &vrsti"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr ""
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 #, fuzzy
 msgid "&Read Only"
 msgstr "Spremno"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 #, fuzzy
 msgid "Save As..."
 msgstr "&Sačuvaj kao..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 #, fuzzy
 msgid "Save As"
 msgstr "Sačuvaj kao"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 #, fuzzy
 msgid "Print"
@@ -441,7 +441,7 @@ msgstr ""
 "#-#-#-#-#  sr_RS@latin.po (Wine)  #-#-#-#-#\n"
 "Å tampanje"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 #, fuzzy
 msgid "Printer:"
 msgstr ""
@@ -450,58 +450,58 @@ msgstr ""
 "#-#-#-#-#  sr_RS@latin.po (Wine)  #-#-#-#-#\n"
 "Å tampanje"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 #, fuzzy
 msgid "Print range"
 msgstr "&Å tampaj objekat"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr ""
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 #, fuzzy
 msgid "S&election"
 msgstr "Odabir teksta"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 #, fuzzy
 msgid "&Pages"
 msgstr "Nagore"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 #, fuzzy
 msgid "&Setup"
 msgstr "Postavke strane"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr ""
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr ""
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 #, fuzzy
 msgid "Print &Quality:"
 msgstr "&Kvalitet sažimanja:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 #, fuzzy
 msgid "Print to Fi&le"
 msgstr "Å tampanje na datoteku"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr ""
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 #, fuzzy
 msgid "Print Setup"
 msgstr "Postavke &Å¡tampe..."
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 #, fuzzy
 msgid "Printer"
 msgstr ""
@@ -510,247 +510,247 @@ msgstr ""
 "#-#-#-#-#  sr_RS@latin.po (Wine)  #-#-#-#-#\n"
 "Å tampanje"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 #, fuzzy
 msgid "&Default Printer"
 msgstr "Podrazumevani štampač; "
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr ""
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr ""
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 #, fuzzy
 msgid "Orientation"
 msgstr "Beleške..."
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr ""
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr ""
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 #, fuzzy
 msgid "Paper"
 msgstr "Ulaz za papir; "
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 #, fuzzy
 msgid "Si&ze"
 msgstr "Veli&čina:"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 #, fuzzy
 msgid "&Source"
 msgstr "Izvor:"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 #, fuzzy
 msgid "Font"
 msgstr "Fontovi"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 #, fuzzy
 msgid "&Font:"
 msgstr "Fontovi"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr ""
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Veličina:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr ""
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr ""
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr ""
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Boja:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr ""
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr ""
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr ""
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 #, fuzzy
 msgid "Color"
 msgstr "&Kolona"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 #, fuzzy
 msgid "&Basic Colors:"
 msgstr "&Boja:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 #, fuzzy
 msgid "&Custom Colors:"
 msgstr "&Boja:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr ""
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr ""
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 #, fuzzy
 msgid "&Green:"
 msgstr "Zelena"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 #, fuzzy
 msgid "&Blue:"
 msgstr "Plava"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr ""
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr ""
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr ""
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr ""
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr ""
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr ""
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr ""
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr ""
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 #, fuzzy
 msgid "Direction"
 msgstr "Opis"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr ""
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr ""
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr ""
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr ""
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr ""
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 #, fuzzy
 msgid "&Replace"
 msgstr "&Zameni...\tCtrl+H"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 #, fuzzy
 msgid "Replace &All"
 msgstr "Izaberi &sve"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 #, fuzzy
 msgid "Print to fi&le"
 msgstr "Å tampanje na datoteku"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Svojstva"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Naziv:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 #, fuzzy
 msgid "Status:"
 msgstr "Stanje"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 #, fuzzy
 msgid "Type:"
 msgstr "&Ukucaj:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr ""
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 #, fuzzy
 msgid "Comment:"
 msgstr "Komentari:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr ""
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr ""
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr ""
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr ""
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 #, fuzzy
 msgid "&Selection"
 msgstr ""
@@ -759,80 +759,80 @@ msgstr ""
 "#-#-#-#-#  sr_RS@latin.po (Wine)  #-#-#-#-#\n"
 "&Izaberi"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr ""
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr ""
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Veli&čina:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 #, fuzzy
 msgid "&Source:"
 msgstr "Izvor:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr ""
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr ""
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr ""
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr ""
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr ""
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 #, fuzzy
 msgid "Borders"
 msgstr "granica"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 #, fuzzy
 msgid "L&eft:"
 msgstr "&Levo:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Desno:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr ""
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Dno:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 #, fuzzy
 msgid "P&rinter..."
 msgstr "Å tampaj..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr ""
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 #, fuzzy
 msgid "File &name:"
 msgstr "&Datoteka"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 #, fuzzy
 msgid "Files of &type:"
 msgstr ""
@@ -841,20 +841,20 @@ msgstr ""
 "#-#-#-#-#  sr_RS@latin.po (Wine)  #-#-#-#-#\n"
 "&Fajl"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr ""
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Otvori"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Datoteka"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr ""
@@ -864,56 +864,14 @@ msgstr ""
 "&Fajl"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&O FolderPicker testu"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Fascikle za dokumenta"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Dokumenti"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Omiljeno"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Sistemska putanja"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Radna površina"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Fontovi"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Računar"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Sistemske fascikle"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Tvrdi diskovi"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Datoteka nije pronađena"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Proverite naziv datoteke"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -921,7 +879,7 @@ msgstr ""
 "Datoteka ne postoji.\n"
 "Želite li da je napravite?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -929,11 +887,11 @@ msgstr ""
 "Datoteka već postoji.\n"
 "Želite li da je zamenite?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Neispravan znak u putanji"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -941,119 +899,119 @@ msgstr ""
 "Naziv datoteke ne sme sadržati sledeće znakove:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Putanja ne postoji"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Jedan nivo gore"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Napravi novu fasciklu"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Spisak"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Detalji"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Potraži na radnoj površini"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Obično"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Podebljano"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Ukošeno"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Podebljano ukošeno"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Crna"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Kestenjasta"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Zelena"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Maslinasta"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Tamno plava"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Ljubičasta"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Zelenkasta"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Siva"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Srebrna"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Crvena"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Limun zelena"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Žuta"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Plava"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Roze-ljubičasta"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Svetlo plava"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Bela"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Unos je nečitljiv"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -1062,11 +1020,11 @@ msgstr ""
 "Ova vrednost ne leži na opsegu strane.\n"
 "Unesite vrednost između %d i %d."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "Unos „od“ ne sme biti posle „do“ unosa."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1074,12 +1032,12 @@ msgstr ""
 "Margine se preklapaju ili prelaze van granica papira.\n"
 "Ponovo unesite margine."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Vrednost za „Broj primeraka“ ne sme biti prazna."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1087,31 +1045,31 @@ msgstr ""
 "Ovoliki broj primeraka nije podržan od strane Vašeg štampača.\n"
 "Unesite vrednost između 1 i %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Došlo je do greške u štampaču."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Podrazumevani štampač nije izabran."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Štampač nije pronađen."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Nema više memorije."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Došlo je do greške."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Veznik za štampač nije prepoznat."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1119,148 +1077,148 @@ msgstr ""
 "Pre podešavanja strane i štampanja, morate da instalirate upravljački "
 "program. Instalirajte ga i pokušajte ponovo."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Izaberite veličinu fonta između %d i %d tačaka."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Sačuvaj"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Sačuvaj &u:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Sačuvaj"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Otvori datoteku"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Spremno"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Pauzirano; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Greška; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "ÄŒeka na brisanje; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Ulaz za papir; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Nema papira; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Dodajte papir; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Problem s papirom; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Štampač nije povezan; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "I/O aktivan; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Zauzet; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Å tampa; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Izlaz je pun; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Nedostupno; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "ÄŒekanje; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Obrađivanje; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Pokretanje; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Zagrevanje; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Toner je pri kraju; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Nema tonera; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "Funta strane; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Prekinuto od strane korisnika; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Nema više memorije; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Ulaz na štampaču je otvoren; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Server za Å¡tampanje nije poznat; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Režim za uštedu struje; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Podrazumevani štampač; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "%d dokumenata je u redu za čekanje"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Margine (u inčima)"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Margine (u milimetrima)"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -8223,6 +8181,16 @@ msgstr "Originalna lokacija"
 msgid "Date deleted"
 msgstr "Datum brisanja"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Radna površina"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Računar"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Upravljački panel"
@@ -8251,6 +8219,10 @@ msgstr "Želite li da izgasite Wine sesiju?"
 msgid "Start Menu\\Programs"
 msgstr "„Start“ meni\\Programi"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Dokumenti"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Omiljeno"
@@ -13838,6 +13810,10 @@ msgstr "&Odredi..."
 msgid "History"
 msgstr "Istorija"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Fontovi"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Mali"
diff --git a/po/sv.po b/po/sv.po
index 251a2239d98..938e862168e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -56,8 +56,8 @@ msgstr "Ta &bort"
 msgid "Support Information"
 msgstr "Supportinformation"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -137,10 +137,10 @@ msgid "&Install"
 msgstr "&Installera"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -289,11 +289,11 @@ msgstr "Avbryter..."
 msgid "Properties for %s"
 msgstr "Egenskaper för %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Verkställ"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Hjälp"
 
@@ -326,9 +326,9 @@ msgstr "St&äng"
 msgid "R&eset"
 msgstr "&Återställ"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -383,462 +383,420 @@ msgstr "Idag:"
 msgid "Go to today"
 msgstr "GÃ¥ till idag"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Öppna"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "Fil&namn:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Kataloger:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Lista filer av &typen:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Enheter:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "Sk&rivskyddad"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Spara som"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Skriv ut"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Skrivare:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Skriv ut"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Allt"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "&Markerat"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Sidor"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Inställningar"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&Från:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&Till:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "Utskriftskvalitet:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "&Skriv till fil"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Sammantryckt"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Skrivarinställningar"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Skrivare"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Standardskrivare"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[ingen]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "S&pecificerad skrivare"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Orientering"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "S&tående"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Liggande"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Papper"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "St&orlek"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Källa"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Typsnitt"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Typsnitt:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "Typsnittss&til:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Storlek:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Effekter"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Genomstruken"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Understruken"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Färg:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Test"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Scr&ipt:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Färg"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Grundläggande färger:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Egendefinierade färger:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Enfärgat"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Röd:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Grön:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Blå:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Int:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Met:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Lum:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Lägg till egendefinierad färg"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Definiera egen färg >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Sök"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Sök efter:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "&Bara hela ord"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "&Skillnad på stora/små bokstäver"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Riktning"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Upp"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "&Ner"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Sök efter nästa"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Sök/ersätt"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "&Ersätt med:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Ersätt"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Ersätt &alla"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Skr&iv till fil"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Egenskaper"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Namn:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Status:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Typ:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Plats:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Kopior"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Antal k&opior:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "&Sortera"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "Si&dor"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Markering"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&från:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&till:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "St&orlek:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Källa:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "St&Ã¥ende"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "L&iggande"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Utskriftsformat"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Tray:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Stående"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Marginaler"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&Vänster:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Höger:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&Överkant:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Under:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "&Skrivare..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "Leta &i"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "Fil&namn:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "&Filformat"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Öppna som &skrivskyddad"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Öppna"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Filnamn:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "&Filformat"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&Om FolderPicker-test"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Dokumentmappar"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Mina dokument"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Mina Favoriter"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Systemsökväg"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Skrivbord"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Typsnitt"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Den här datorn"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Systemmappar"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Lokala hårddiskar"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Kunde inte hitta filen"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Vad god verifiera så korrekt filnamn är angivet"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -846,7 +804,7 @@ msgstr ""
 "Filen finns inte.\n"
 "Vill du skapa fil?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -854,11 +812,11 @@ msgstr ""
 "Filen finns redan.\n"
 "Vill du ersätta den?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Illegalt tecken i sökväg"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -866,119 +824,119 @@ msgstr ""
 "Ett filnamn kan inte innehålla någon av följande tecken:\n"
 "                                               / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Sökvägen finns inte"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Filen finns inte"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Upp en nivå"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Skapa ny mapp"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Lista"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Detaljerat"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Visa Skrivbordet"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Standard"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Fet"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Kursiv"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Fet kursiv"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Svart"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Rödbrun"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Grön"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Oliv"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Navy"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Lila"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Teal"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Grå"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Silver"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Röd"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Lime"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Gul"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Blå"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Fuchsia"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Aqua"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Vit"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Oläsbart fält"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -987,11 +945,11 @@ msgstr ""
 "Detta värdet ligger inte inom sidourvalet.\n"
 "Var god skriv in ett värde mellan %d och %d."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "'från'-fältet kan inte överskrida 'till'-fältet"
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -999,12 +957,12 @@ msgstr ""
 "Marginalerna överlappar eller är utanför pappersgränserna.\n"
 "Var god skriv in marginalerna igen."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Fältet 'Antal kopior' kan inte vara tomt."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1012,31 +970,31 @@ msgstr ""
 "Din skrivare saknar stöd för så många kopior som du angav. Vad god skriv in "
 "ett värde mellan 1 och %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Ett skrivarfel inträffade."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Det finns ingen standardskrivare."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Kan inte hitta skrivare."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "För lite minne."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Ett fel uppstod."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Okänd skrivardrivrutin."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1044,148 +1002,148 @@ msgstr ""
 "En skrivare måste installeras innan aktiviteter som utskrift eller "
 "sidinställningar kan utföras. Installera en skrivare och försök på nytt."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Välj en teckenstorlek mellan %d och %d punkter."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Spara"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Spara &i:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Spara"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Öppna fil"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Klar"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Stannad; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Fel; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Väntande borttagning; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Papperskrångel; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Slut på papper; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Fyll på papper manuellt; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Pappersproblem; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Skrivaren är avstängd; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "I/O Aktiv; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Upptagen; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Skriver ut; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Utmatningsfacket är fullt; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Inte tillgänglig; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Väntar; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Behandlar; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Initierar; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Värmer upp; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Toner snart slut; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Ingen toner; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Avbruten av användaren; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Slut på minne; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Skrivardörren är öppen; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Skrivarserver okänd; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Felsäkert läge; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Standardskrivare; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Det finns %d dokument i kön"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Marginaler [tum]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Marginaler [millimeter]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "mm"
@@ -7856,6 +7814,16 @@ msgstr "Ursprunglig plats"
 msgid "Date deleted"
 msgstr "Borttagningsdatum"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Skrivbord"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Den här datorn"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Kontrollpanel"
@@ -7884,6 +7852,10 @@ msgstr "Vill du avsluta Wine?"
 msgid "Start Menu\\Programs"
 msgstr "Start-meny\\Program"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Mina dokument"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favoriter"
@@ -13677,6 +13649,10 @@ msgstr "&Definiera..."
 msgid "History"
 msgstr "Historik"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Typsnitt"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Litet"
diff --git a/po/te.po b/po/te.po
index 817de54e9b5..1a179a2be54 100644
--- a/po/te.po
+++ b/po/te.po
@@ -51,8 +51,8 @@ msgstr ""
 msgid "Support Information"
 msgstr ""
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -126,10 +126,10 @@ msgid "&Install"
 msgstr ""
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -274,11 +274,11 @@ msgstr ""
 msgid "Properties for %s"
 msgstr "సమాచారము (&o)"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr ""
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr ""
 
@@ -311,9 +311,9 @@ msgstr ""
 msgid "R&eset"
 msgstr ""
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -367,796 +367,754 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr ""
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr ""
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr ""
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr ""
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr ""
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr ""
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr ""
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr ""
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr ""
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 #, fuzzy
 msgid "Printer:"
 msgstr "ఫాంట్... (&F)"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 #, fuzzy
 msgid "Print range"
 msgstr "ఫాంట్... (&F)"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr ""
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr ""
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr ""
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr ""
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr ""
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr ""
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr ""
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr ""
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr ""
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr ""
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 #, fuzzy
 msgid "Printer"
 msgstr "ఫాంట్... (&F)"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr ""
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr ""
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr ""
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr ""
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr ""
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr ""
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr ""
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr ""
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr ""
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 #, fuzzy
 msgid "Font"
 msgstr "ఫాంట్... (&F)"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 #, fuzzy
 msgid "&Font:"
 msgstr "ఫాంట్... (&F)"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr ""
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr ""
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr ""
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr ""
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr ""
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr ""
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr ""
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr ""
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr ""
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr ""
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr ""
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr ""
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr ""
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr ""
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr ""
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr ""
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr ""
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr ""
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr ""
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr ""
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr ""
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr ""
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr ""
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr ""
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr ""
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr ""
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr ""
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr ""
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr ""
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr ""
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr ""
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr ""
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr ""
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "సమాచారము (&o)"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr ""
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr ""
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr ""
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr ""
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr ""
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr ""
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr ""
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr ""
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr ""
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr ""
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr ""
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr ""
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr ""
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr ""
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr ""
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr ""
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr ""
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr ""
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr ""
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr ""
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr ""
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr ""
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr ""
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr ""
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 #, fuzzy
 msgid "P&rinter..."
 msgstr "ఫాంట్... (&F)"
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr ""
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr ""
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr ""
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr ""
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr ""
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr ""
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr ""
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr ""
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr ""
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr ""
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr ""
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr ""
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr ""
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-#, fuzzy
-msgid "Fonts"
-msgstr "ఫాంట్... (&F)"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr ""
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr ""
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr ""
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr ""
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr ""
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
 msgstr ""
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr ""
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
 msgstr ""
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr ""
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr ""
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr ""
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr ""
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr ""
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr ""
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr ""
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr ""
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr ""
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr ""
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr ""
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr ""
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr ""
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr ""
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr ""
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr ""
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr ""
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr ""
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr ""
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr ""
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr ""
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr ""
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr ""
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr ""
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
 msgstr ""
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr ""
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
 msgstr ""
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr ""
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
 msgstr ""
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr ""
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr ""
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr ""
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr ""
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr ""
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr ""
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 msgstr ""
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr ""
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr ""
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr ""
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr ""
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr ""
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr ""
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr ""
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr ""
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr ""
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr ""
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr ""
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr ""
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr ""
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr ""
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr ""
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr ""
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr ""
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr ""
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr ""
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr ""
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr ""
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr ""
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr ""
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr ""
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr ""
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr ""
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr ""
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr ""
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr ""
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr ""
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr ""
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr ""
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr ""
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr ""
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr ""
@@ -7721,6 +7679,15 @@ msgstr ""
 msgid "Date deleted"
 msgstr ""
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr ""
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr ""
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -7749,6 +7716,10 @@ msgstr ""
 msgid "Start Menu\\Programs"
 msgstr ""
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr ""
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr ""
@@ -13001,6 +12972,11 @@ msgstr ""
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+#, fuzzy
+msgid "Fonts"
+msgstr "ఫాంట్... (&F)"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index 87776698461..18753d3f6ec 100644
--- a/po/th.po
+++ b/po/th.po
@@ -52,8 +52,8 @@ msgstr ""
 msgid "Support Information"
 msgstr "รายละเอียด"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -130,10 +130,10 @@ msgid "&Install"
 msgstr ""
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -277,11 +277,11 @@ msgstr ""
 msgid "Properties for %s"
 msgstr "คุณสมบัติของ %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "มีผลทันที"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "ช่วยเหลีอ"
 
@@ -314,9 +314,9 @@ msgstr "ปิด"
 msgid "R&eset"
 msgstr "แก้ออก"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -371,478 +371,436 @@ msgstr "วันนี้:"
 msgid "Go to today"
 msgstr "ไปถึงวันนี้"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "เปิด"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "ชื่อแฟ้ม:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "ไดเรกทอรี:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "ตัวกรอง:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "ดิสก์:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "อ่านอย่างเดียว"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "บันทืกเป็น..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "บันทืก"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "พิมพ์"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "เครื่องพิมพ์:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "ย่อ"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "ทั้งหมด"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "ย่อส่วนทีใช้"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "หนา"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "ปรับแต่ง"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "จาก:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "ส่งถึง:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "คุฌภาพการใช้:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "พิมพ์เป็นแฟ้ม"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "ย่อ"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "ปรับแค่งเครื่องพิมพ์"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "เครื่องพิมพ์"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "เครื่องพิมพ์&Default"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[ไม่ได้เลือก]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "เครื่องพิมพ์Specific"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "ทีศทางการวาง"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "การตั้ง"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "แนวนอน"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "กระดาษ"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "ขนาด"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "จาก"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "ต้วอักษร"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "ต้วอักษร:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "รูปแบบต้วอักษร:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "ขนาด:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Effects"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "Stri&keout"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "ขีดเส้นใต้"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "สี:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "ตัวอย่าง"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AฺBCกขฃ"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Scr&ipt:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "สี"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Basic Colors:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "'สีที่กําหนดเอง':"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "สี |  มั่นคง"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "สีแดง:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "สีเขียว:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "สีฟ้า:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&H:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&S:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&L:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "เพิ่มเข้าไป 'สีที่กําหนดเอง'"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "ปรับแต่ง 'สีที่กําหนดเอง' >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "ค้นหา"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "ข้อความทีค้นหา:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "ตรงกันทุกตัวอักษร"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "พิจารณาตัวเล็ก-ใหญ่"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "ทาง"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "ขึ้น"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "ลง"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "ค้นหาต่อไป"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "แทนที"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "การแทนทีข้อความ:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "แทนที"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "แทนทีทังหมด"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "พิมพ์เป็นแฟ้ม"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "ปรับแต่งนาฬิกา"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "ชื่อ:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "อาการเครื่อง:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "แบบ:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "ทีไหน:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "ข้อความ:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "สําเนา"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "กี่สําเนา:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "จัดเรียงตามลําดับ"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "หนา"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "ย่อส่วนทีใช้"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "จาก:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "ส่งถึง:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "ขนาด:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "จากไหน:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "การตั้ง"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "แนวนอน"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "ปรับแต่ง"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "ถาด:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "การตั้ง"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "ขอบกระดาษ"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "ซ้าย:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "ขวา:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "บน:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "ล่าง:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "เครื่องพิมพ์..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "ดูข้างใน:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "ชื่อแฟ้ม:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "ตัวกรอง:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "อ่านอย่างเดียว"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "เปิด"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "แฟ้ม"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "ตัวกรอง:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "เกี่ยวกับ FolderPicker Test"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr ""
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "พื้นที่ส่วนตัว"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "ที่คั่นหนังสือ"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr ""
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "พื้นที่ทำงาน"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "ดัวอักษร"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "เครื่องส่วนตัว"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr ""
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "ฮาร์ดดิสก์เครื่องส่วนตัว"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "ไม่พบแฟ้ม"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr ""
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
 msgstr ""
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr ""
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -850,130 +808,130 @@ msgstr ""
 "ในชื่อแฟ้มใช้ไมได้ต้วนี้:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "ไม่พบไดเรกทอรี"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "ไม่พบแฟ้ม"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "ขึ้นหนึ่งระดับ"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "สร้างไดเรกทอรีใหม่"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "กําหนด"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "รายละเอียด"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "ค้นหารายการพื้นที่ทำงาน"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "สีดํา"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "สีเลืดหมู"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "สีเขียว"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "สีเขียวเข้ม"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "สีนําเงิน"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "สีม่วง"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "สีเขียวอมนําเงินข้ม"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "สีเทา"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "สีเงิน"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "สีแดง"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "สีเขียวออ่น"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "สีเหลือง"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "สีฟ้า"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr ""
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "สีฟ้าออ่น"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "สีขาว"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "อ่านรายการไมได้"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
 msgstr "กรุณาเลื่อกหมายเลขระวาง %d ถึง %d"
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "'จาก' ต่องเป็นน้อยก่วะ 'ส่งถึง'"
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -981,189 +939,189 @@ msgstr ""
 "ขอบกระดาษใหญ่เกินไป\n"
 "กรุณาเลื่อกใหม่"
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr ""
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
 msgstr ""
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "ความปิดเครื่องพิมพ์"
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "ไมมีเครื่องพิมพ์ปกติ"
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "ไม่พบเครื่องพิมพ์"
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "ความจํา์หมด"
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "เกิดความปิดพลาด"
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "ไม่รู้จักดไร์เวอร์์เครื่องพิมพ์"
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 msgstr ""
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr ""
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr ""
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 #, fuzzy
 msgid "Save &in:"
 msgstr "บันทืกเป็น..."
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr ""
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 #, fuzzy
 msgid "Open File"
 msgstr "แฟ้ม"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "พร้อม"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "ชะลอ; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "ความปิด; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "กําลังจะลบ; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "กระดาษติด; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "กระดาษหมด; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr ""
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr ""
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "เครื่องพิมพ์ปิด; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr ""
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "ยุ่ง; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "กํมลังพิมพ์; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "ถาดเต็ม; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "ใช้ไม่ได้ตอนนี้; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "เครื่องพิมพ์รออยู่; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "กําลังทํางาน; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "กํมลังะเร็ม; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "กํมลังะพรอม; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "หมึกจะหมด; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "หมึกหมดแล้ว; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "ผู้ใช้ยกเลิก; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "ความจําเครื่องพิมพ์หมด; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "ประตูเครื่องพิมพ์เปิด; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "ไม่รู้จักเสอร์เวอร์์; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "ใช้ไฟ้น้อย; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "เครื่องพิมพ์ปกติ; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "มี %d แฟ้มรออยู่"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "ขอบกระดาษ [นิ้ว]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "ขอบกระดาษ [มม.]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 #, fuzzy
 msgctxt "unit: millimeters"
 msgid "mm"
@@ -7852,6 +7810,16 @@ msgstr ""
 msgid "Date deleted"
 msgstr "ลบ\tDel"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "พื้นที่ทำงาน"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "เครื่องส่วนตัว"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -7881,6 +7849,10 @@ msgstr ""
 msgid "Start Menu\\Programs"
 msgstr ""
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "พื้นที่ส่วนตัว"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr ""
@@ -13225,6 +13197,10 @@ msgstr ""
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "ดัวอักษร"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 47b28f47d31..9bef1db95aa 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -55,8 +55,8 @@ msgstr "&Sil"
 msgid "Support Information"
 msgstr "Bilgi"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -140,10 +140,10 @@ msgid "&Install"
 msgstr "&Kur"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -293,11 +293,11 @@ msgstr "Kuruluyor..."
 msgid "Properties for %s"
 msgstr "%s Özellikleri"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Uygula"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Yardım"
 
@@ -330,9 +330,9 @@ msgstr "&Kapat"
 msgid "R&eset"
 msgstr "S&ıfırla"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -387,467 +387,420 @@ msgstr "Bugün:"
 msgid "Go to today"
 msgstr "Bugüne git"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Aç"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "Dosya &Adı:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Dizinler:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Listelenecek Dosya &Türleri:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "Sürü&cüler:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Salt Okunur"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Farklı Kaydet..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Farklı Kaydet"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Yazdır"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Yazıcı:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Aralığı yazdır"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Tümü"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "S&eçim"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Sayfalar"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "&Ayarla"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&Başlangıç:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "Biti&ÅŸ:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "Baskı &Kalitesi:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "D&osyaya Yaz"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "YoÄŸun"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Yazdırma Ayarları"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Yazıcı"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "&Öntanımlı Yazıcı"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[Hiçbiri]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Özel &Yazıcı"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Hizalama"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "Po&rtre"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Yatay"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Kağıt"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "Bo&yut"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Kaynak"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Yazı Tipi"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Yazı Tipi:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "Yazı Tipi St&ili:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "Boyut:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Efektler"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Üstü Çizili"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Altı Çizili"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "Renk:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Örnek"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbĞğŞş"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Bet&ik:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Renk"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Temel Renkler:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Özel Renkler:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Renk |  Kat&ı"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Kırmızı:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&YeÅŸil:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Mavi:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Hue:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Sat:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Lum:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Özel Renklere Ekle"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Özel Renkleri Tanımla >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Bul"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "Ara&nan:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Yalnızca &Tam Sözcükleri Bul"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "BÜYÜK/küçük Harf &Duyarlı"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Yön"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Yukarı"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "A&şağı"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Sonrakini Bul"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "DeÄŸiÅŸtir"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "&Yeni DeÄŸer:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&DeÄŸiÅŸtir"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Tü&münü Değiştir"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "D&osyaya Yaz"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Özellikler"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Ad:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Durum:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Tür:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Konum:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Açıklama:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Kopyalar"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "&Kopya sayısı:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "&Harmanla"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "Sa&yfalar"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Seçim"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&Başlangıç:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "Biti&ÅŸ:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Size:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Kaynak:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "P&ortre"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "M&anzara"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Sayfa Ayarları"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "&Tepsi:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Düşey"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Kenarlıklar"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "S&ol:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "S&aÄŸ:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&Ãœst:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "A&lt:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "Ya&zıcı..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "Bak&:"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "D&osya adı:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Dosya &türü:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Salt-okunu&r aç"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Aç"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Dosya adı:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "Dosya &türü:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&Dizin Seçme Denemesi Hakkında"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Belge Dizinleri"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Belgelerim"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Sık Kullanılanlar"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Sistem Yolu"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Masaüstü"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-#, fuzzy
-msgid "Fonts"
-msgstr ""
-"#-#-#-#-#  tr.po (Wine)  #-#-#-#-#\n"
-"Fonts\n"
-"#-#-#-#-#  tr.po (Wine)  #-#-#-#-#\n"
-"Yazı Tipleri"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Bilgisayarım"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Sistem Dizinleri"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Yerel Diskler"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Dosya bulunamadı"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Doğru dosya adı verildiğinden emin olun"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -855,7 +808,7 @@ msgstr ""
 "Dosya mevcut deÄŸil\n"
 "Dosyayı oluşturmak ister misiniz?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -863,11 +816,11 @@ msgstr ""
 "Dosya zaten var.\n"
 "DeÄŸiÅŸtirmek ister misiniz?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Dosya yolunda geçersiz karakter(ler)"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -875,119 +828,119 @@ msgstr ""
 "Bir dosya adı aşağıdaki karakterleri içeremez:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Dosya yolu mevcut deÄŸil"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Dosya mevcut deÄŸil"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Bir Düzey Yukarı"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Yeni Dizin OluÅŸtur"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Liste"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Ayrıntılar"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Masaüstüne Git"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Siyah"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Koyu Kırmızı"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "YeÅŸil"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Koyu Sarı"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Koyu Mavi"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Mor"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Deniz Mavisi"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Gri"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Gümüş"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Kırmızı"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Parlak YeÅŸil"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Sarı"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Mavi"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Pembe"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Turkuaz"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Beyaz"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Okunamayan GiriÅŸ"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -996,11 +949,11 @@ msgstr ""
 "Bu değer sayfa aralığında değil.\n"
 "Lütfen %d ve %d değerleri arasında bir değer girin."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "'Başlangıç' değeri 'Bitiş' değerini geçemez."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1008,12 +961,12 @@ msgstr ""
 "Kenarlıklar örtüşüyor ya da kağıt sınırlarının dışına çıkıyor.\n"
 "Lütfen kenarlıkları yeniden girin."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "'Kopya sayısı' değeri boş olamaz."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1021,31 +974,31 @@ msgstr ""
 "Bu kadar büyük sayıda kopya yazınız tarafından desteklenmiyor.\n"
 "Lütffen 1 ile %d arasında bir değer girin."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Bir yazıcı hatası oluştu."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Öntanımlı yazıcı tanımlanmamış."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Yazıcı bulunamıyor."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Bellek dolu."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Bir hata oluÅŸtu."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Bilinmeyen yazıcı sürücüsü."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1053,148 +1006,148 @@ msgstr ""
 "Sayfa ayarı veya belge yazdırmak gibi yazıcıyla ilgili işlemlerden önce bir "
 "yazıcı sürücüsü kurmalısınız. Lütfen bir tane kurun ve yeniden deneyin."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "%d ile %d arasında bir yazı tipi boyutu seçin."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Kaydet"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Kayıt &Yeri:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Kaydet"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Dosya Aç"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Hazır"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Durakladı; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Hata; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Silme bekleniyor; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr ""
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Kağıt yok; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr ""
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Kağıt sorunu; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Yazıcı çevrimdışı; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "G/Ç Etkin; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "MeÅŸgul; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Yazıyor; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Çıkış tepsisi doldu; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Kullanılabilir değil; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Bekliyor; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Ä°lerliyor; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Hazırlanıyor; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr ""
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr ""
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr ""
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Kullanıcı tarafından iptal edildi; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Bellek dolu; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Yazıcı kapısı açık; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Yazıcı sunucusu bilinmiyor; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Güç koruma modu; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Öntanımlı yazıcı; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "Kuyrukta %d belge var"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Kenarlıklar [inç]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Kenarlıklar [mm]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 #, fuzzy
 msgctxt "unit: millimeters"
 msgid "mm"
@@ -8146,6 +8099,16 @@ msgstr "Özgün konum"
 msgid "Date deleted"
 msgstr "Silinme tarihi"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Masaüstü"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Bilgisayarım"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -8174,6 +8137,10 @@ msgstr "Wine oturumunuzu kapatmak istediÄŸinizden emin misiniz?"
 msgid "Start Menu\\Programs"
 msgstr "Start Menu\\Programlar"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Belgelerim"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Sık Kullanılanlar"
@@ -13957,6 +13924,15 @@ msgstr "&Tanımla..."
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+#, fuzzy
+msgid "Fonts"
+msgstr ""
+"#-#-#-#-#  tr.po (Wine)  #-#-#-#-#\n"
+"Fonts\n"
+"#-#-#-#-#  tr.po (Wine)  #-#-#-#-#\n"
+"Yazı Tipleri"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 8dd591f9014..55c96111ffe 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -55,8 +55,8 @@ msgstr "&Видалити"
 msgid "Support Information"
 msgstr "Дані підтримки"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -136,10 +136,10 @@ msgid "&Install"
 msgstr "&Встановити"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -286,11 +286,11 @@ msgstr "Скасування..."
 msgid "Properties for %s"
 msgstr "Властивості для %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Застосувати"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "&Довідка"
 
@@ -323,9 +323,9 @@ msgstr "За&крити"
 msgid "R&eset"
 msgstr "&Скинути"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -379,462 +379,420 @@ msgstr "Сьогодні:"
 msgid "Go to today"
 msgstr "Поточна дата"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Відкрити"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "&Ім'я файлу:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Теки:"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Показувати файли &типу:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Диски:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "&Лише для читання"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Зберегти як..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "Зберегти як"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Друк"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Принтер:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "Друкувати"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Все"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "В&иділення"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&Сторінки"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "Властивості"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&з:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&до:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&Якість друку:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Друк до файлу"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Стисло"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Параметри друку"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Принтер"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "Принтер за &обумовленням"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[Нема]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "&Інший принтер"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Орієнтація"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "&Книжкова"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "&Альбомна"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Папір"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "Ро&змір"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "&Джерело"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Шрифт"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Шрифт:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "&Стиль:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Розмір:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Атрибути"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Закреслений"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Підкреслений"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Колір:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "&Зразок"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "АаБбAaBb"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Група символ&ів:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Зміна кольору"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Базова палітра:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "Д&одаткові кольори:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Колір|За&ливка"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Черв:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Зелен:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "С&иній:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "Від&тінок:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Контраст:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Яскравість:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "&Додати до набору"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Визначити колір >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Знайти"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "&Зразок:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "&Лише слово цілком"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "Враховувати &реґістр"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Напрям"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "В&верх"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "В&низ"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "З&найти далі"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Заміна"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "З&амінити на:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Замінити"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Замінити &все"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "Друк у фай&л"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "В&ластивості"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "&Ім'я:"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "Статус:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "Тип:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "Місце:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "Примітка:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "Копії"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "Кількість &копій:"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "&Розбити"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "&Сторінки"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "&Виділення"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "&від:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "&до:"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "Ро&змір:"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "&Джерело:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "&Книжкова"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "&Альбомна"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "Параметри сторінки"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "Ло&ток:"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "&Книжкова"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "Поля"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "&Ліве:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Праве:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "&Верхнє:"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Нижнє:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "П&ринтер..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "Шукати &в"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "Ім'я &файлу:"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "Файли &типу"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "Лише для &читання"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Відкрити"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Ім'я файлу:"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "Файли &типу"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "&Про тест ВибірТеки"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "Теки документів"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "Мої документи"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "Закладки"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "Системний шлях"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "Робочий стіл"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "Шрифти"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "Мій Комп'ютер"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "Системні теки"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "Локальні жорсткі диски"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "Файл не знайдено"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "Перевірте, чи правильно вказано ім'я файлу"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -842,7 +800,7 @@ msgstr ""
 "Файл не існує\n"
 "Чи хочете Ви його створити?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -850,11 +808,11 @@ msgstr ""
 "Файл уже існує.\n"
 "Замінити його?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "Невірний символ в записі шляху"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -862,119 +820,119 @@ msgstr ""
 "Ім'я файлу не може містити наступні символи:\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "Шлях не існує"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "Файл не існує"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "Вгору на один рівень"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "Створити нову теку"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "Список"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "Подробиці"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "Перехід на Робочий стіл"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "Нормальний"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "Жирний"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "Курсив"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "Жирний курсив"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "Чорний"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "Коричневий"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "Зелений"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "Оливковий"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "Темно-синій"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "Пурпуровий"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "Синьо-зелений"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "Сірий"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "Сріблястий"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "Червоний"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "Салатовий"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "Жовтий"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "Синій"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "Малиновий"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "Блакитний"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "Білий"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "Нечитаємий елемент"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -983,11 +941,11 @@ msgstr ""
 "Це значення не лежить у діапазоні сторінок.\n"
 "Введіть значення між %d та %d."
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "Значення ВІД не повинно перевищувати ДО."
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -995,11 +953,11 @@ msgstr ""
 "Межі перекривають чи перевищують розміри паперу.\n"
 "Введіть їх наново."
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "Поле 'Кількість копій' не може бути порожнім."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1007,31 +965,31 @@ msgstr ""
 "Така велика кількість копій не може бути надрукована Вашим принтером.\n"
 "Введіть значення між 1 та %d."
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "Виникла помилка принтера."
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "Немає принтера, поставленого за обумовленням."
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "Не вдалось знайти принтер."
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr "Замало пам'яті."
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "Виникла помилка."
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "Невідомий драйвер принтера."
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1039,148 +997,148 @@ msgstr ""
 "Перед запуском таких дій як налаштування сторінки чи друкування вам треба "
 "встановити принтер. Встановіть принтер та спробуйте знов."
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "Биберіть шрифт розміром %d - %d пунктів."
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "&Зберегти"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "Зберегти &в:"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "Зберегти"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "Відкрити файл"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "Готово"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "Призупинено; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "Помилка; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "Чекання видалення; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "Папір застряг; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "Не вистачає паперу; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "Поставте папір вручну; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "Проблема с папером; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "Принтер в режимі offline; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "Ввід/Вивід активний; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "Зайнятий; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "Йде друк; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "Лоток переповнений папером; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "Не доступний; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "Очікування; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "Обробка; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "Готування; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "Прогрів; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "Тонер при кінці; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "Нема тонера; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "Перервано користувачем; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "Мало пам'яті; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "Кришка принтера відкрита; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "Невідомий сервер принтера; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "Живлення в безпечному режимі; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "Принтер за обумовленням; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "%d документів у черзі"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "Межі  [дюйми]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "Межі [мм]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "мм"
@@ -7860,6 +7818,16 @@ msgstr "Оригінальне розміщення"
 msgid "Date deleted"
 msgstr "Дата видалення"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "Робочий стіл"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "Мій Комп'ютер"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "Панель керування"
@@ -7888,6 +7856,10 @@ msgstr "Завершити сесію роботи Wine?"
 msgid "Start Menu\\Programs"
 msgstr "Головне меню\\Програми"
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "Мої документи"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Обране"
@@ -13669,6 +13641,10 @@ msgstr "&Задати..."
 msgid "History"
 msgstr "Історія"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "Шрифти"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "Малий"
diff --git a/po/wa.po b/po/wa.po
index c2a19bed909..55120a41632 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -55,8 +55,8 @@ msgstr "&Sicrîre..."
 msgid "Support Information"
 msgstr "Informåcion"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -133,10 +133,10 @@ msgid "&Install"
 msgstr "&Sicrîre..."
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -282,11 +282,11 @@ msgstr ""
 msgid "Properties for %s"
 msgstr "&Propietés"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "&Mete èn Oûve"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "Help"
 
@@ -320,9 +320,9 @@ msgstr ""
 msgid "R&eset"
 msgstr ""
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -378,809 +378,768 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "Drovî"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "&No do fitchî:"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "&Ridants"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "Djîveye des fitchîs del sôr&te:"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "&Plakes:"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "Rén ki &lere"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "Schaper èt rlomer..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "I Va"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "Rexhe"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "Sicrirece:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 #, fuzzy
 msgid "Print range"
 msgstr "Cwé rexhe"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "&Tot"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "Tch&wezî"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "&PÃ¥djes"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "Apon&tiaedje"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "&Di:"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "&A:"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "&Cwalité po rexhe:"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "Rexhe sol &fitchî"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "Streu scrijhas"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "Apontiaedje del rexhe"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "Sicrirece"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "Sicrirece tchwezi por &vos"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[nole]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "Sicrirece &specifike"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "Orientation"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "D' &Astampé"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "Di &Coûtchî"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "Papî"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "&Grandeu"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "Ali&mentåcion"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "Fontes"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "&Fonte:"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "S&tîle del fonte:"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "&Grandeu:"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "Efets"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "&Barré"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "&Sorligné"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "&Coleur:"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "Egzimpe"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZzÅåÇçÛû"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "Scr&ipt (translate):"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "Coleurs"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "&Maisse coleurs:"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "&Coleurs da vosse:"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "Coleur | &Uni"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "&Rodje:"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "&Vert:"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "&Bleu:"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "&Tinte:"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "&Sat.:"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "&Lum.:"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "Rad&jouter des coleur da vosse"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "&Defini les coleurs da vosse >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "Cwerî"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "C&werî:"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "Mots &etîrs seulmint"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "Rispecter les &madjuscules/minuscules"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "Direccion"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "&Copete"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "&Bas"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "&Shûvant"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "Mete el plaece"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "Mete el &place:"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "&Rimplacer"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "Rimplacer &tot"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 #, fuzzy
 msgid "Print to fi&le"
 msgstr "Rexhe sol &fitchî"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "&Propietés"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr ""
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr ""
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr ""
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr ""
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 #, fuzzy
 msgid "Comment:"
 msgstr "Ã…&dvins"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr ""
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr ""
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr ""
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr ""
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 #, fuzzy
 msgid "&Selection"
 msgstr "Tch&wezî"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 #, fuzzy
 msgid "&from:"
 msgstr "&Di:"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr ""
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr ""
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 #, fuzzy
 msgid "&Source:"
 msgstr "Ali&mentåcion"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 #, fuzzy
 msgid "P&ortrait"
 msgstr "D' &Astampé"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 #, fuzzy
 msgid "L&andscape"
 msgstr "Di &Coûtchî"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 #, fuzzy
 msgid "Setup Page"
 msgstr "Apon&tiaedje"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr ""
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr ""
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr ""
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 #, fuzzy
 msgid "L&eft:"
 msgstr "&Hintche:"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "&Droete:"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr ""
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "&Bas:"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 #, fuzzy
 msgid "P&rinter..."
 msgstr "&Rexhe"
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr ""
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 #, fuzzy
 msgid "File &name:"
 msgstr "&Fitchî"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 #, fuzzy
 msgid "Files of &type:"
 msgstr "Djîveye des fitchîs del sôr&te:"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr ""
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "&Drovî..."
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "&Fitchî"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "Djîveye des fitchîs del sôr&te:"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr ""
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr ""
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr ""
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr ""
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr ""
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr ""
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr ""
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr ""
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr ""
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr ""
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr ""
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr ""
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
 msgstr ""
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr ""
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
 msgstr ""
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr ""
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr ""
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr ""
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr ""
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr ""
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr ""
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr ""
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr ""
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr ""
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr ""
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr ""
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr ""
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr ""
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr ""
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr ""
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr ""
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr ""
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr ""
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr ""
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr ""
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr ""
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr ""
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr ""
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr ""
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
 msgstr ""
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr ""
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
 msgstr ""
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr ""
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
 msgstr ""
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr ""
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr ""
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr ""
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr ""
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr ""
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr ""
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 msgstr ""
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr ""
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr ""
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 #, fuzzy
 msgid "Save &in:"
 msgstr "Schaper èt r&lomer..."
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr ""
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 #, fuzzy
 msgid "Open File"
 msgstr "Aidance di Wine"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr ""
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr ""
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr ""
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr ""
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr ""
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr ""
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr ""
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr ""
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 #, fuzzy
 msgid "Printer offline; "
 msgstr "Fitchîs tekse (*.txt)"
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr ""
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr ""
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 #, fuzzy
 msgid "Printing; "
 msgstr "&Rexhe"
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr ""
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr ""
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr ""
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr ""
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr ""
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr ""
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr ""
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr ""
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 #, fuzzy
 msgid "Page punt; "
 msgstr "PÃ¥dje &p"
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr ""
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr ""
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr ""
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr ""
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr ""
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr ""
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr ""
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr ""
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr ""
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr ""
@@ -7820,6 +7779,15 @@ msgstr ""
 msgid "Date deleted"
 msgstr "&Rafacer\tDel"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr ""
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr ""
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -7848,6 +7816,10 @@ msgstr ""
 msgid "Start Menu\\Programs"
 msgstr ""
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr ""
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr ""
@@ -13187,6 +13159,10 @@ msgstr "&Defini..."
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr ""
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/wine.pot b/po/wine.pot
index e8e6d4641d2..07616c8fc9b 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -48,8 +48,8 @@ msgstr ""
 msgid "Support Information"
 msgstr ""
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -122,10 +122,10 @@ msgid "&Install"
 msgstr ""
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -268,11 +268,11 @@ msgstr ""
 msgid "Properties for %s"
 msgstr ""
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr ""
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr ""
 
@@ -305,9 +305,9 @@ msgstr ""
 msgid "R&eset"
 msgstr ""
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -361,789 +361,748 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr ""
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr ""
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr ""
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr ""
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr ""
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr ""
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr ""
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr ""
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr ""
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr ""
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr ""
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr ""
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr ""
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr ""
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr ""
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr ""
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr ""
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr ""
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr ""
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr ""
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr ""
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr ""
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr ""
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr ""
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr ""
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr ""
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr ""
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr ""
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr ""
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr ""
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr ""
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr ""
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr ""
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr ""
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr ""
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr ""
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr ""
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr ""
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr ""
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr ""
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr ""
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr ""
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr ""
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr ""
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr ""
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr ""
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr ""
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr ""
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr ""
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr ""
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr ""
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr ""
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr ""
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr ""
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr ""
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr ""
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr ""
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr ""
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr ""
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr ""
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr ""
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr ""
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr ""
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr ""
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr ""
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr ""
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr ""
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr ""
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr ""
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr ""
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr ""
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr ""
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr ""
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr ""
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr ""
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr ""
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr ""
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr ""
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr ""
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr ""
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr ""
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr ""
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr ""
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr ""
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr ""
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr ""
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr ""
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr ""
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr ""
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr ""
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr ""
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr ""
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr ""
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr ""
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr ""
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr ""
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr ""
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 msgid "File name:"
 msgstr ""
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 msgid "Files of type:"
 msgstr ""
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr ""
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr ""
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr ""
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr ""
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr ""
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-msgctxt "display name"
-msgid "Desktop"
-msgstr ""
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr ""
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr ""
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr ""
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr ""
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr ""
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr ""
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
 msgstr ""
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr ""
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
 msgstr ""
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr ""
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr ""
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr ""
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr ""
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr ""
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr ""
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr ""
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr ""
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr ""
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr ""
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr ""
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr ""
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr ""
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr ""
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr ""
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr ""
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr ""
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr ""
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr ""
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr ""
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr ""
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr ""
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr ""
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr ""
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 msgid ""
 "This value does not lie within the page range.\n"
 "Please enter a value between %1!d! and %2!d!."
 msgstr ""
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr ""
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
 msgstr ""
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 msgid "The 'Number of copies' field cannot be empty."
 msgstr ""
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
 msgstr ""
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr ""
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr ""
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr ""
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 msgid "Out of memory."
 msgstr ""
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr ""
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr ""
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 msgstr ""
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr ""
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr ""
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr ""
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr ""
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr ""
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr ""
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr ""
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr ""
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr ""
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr ""
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr ""
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr ""
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr ""
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr ""
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr ""
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr ""
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr ""
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr ""
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr ""
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr ""
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr ""
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr ""
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr ""
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr ""
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr ""
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr ""
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr ""
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr ""
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr ""
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr ""
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr ""
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr ""
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr ""
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr ""
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr ""
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr ""
@@ -7670,6 +7629,15 @@ msgstr ""
 msgid "Date deleted"
 msgstr ""
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+msgctxt "display name"
+msgid "Desktop"
+msgstr ""
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr ""
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr ""
@@ -7698,6 +7666,10 @@ msgstr ""
 msgid "Start Menu\\Programs"
 msgstr ""
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr ""
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr ""
@@ -12926,6 +12898,10 @@ msgstr ""
 msgid "History"
 msgstr ""
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr ""
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0d07e06738a..5db25f54924 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -51,8 +51,8 @@ msgstr "删除(&R)"
 msgid "Support Information"
 msgstr "技术支持信息"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -129,10 +129,10 @@ msgid "&Install"
 msgstr "安装(&I)"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -276,11 +276,11 @@ msgstr "正在取消..."
 msgid "Properties for %s"
 msgstr "属性 %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "应用(&A)"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "帮助"
 
@@ -313,9 +313,9 @@ msgstr "关闭(&C)"
 msgid "R&eset"
 msgstr "重置(&e)"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -374,467 +374,420 @@ msgstr "今天:"
 msgid "Go to today"
 msgstr "转到今天"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "打开"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "文件名(&N):"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "文件夹(&D):"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "文件类型(&T):"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "驱动器(&V):"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "只读(&R)"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "另存为..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "另存为"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "打印"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 msgid "Printer:"
 msgstr "打印机:"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 msgid "Print range"
 msgstr "打印范围"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "全部(&A)"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 msgid "S&election"
 msgstr "选中的范围(&E)"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 msgid "&Pages"
 msgstr "页数(&G)"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 msgid "&Setup"
 msgstr "设置(&S)"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr "从(&F):"
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr "到(&T):"
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 msgid "Print &Quality:"
 msgstr "打印质量(&Q):"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 msgid "Print to Fi&le"
 msgstr "打印到文件(&L):"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr "压小"
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 msgid "Print Setup"
 msgstr "打印设置"
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 msgid "Printer"
 msgstr "打印机"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 msgid "&Default Printer"
 msgstr "默认打印机(&D)"
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr "[æ— ]"
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr "指定的打印机(&P)"
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "方向"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 msgid "Po&rtrait"
 msgstr "纵向(&P)"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "横向(&L)"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "纸张"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 msgid "Si&ze"
 msgstr "纸张大小(&Z)"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 msgid "&Source"
 msgstr "纸张来源(&S)"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "字体"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "字体(&F):"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "字体样式(&Y):"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "大小(&S):"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "效果"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "删除线(&K)"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "下划线(&U)"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "配色(&C):"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "示例"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "中文字体 AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "书写系统(&I):"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "颜色"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "基本颜色(&B):"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "自定义颜色(&C):"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "颜色|纯色(&O)"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "红(&R):"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "绿(&G):"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "蓝(&B):"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "色调(&E):"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "饱和度(&S):"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "亮度(&L):"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "添加到自定义颜色(&A)"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "定义自定义颜色(&D) >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "查找"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "查找(&N):"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "全字匹配(&W)"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "区分大小写(&C)"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "方向"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "上(&U)"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "下(&D)"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "找下一个(&F)"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "替换"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "替换为(&P):"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "替换(&R)"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "全部替换(&A)"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 msgid "Print to fi&le"
 msgstr "打印到文件(&L)"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "属性(&P)"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "名称(&N):"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 msgid "Status:"
 msgstr "状态:"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 msgid "Type:"
 msgstr "型号:"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr "位置:"
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 msgid "Comment:"
 msgstr "备注:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr "份数"
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr "份数(&C):"
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr "逐份打印(&O)"
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr "页数(&G)"
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 msgid "&Selection"
 msgstr "选中的范围(&S)"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr "从(&F):"
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr "到(&T):"
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "大小(&Z):"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 msgid "&Source:"
 msgstr "纸张来源(&S):"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 msgid "P&ortrait"
 msgstr "纵向(&P)"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 msgid "L&andscape"
 msgstr "横向(&L)"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr "页面设置"
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr "托盘(&T):"
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "纵向(&P)"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 msgid "Borders"
 msgstr "边距"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 msgid "L&eft:"
 msgstr "左(&E):"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "右(&R):"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr "上(&O):"
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "下(&B):"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 msgid "P&rinter..."
 msgstr "打印机(&P)..."
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "浏览(&I)"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "文件名(&N):"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "文件类型(&T)"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "以只读方式打开(&R)"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "打开(&O)"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "文件名(&F):"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "文件类型(&T)"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "关于文件夹选择器测试(&A)"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "文档文件夹"
-
-#: comdlg32.rc:31 shell32.rc:200
-#, fuzzy
-msgid "My Documents"
-msgstr ""
-"#-#-#-#-#  zh_CN.po (Wine)  #-#-#-#-#\n"
-"My Documents\n"
-"#-#-#-#-#  zh_CN.po (Wine)  #-#-#-#-#\n"
-"我的文档"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "收藏夹"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "系统路径"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "桌面"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "字体"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "我的电脑"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "系统文件夹"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "本地硬盘驱动器"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "找不到文件"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "请检验是否给予正确的文件名称。"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -842,7 +795,7 @@ msgstr ""
 "文件不存在。\n"
 "是否创建新文件?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -850,11 +803,11 @@ msgstr ""
 "文件已经存在。\n"
 "是否替换?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "路径中包含无效字符"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -862,119 +815,119 @@ msgstr ""
 "文件名中不能包含任何以下字符::\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "路径不存在"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "文件不存在"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "向上移一层"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "新建文件夹"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "列表"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "详细资料"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "查看桌面"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr "常规"
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr "粗体"
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr "斜体"
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr "粗斜体"
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr "黑色"
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr "栗色"
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr "绿色"
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr "橄榄色"
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr "藏青"
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr "紫色"
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr "鸭翅绿"
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr "灰色"
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr "银色"
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 msgid "Red"
 msgstr "红色"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr "青柠色"
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr "黄色"
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr "蓝色"
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr "洋红"
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr "水绿"
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr "白色"
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "数值不可读"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -983,11 +936,11 @@ msgstr ""
 "这个值不在页数范围内。\n"
 " 请输入一个 %d 和 %d 之间的数。"
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "“从”项的值不能大于“到”项的值。"
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -995,12 +948,12 @@ msgstr ""
 "页边距重叠或落于纸外。\n"
 "请重新输入页边距。"
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "“份数”项不能空。"
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1008,19 +961,19 @@ msgstr ""
 "你的打印机不支持这么大的份数。\n"
 " 请输入一个 1 和 %d 之间的数。"
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "打印机错误。"
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "没有默认打印机。"
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "找不到打印机。"
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 #, fuzzy
 msgid "Out of memory."
 msgstr ""
@@ -1029,162 +982,162 @@ msgstr ""
 "#-#-#-#-#  zh_CN.po (Wine)  #-#-#-#-#\n"
 "内存不够。"
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "出现了错误。"
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "找不到打印机驱动程序。"
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
 msgstr "在安装打印机后才能使用和打印机相关的功能。请安装后再试。"
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 #, fuzzy
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr "选择 %d 到 %d 之间的字号。"
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr "保存(&S)"
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 msgid "Save &in:"
 msgstr "保存在(&I):"
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 msgid "Save"
 msgstr "保存"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 msgid "Open File"
 msgstr "打开文件"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "待命"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "暂停; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "错误; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "等待删除; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "卡纸; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "缺纸; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "手动进纸; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "纸的问题; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "打印机离线; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "I/O 活动; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "繁忙; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "正在打印; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "出纸托盘已满; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "不可用; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "等待; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "正在处理; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "正在启动; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "预热; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "墨量低; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "缺墨; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "页内存超支; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "用户中断; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "内存不够; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "打印机盖是打开的; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "未知的打印服务器; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "省电状态; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "默认打印机; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "有 %d 个文档正在等待打印"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "页边距 [英寸]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "页边距 [毫米]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "毫米"
@@ -8067,6 +8020,16 @@ msgstr "原位置"
 msgid "Date deleted"
 msgstr "删除日期"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "桌面"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "我的电脑"
+
 #: shell32.rc:156
 msgid "Control Panel"
 msgstr "控制面板"
@@ -8095,6 +8058,15 @@ msgstr "要关闭 Wine 会话吗?"
 msgid "Start Menu\\Programs"
 msgstr "Start Menu\\Programs"
 
+#: shell32.rc:200
+#, fuzzy
+msgid "My Documents"
+msgstr ""
+"#-#-#-#-#  zh_CN.po (Wine)  #-#-#-#-#\n"
+"My Documents\n"
+"#-#-#-#-#  zh_CN.po (Wine)  #-#-#-#-#\n"
+"我的文档"
+
 #: shell32.rc:201
 msgid "Favorites"
 msgstr "Favorites"
@@ -13552,6 +13524,10 @@ msgstr "定义(&D)..."
 msgid "History"
 msgstr "历史"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "字体"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "小号"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c641d298042..e9746413627 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -51,8 +51,8 @@ msgstr "刪除(&R)"
 msgid "Support Information"
 msgstr "技術支援資訊"
 
-#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:240 comdlg32.rc:270
-#: comdlg32.rc:313 comdlg32.rc:367 comdlg32.rc:406 comdlg32.rc:460
+#: appwiz.rc:75 avifil32.rc:51 comctl32.rc:52 comdlg32.rc:226 comdlg32.rc:256
+#: comdlg32.rc:299 comdlg32.rc:353 comdlg32.rc:392 comdlg32.rc:446
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
@@ -128,10 +128,10 @@ msgid "&Install"
 msgstr "安裝(&I)"
 
 #: appwiz.rc:107 avifil32.rc:52 browseui.rc:37 comctl32.rc:53 comctl32.rc:68
-#: comdlg32.rc:179 comdlg32.rc:201 comdlg32.rc:219 comdlg32.rc:241
-#: comdlg32.rc:271 comdlg32.rc:314 comdlg32.rc:336 comdlg32.rc:356
-#: comdlg32.rc:368 comdlg32.rc:407 comdlg32.rc:461 comdlg32.rc:485
-#: comdlg32.rc:503 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
+#: comdlg32.rc:165 comdlg32.rc:187 comdlg32.rc:205 comdlg32.rc:227
+#: comdlg32.rc:257 comdlg32.rc:300 comdlg32.rc:322 comdlg32.rc:342
+#: comdlg32.rc:354 comdlg32.rc:393 comdlg32.rc:447 comdlg32.rc:471
+#: comdlg32.rc:489 credui.rc:50 cryptui.rc:261 cryptui.rc:273 cryptui.rc:363
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
@@ -274,11 +274,11 @@ msgstr "正在取消..."
 msgid "Properties for %s"
 msgstr "屬性 %s"
 
-#: comctl32.rc:54 comdlg32.rc:272
+#: comctl32.rc:54 comdlg32.rc:258
 msgid "&Apply"
 msgstr "套用(&A)"
 
-#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:315 user32.rc:86
+#: comctl32.rc:55 comctl32.rc:69 comdlg32.rc:301 user32.rc:86
 msgid "Help"
 msgstr "幫助"
 
@@ -311,9 +311,9 @@ msgstr "關閉(&C)"
 msgid "R&eset"
 msgstr "重置(&e)"
 
-#: comctl32.rc:83 comdlg32.rc:180 comdlg32.rc:202 comdlg32.rc:273
-#: comdlg32.rc:337 comdlg32.rc:357 comdlg32.rc:369 comdlg32.rc:486
-#: comdlg32.rc:504 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
+#: comctl32.rc:83 comdlg32.rc:166 comdlg32.rc:188 comdlg32.rc:259
+#: comdlg32.rc:323 comdlg32.rc:343 comdlg32.rc:355 comdlg32.rc:472
+#: comdlg32.rc:490 ieframe.rc:55 msacm32.rc:49 oledlg.rc:89 shell32.rc:125
 #: clock.rc:41 notepad.rc:57 notepad.rc:116 oleview.rc:69 progman.rc:52
 #: progman.rc:105 progman.rc:123 progman.rc:141 progman.rc:157 progman.rc:181
 #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:85
@@ -372,486 +372,444 @@ msgstr "今天:"
 msgid "Go to today"
 msgstr "轉到今天"
 
-#: comdlg32.rc:165 comdlg32.rc:178 comdlg32.rc:467 comdlg32.rc:492
+#: comdlg32.rc:151 comdlg32.rc:164 comdlg32.rc:453 comdlg32.rc:478
 #: shell32.rc:164 oleview.rc:99
 msgid "Open"
 msgstr "é–‹å•Ÿ"
 
-#: comdlg32.rc:168 comdlg32.rc:190
+#: comdlg32.rc:154 comdlg32.rc:176
 msgid "File &Name:"
 msgstr "檔案名稱(&N):"
 
-#: comdlg32.rc:171 comdlg32.rc:193
+#: comdlg32.rc:157 comdlg32.rc:179
 msgid "&Directories:"
 msgstr "目錄(&D):"
 
-#: comdlg32.rc:174 comdlg32.rc:196
+#: comdlg32.rc:160 comdlg32.rc:182
 msgid "List Files of &Type:"
 msgstr "檔案類型(&T):"
 
-#: comdlg32.rc:176 comdlg32.rc:198
+#: comdlg32.rc:162 comdlg32.rc:184
 msgid "Dri&ves:"
 msgstr "磁碟機(&V):"
 
-#: comdlg32.rc:181 comdlg32.rc:203 winefile.rc:179
+#: comdlg32.rc:167 comdlg32.rc:189 winefile.rc:179
 msgid "&Read Only"
 msgstr "唯讀(&R)"
 
-#: comdlg32.rc:187
+#: comdlg32.rc:173
 msgid "Save As..."
 msgstr "另存新檔..."
 
-#: comdlg32.rc:200 comdlg32.rc:155
+#: comdlg32.rc:186 comdlg32.rc:141
 msgid "Save As"
 msgstr "另存新檔"
 
-#: comdlg32.rc:209 comdlg32.rc:218 comdlg32.rc:364 comdlg32.rc:64 hhctrl.rc:46
+#: comdlg32.rc:195 comdlg32.rc:204 comdlg32.rc:350 comdlg32.rc:50 hhctrl.rc:46
 #: wordpad.rc:162
 msgid "Print"
 msgstr "列印"
 
-#: comdlg32.rc:212
+#: comdlg32.rc:198
 #, fuzzy
 msgid "Printer:"
 msgstr "列印"
 
-#: comdlg32.rc:214 comdlg32.rc:391
+#: comdlg32.rc:200 comdlg32.rc:377
 #, fuzzy
 msgid "Print range"
 msgstr "列印目標(&P)"
 
-#: comdlg32.rc:215 comdlg32.rc:392 regedit.rc:216
+#: comdlg32.rc:201 comdlg32.rc:378 regedit.rc:216
 msgid "&All"
 msgstr "全部(&A)"
 
-#: comdlg32.rc:216
+#: comdlg32.rc:202
 #, fuzzy
 msgid "S&election"
 msgstr "選择區文字"
 
-#: comdlg32.rc:217
+#: comdlg32.rc:203
 #, fuzzy
 msgid "&Pages"
 msgstr "向上翻頁"
 
-#: comdlg32.rc:220 comdlg32.rc:242
+#: comdlg32.rc:206 comdlg32.rc:228
 #, fuzzy
 msgid "&Setup"
 msgstr "版面設定"
 
-#: comdlg32.rc:221
+#: comdlg32.rc:207
 msgid "&From:"
 msgstr ""
 
-#: comdlg32.rc:222
+#: comdlg32.rc:208
 msgid "&To:"
 msgstr ""
 
-#: comdlg32.rc:223
+#: comdlg32.rc:209
 #, fuzzy
 msgid "Print &Quality:"
 msgstr "壓縮質量(&Q):"
 
-#: comdlg32.rc:225
+#: comdlg32.rc:211
 #, fuzzy
 msgid "Print to Fi&le"
 msgstr "列印到檔案"
 
-#: comdlg32.rc:226
+#: comdlg32.rc:212
 msgid "Condensed"
 msgstr ""
 
-#: comdlg32.rc:232 comdlg32.rc:403
+#: comdlg32.rc:218 comdlg32.rc:389
 #, fuzzy
 msgid "Print Setup"
 msgstr "列印設定(&R)..."
 
-#: comdlg32.rc:235 comdlg32.rc:371 comdlg32.rc:410
+#: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396
 #, fuzzy
 msgid "Printer"
 msgstr "列印"
 
-#: comdlg32.rc:236
+#: comdlg32.rc:222
 #, fuzzy
 msgid "&Default Printer"
 msgstr "默認印表機; "
 
-#: comdlg32.rc:237
+#: comdlg32.rc:223
 msgid "[none]"
 msgstr ""
 
-#: comdlg32.rc:238
+#: comdlg32.rc:224
 msgid "Specific &Printer"
 msgstr ""
 
-#: comdlg32.rc:243 comdlg32.rc:429 comdlg32.rc:448 wineps.rc:31
+#: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31
 msgid "Orientation"
 msgstr "方向"
 
-#: comdlg32.rc:244
+#: comdlg32.rc:230
 #, fuzzy
 msgid "Po&rtrait"
 msgstr "縱向(&P)"
 
-#: comdlg32.rc:245 comdlg32.rc:450 wineps.rc:34
+#: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34
 msgid "&Landscape"
 msgstr "橫向(&L)"
 
-#: comdlg32.rc:248 comdlg32.rc:423 comdlg32.rc:443 wineps.rc:25
+#: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25
 msgid "Paper"
 msgstr "紙張"
 
-#: comdlg32.rc:249
+#: comdlg32.rc:235
 #, fuzzy
 msgid "Si&ze"
 msgstr "大小(&z):"
 
-#: comdlg32.rc:250
+#: comdlg32.rc:236
 #, fuzzy
 msgid "&Source"
 msgstr "原始檔案:"
 
-#: comdlg32.rc:258
+#: comdlg32.rc:244
 msgid "Font"
 msgstr "å­—åž‹"
 
-#: comdlg32.rc:261
+#: comdlg32.rc:247
 msgid "&Font:"
 msgstr "å­—åž‹(&F):"
 
-#: comdlg32.rc:264
+#: comdlg32.rc:250
 msgid "Font St&yle:"
 msgstr "字型樣式(&Y):"
 
-#: comdlg32.rc:267 comdlg32.rc:444 winecfg.rc:291
+#: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:291
 msgid "&Size:"
 msgstr "大小(&S):"
 
-#: comdlg32.rc:274
+#: comdlg32.rc:260
 msgid "Effects"
 msgstr "效果"
 
-#: comdlg32.rc:275
+#: comdlg32.rc:261
 msgid "Stri&keout"
 msgstr "刪除線(&K)"
 
-#: comdlg32.rc:276
+#: comdlg32.rc:262
 msgid "&Underline"
 msgstr "底線(&U)"
 
-#: comdlg32.rc:277 winecfg.rc:289
+#: comdlg32.rc:263 winecfg.rc:289
 msgid "&Color:"
 msgstr "配色(&C):"
 
-#: comdlg32.rc:280
+#: comdlg32.rc:266
 msgid "Sample"
 msgstr "範例"
 
-#: comdlg32.rc:281
+#: comdlg32.rc:267
 msgid "AaBbYyZz"
 msgstr "AaBbYyZz"
 
-#: comdlg32.rc:282
+#: comdlg32.rc:268
 msgid "Scr&ipt:"
 msgstr "语言:"
 
-#: comdlg32.rc:290
+#: comdlg32.rc:276
 msgid "Color"
 msgstr "色彩"
 
-#: comdlg32.rc:293
+#: comdlg32.rc:279
 msgid "&Basic Colors:"
 msgstr "基本色彩(&B):"
 
-#: comdlg32.rc:294
+#: comdlg32.rc:280
 msgid "&Custom Colors:"
 msgstr "自定色彩(&C):"
 
-#: comdlg32.rc:295 comdlg32.rc:318
+#: comdlg32.rc:281 comdlg32.rc:304
 msgid "Color |  Sol&id"
 msgstr "色彩 | 實心(&I)"
 
-#: comdlg32.rc:296
+#: comdlg32.rc:282
 msgid "&Red:"
 msgstr "ç´…(&R):"
 
-#: comdlg32.rc:298
+#: comdlg32.rc:284
 msgid "&Green:"
 msgstr "綠(&G):"
 
-#: comdlg32.rc:300
+#: comdlg32.rc:286
 msgid "&Blue:"
 msgstr "藍(&B):"
 
-#: comdlg32.rc:302
+#: comdlg32.rc:288
 msgid "&Hue:"
 msgstr "色調(&H):"
 
-#: comdlg32.rc:304
+#: comdlg32.rc:290
 msgid "&Sat:"
 msgstr "濃度(&S):"
 
-#: comdlg32.rc:306
+#: comdlg32.rc:292
 msgid "&Lum:"
 msgstr "亮度(&L):"
 
-#: comdlg32.rc:316
+#: comdlg32.rc:302
 msgid "&Add to Custom Colors"
 msgstr "新增自定色彩(&A)"
 
-#: comdlg32.rc:317
+#: comdlg32.rc:303
 msgid "&Define Custom Colors >>"
 msgstr "定義自定色彩(&D) >>"
 
-#: comdlg32.rc:324 regedit.rc:223 regedit.rc:233
+#: comdlg32.rc:310 regedit.rc:223 regedit.rc:233
 msgid "Find"
 msgstr "查找"
 
-#: comdlg32.rc:327 comdlg32.rc:346
+#: comdlg32.rc:313 comdlg32.rc:332
 msgid "Fi&nd What:"
 msgstr "搜尋目標(&N):"
 
-#: comdlg32.rc:329 comdlg32.rc:350
+#: comdlg32.rc:315 comdlg32.rc:336
 msgid "Match &Whole Word Only"
 msgstr "全字拼寫須符合(&W)"
 
-#: comdlg32.rc:330 comdlg32.rc:351
+#: comdlg32.rc:316 comdlg32.rc:337
 msgid "Match &Case"
 msgstr "大小寫視為相異(&C)"
 
-#: comdlg32.rc:331
+#: comdlg32.rc:317
 msgid "Direction"
 msgstr "方向"
 
-#: comdlg32.rc:332 view.rc:39
+#: comdlg32.rc:318 view.rc:39
 msgid "&Up"
 msgstr "上(&U)"
 
-#: comdlg32.rc:333 view.rc:40
+#: comdlg32.rc:319 view.rc:40
 msgid "&Down"
 msgstr "下(&D)"
 
-#: comdlg32.rc:335 comdlg32.rc:353
+#: comdlg32.rc:321 comdlg32.rc:339
 msgid "&Find Next"
 msgstr "找下一個(&F)"
 
-#: comdlg32.rc:343
+#: comdlg32.rc:329
 msgid "Replace"
 msgstr "取代"
 
-#: comdlg32.rc:348
+#: comdlg32.rc:334
 msgid "Re&place With:"
 msgstr "取代為(&P):"
 
-#: comdlg32.rc:354
+#: comdlg32.rc:340
 msgid "&Replace"
 msgstr "取代(&R)"
 
-#: comdlg32.rc:355
+#: comdlg32.rc:341
 msgid "Replace &All"
 msgstr "取代全部(&A)"
 
-#: comdlg32.rc:372
+#: comdlg32.rc:358
 #, fuzzy
 msgid "Print to fi&le"
 msgstr "列印到檔案"
 
-#: comdlg32.rc:373 comdlg32.rc:411 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
+#: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105
 #: clock.rc:28 wineconsole.rc:27
 msgid "&Properties"
 msgstr "屬性(&P)"
 
-#: comdlg32.rc:374 comdlg32.rc:412 msacm32.rc:31 winefile.rc:144
+#: comdlg32.rc:360 comdlg32.rc:398 msacm32.rc:31 winefile.rc:144
 msgid "&Name:"
 msgstr "名稱(&N):"
 
-#: comdlg32.rc:376 comdlg32.rc:414
+#: comdlg32.rc:362 comdlg32.rc:400
 #, fuzzy
 msgid "Status:"
 msgstr "狀態欄(&S)"
 
-#: comdlg32.rc:378 comdlg32.rc:416
+#: comdlg32.rc:364 comdlg32.rc:402
 #, fuzzy
 msgid "Type:"
 msgstr "類型(&T):"
 
-#: comdlg32.rc:380 comdlg32.rc:418
+#: comdlg32.rc:366 comdlg32.rc:404
 msgid "Where:"
 msgstr ""
 
-#: comdlg32.rc:382 comdlg32.rc:420
+#: comdlg32.rc:368 comdlg32.rc:406
 #, fuzzy
 msgid "Comment:"
 msgstr "備註:"
 
-#: comdlg32.rc:385
+#: comdlg32.rc:371
 msgid "Copies"
 msgstr ""
 
-#: comdlg32.rc:386
+#: comdlg32.rc:372
 msgid "Number of &copies:"
 msgstr ""
 
-#: comdlg32.rc:388
+#: comdlg32.rc:374
 msgid "C&ollate"
 msgstr ""
 
-#: comdlg32.rc:393
+#: comdlg32.rc:379
 msgid "Pa&ges"
 msgstr ""
 
-#: comdlg32.rc:394
+#: comdlg32.rc:380
 #, fuzzy
 msgid "&Selection"
 msgstr "選擇(&S)"
 
-#: comdlg32.rc:397
+#: comdlg32.rc:383
 msgid "&from:"
 msgstr ""
 
-#: comdlg32.rc:398
+#: comdlg32.rc:384
 msgid "&to:"
 msgstr ""
 
-#: comdlg32.rc:424 winecfg.rc:297
+#: comdlg32.rc:410 winecfg.rc:297
 msgid "Si&ze:"
 msgstr "大小(&z):"
 
-#: comdlg32.rc:426
+#: comdlg32.rc:412
 #, fuzzy
 msgid "&Source:"
 msgstr "原始檔案:"
 
-#: comdlg32.rc:431
+#: comdlg32.rc:417
 #, fuzzy
 msgid "P&ortrait"
 msgstr "縱向(&P)"
 
-#: comdlg32.rc:432
+#: comdlg32.rc:418
 #, fuzzy
 msgid "L&andscape"
 msgstr "橫向(&L)"
 
-#: comdlg32.rc:437
+#: comdlg32.rc:423
 msgid "Setup Page"
 msgstr ""
 
-#: comdlg32.rc:446
+#: comdlg32.rc:432
 msgid "&Tray:"
 msgstr ""
 
-#: comdlg32.rc:449 wineps.rc:32
+#: comdlg32.rc:435 wineps.rc:32
 msgid "&Portrait"
 msgstr "縱向(&P)"
 
-#: comdlg32.rc:451
+#: comdlg32.rc:437
 #, fuzzy
 msgid "Borders"
 msgstr "當前標題欄"
 
-#: comdlg32.rc:452
+#: comdlg32.rc:438
 #, fuzzy
 msgid "L&eft:"
 msgstr "å·¦(&L):"
 
-#: comdlg32.rc:454 notepad.rc:109
+#: comdlg32.rc:440 notepad.rc:109
 msgid "&Right:"
 msgstr "右(&R):"
 
-#: comdlg32.rc:456
+#: comdlg32.rc:442
 msgid "T&op:"
 msgstr ""
 
-#: comdlg32.rc:458 notepad.rc:111
+#: comdlg32.rc:444 notepad.rc:111
 msgid "&Bottom:"
 msgstr "下(&B):"
 
-#: comdlg32.rc:462
+#: comdlg32.rc:448
 #, fuzzy
 msgid "P&rinter..."
 msgstr "列印"
 
-#: comdlg32.rc:470
+#: comdlg32.rc:456
 msgid "Look &in:"
 msgstr "搜尋位置(&I)"
 
-#: comdlg32.rc:476
+#: comdlg32.rc:462
 msgid "File &name:"
 msgstr "檔案名稱(&N):"
 
-#: comdlg32.rc:479
+#: comdlg32.rc:465
 msgid "Files of &type:"
 msgstr "檔案類型(&T):"
 
-#: comdlg32.rc:482
+#: comdlg32.rc:468
 msgid "Open as &read-only"
 msgstr "開啟成唯讀(&R)"
 
-#: comdlg32.rc:484 comdlg32.rc:502 shdoclc.rc:124 shell32.rc:96
+#: comdlg32.rc:470 comdlg32.rc:488 shdoclc.rc:124 shell32.rc:96
 msgid "&Open"
 msgstr "é–‹å•Ÿ(&O)"
 
-#: comdlg32.rc:495
+#: comdlg32.rc:481
 #, fuzzy
 msgid "File name:"
 msgstr "檔案名(&F):"
 
-#: comdlg32.rc:498
+#: comdlg32.rc:484
 #, fuzzy
 msgid "Files of type:"
 msgstr "檔案類型(&T):"
 
 #: comdlg32.rc:29
-msgid "&About FolderPicker Test"
-msgstr "关于資料夹选择器(&A)"
-
-#: comdlg32.rc:30
-msgid "Document Folders"
-msgstr "資料夾"
-
-#: comdlg32.rc:31 shell32.rc:200
-msgid "My Documents"
-msgstr "我的檔案"
-
-#: comdlg32.rc:32
-msgid "My Favorites"
-msgstr "我的最愛"
-
-#: comdlg32.rc:33
-msgid "System Path"
-msgstr "系統路徑"
-
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:98 winefile.rc:103
-#, fuzzy
-msgctxt "display name"
-msgid "Desktop"
-msgstr "桌面"
-
-#: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67
-msgid "Fonts"
-msgstr "å­—åž‹"
-
-#: comdlg32.rc:36 shell32.rc:154 regedit.rc:200
-msgid "My Computer"
-msgstr "我的電腦"
-
-#: comdlg32.rc:41
-msgid "System Folders"
-msgstr "系統資料夾"
-
-#: comdlg32.rc:42
-msgid "Local Hard Drives"
-msgstr "本地硬盤驅動器"
-
-#: comdlg32.rc:43
 msgid "File not found"
 msgstr "找不到檔案"
 
-#: comdlg32.rc:44
+#: comdlg32.rc:30
 msgid "Please verify that the correct file name was given"
 msgstr "請檢驗是否給予正確的檔案名稱。"
 
-#: comdlg32.rc:45
+#: comdlg32.rc:31
 msgid ""
 "File does not exist.\n"
 "Do you want to create file?"
@@ -859,7 +817,7 @@ msgstr ""
 "找不到檔案\n"
 "是否創建新檔案?"
 
-#: comdlg32.rc:46
+#: comdlg32.rc:32
 msgid ""
 "File already exists.\n"
 "Do you want to replace it?"
@@ -867,11 +825,11 @@ msgstr ""
 "檔案已經存在。\n"
 "要替換嗎?"
 
-#: comdlg32.rc:47
+#: comdlg32.rc:33
 msgid "Invalid character(s) in path"
 msgstr "檔案名中存在無效的字符"
 
-#: comdlg32.rc:48
+#: comdlg32.rc:34
 msgid ""
 "A filename cannot contain any of the following characters:\n"
 "                          / : < > |"
@@ -879,120 +837,120 @@ msgstr ""
 "檔案名中不能包含任何一下字符::\n"
 "                          / : < > |"
 
-#: comdlg32.rc:49
+#: comdlg32.rc:35
 msgid "Path does not exist"
 msgstr "資料夾不存在"
 
-#: comdlg32.rc:50
+#: comdlg32.rc:36
 msgid "File does not exist"
 msgstr "檔案不存在"
 
-#: comdlg32.rc:55
+#: comdlg32.rc:41
 msgid "Up One Level"
 msgstr "向上一層"
 
-#: comdlg32.rc:56
+#: comdlg32.rc:42
 msgid "Create New Folder"
 msgstr "建立新資料夾"
 
-#: comdlg32.rc:57
+#: comdlg32.rc:43
 msgid "List"
 msgstr "清單"
 
-#: comdlg32.rc:58 cryptui.rc:193
+#: comdlg32.rc:44 cryptui.rc:193
 msgid "Details"
 msgstr "詳細資料"
 
-#: comdlg32.rc:59
+#: comdlg32.rc:45
 msgid "Browse to Desktop"
 msgstr "顯示桌面"
 
-#: comdlg32.rc:123
+#: comdlg32.rc:109
 msgid "Regular"
 msgstr ""
 
-#: comdlg32.rc:124
+#: comdlg32.rc:110
 msgid "Bold"
 msgstr ""
 
-#: comdlg32.rc:125
+#: comdlg32.rc:111
 msgid "Italic"
 msgstr ""
 
-#: comdlg32.rc:126
+#: comdlg32.rc:112
 msgid "Bold Italic"
 msgstr ""
 
-#: comdlg32.rc:131 wordpad.rc:114
+#: comdlg32.rc:117 wordpad.rc:114
 msgid "Black"
 msgstr ""
 
-#: comdlg32.rc:132 wordpad.rc:115
+#: comdlg32.rc:118 wordpad.rc:115
 msgid "Maroon"
 msgstr ""
 
-#: comdlg32.rc:133 wordpad.rc:116
+#: comdlg32.rc:119 wordpad.rc:116
 msgid "Green"
 msgstr ""
 
-#: comdlg32.rc:134 wordpad.rc:117
+#: comdlg32.rc:120 wordpad.rc:117
 msgid "Olive"
 msgstr ""
 
-#: comdlg32.rc:135 wordpad.rc:118
+#: comdlg32.rc:121 wordpad.rc:118
 msgid "Navy"
 msgstr ""
 
-#: comdlg32.rc:136 wordpad.rc:119
+#: comdlg32.rc:122 wordpad.rc:119
 msgid "Purple"
 msgstr ""
 
-#: comdlg32.rc:137 wordpad.rc:120
+#: comdlg32.rc:123 wordpad.rc:120
 msgid "Teal"
 msgstr ""
 
-#: comdlg32.rc:138 wordpad.rc:121
+#: comdlg32.rc:124 wordpad.rc:121
 msgid "Gray"
 msgstr ""
 
-#: comdlg32.rc:139 wordpad.rc:122
+#: comdlg32.rc:125 wordpad.rc:122
 msgid "Silver"
 msgstr ""
 
-#: comdlg32.rc:140 wordpad.rc:123
+#: comdlg32.rc:126 wordpad.rc:123
 #, fuzzy
 msgid "Red"
 msgstr "倒回"
 
-#: comdlg32.rc:141 wordpad.rc:124
+#: comdlg32.rc:127 wordpad.rc:124
 msgid "Lime"
 msgstr ""
 
-#: comdlg32.rc:142 wordpad.rc:125
+#: comdlg32.rc:128 wordpad.rc:125
 msgid "Yellow"
 msgstr ""
 
-#: comdlg32.rc:143 wordpad.rc:126
+#: comdlg32.rc:129 wordpad.rc:126
 msgid "Blue"
 msgstr ""
 
-#: comdlg32.rc:144 wordpad.rc:127
+#: comdlg32.rc:130 wordpad.rc:127
 msgid "Fuchsia"
 msgstr ""
 
-#: comdlg32.rc:145 wordpad.rc:128
+#: comdlg32.rc:131 wordpad.rc:128
 msgid "Aqua"
 msgstr ""
 
-#: comdlg32.rc:146 wordpad.rc:129
+#: comdlg32.rc:132 wordpad.rc:129
 msgid "White"
 msgstr ""
 
-#: comdlg32.rc:66
+#: comdlg32.rc:52
 msgid "Unreadable Entry"
 msgstr "數值不可讀"
 
-#: comdlg32.rc:68
+#: comdlg32.rc:54
 #, fuzzy
 msgid ""
 "This value does not lie within the page range.\n"
@@ -1001,11 +959,11 @@ msgstr ""
 "這個值不在頁數範圍。\n"
 " 請輸入一個 %d 和 %d 之間的數。"
 
-#: comdlg32.rc:70
+#: comdlg32.rc:56
 msgid "The 'from' entry cannot exceed the 'to' entry."
 msgstr "'從'項的值不能大於'到'項的值。"
 
-#: comdlg32.rc:72
+#: comdlg32.rc:58
 msgid ""
 "Margins overlap or fall outside Paper boundaries.\n"
 "Please reenter margins."
@@ -1013,12 +971,12 @@ msgstr ""
 "邊緣空白重迭或落於紙外,\n"
 "請重新輸入邊緣空白。"
 
-#: comdlg32.rc:74
+#: comdlg32.rc:60
 #, fuzzy
 msgid "The 'Number of copies' field cannot be empty."
 msgstr "'份數' 項不能空."
 
-#: comdlg32.rc:76
+#: comdlg32.rc:62
 msgid ""
 "This large number of copies is not supported by your printer.\n"
 "Please enter a value between 1 and %d."
@@ -1026,19 +984,19 @@ msgstr ""
 "你的印表機不支持這麼大的份數。\n"
 " 請輸入一個 1 和 %d 之間的數。"
 
-#: comdlg32.rc:77
+#: comdlg32.rc:63
 msgid "A printer error occurred."
 msgstr "印表機錯誤。"
 
-#: comdlg32.rc:78
+#: comdlg32.rc:64
 msgid "No default printer defined."
 msgstr "沒有默認印表機。"
 
-#: comdlg32.rc:79
+#: comdlg32.rc:65
 msgid "Cannot find the printer."
 msgstr "找不到印表機。"
 
-#: comdlg32.rc:80 progman.rc:73
+#: comdlg32.rc:66 progman.rc:73
 #, fuzzy
 msgid "Out of memory."
 msgstr ""
@@ -1047,15 +1005,15 @@ msgstr ""
 "#-#-#-#-#  zh_TW.po (Wine)  #-#-#-#-#\n"
 "內存不夠。"
 
-#: comdlg32.rc:81
+#: comdlg32.rc:67
 msgid "An error occurred."
 msgstr "出現一些錯誤。"
 
-#: comdlg32.rc:82
+#: comdlg32.rc:68
 msgid "Unknown printer driver."
 msgstr "找不到印表機驅動器。"
 
-#: comdlg32.rc:85
+#: comdlg32.rc:71
 msgid ""
 "Before you can perform printer-related tasks such as page setup or printing "
 "a document, you need to install a printer. Please install one and retry."
@@ -1063,150 +1021,150 @@ msgstr ""
 "在使用與印表機有關功能(版面設定, 列印檔案)之前, 你必須先裝印表機。請裝一個印"
 "表機再試。"
 
-#: comdlg32.rc:151
+#: comdlg32.rc:137
 msgid "Select a font size between %1!d! and %2!d! points."
 msgstr ""
 
-#: comdlg32.rc:152 ieframe.rc:32
+#: comdlg32.rc:138 ieframe.rc:32
 msgid "&Save"
 msgstr ""
 
-#: comdlg32.rc:153
+#: comdlg32.rc:139
 #, fuzzy
 msgid "Save &in:"
 msgstr "另存為(&A)..."
 
-#: comdlg32.rc:154
+#: comdlg32.rc:140
 #, fuzzy
 msgid "Save"
 msgstr "儲存 HTML"
 
-#: comdlg32.rc:156
+#: comdlg32.rc:142
 #, fuzzy
 msgid "Open File"
 msgstr "Wine地雷"
 
-#: comdlg32.rc:93 oleview.rc:95
+#: comdlg32.rc:79 oleview.rc:95
 msgid "Ready"
 msgstr "待命"
 
-#: comdlg32.rc:94
+#: comdlg32.rc:80
 msgid "Paused; "
 msgstr "暫停; "
 
-#: comdlg32.rc:95
+#: comdlg32.rc:81
 msgid "Error; "
 msgstr "錯誤; "
 
-#: comdlg32.rc:96
+#: comdlg32.rc:82
 msgid "Pending deletion; "
 msgstr "等待刪除; "
 
-#: comdlg32.rc:97
+#: comdlg32.rc:83
 msgid "Paper jam; "
 msgstr "卡紙; "
 
-#: comdlg32.rc:98
+#: comdlg32.rc:84
 msgid "Out of paper; "
 msgstr "ç„¡ç´™; "
 
-#: comdlg32.rc:99
+#: comdlg32.rc:85
 msgid "Feed paper manual; "
 msgstr "手動進紙; "
 
-#: comdlg32.rc:100
+#: comdlg32.rc:86
 msgid "Paper problem; "
 msgstr "紙的問題; "
 
-#: comdlg32.rc:101
+#: comdlg32.rc:87
 msgid "Printer offline; "
 msgstr "印表機離線; "
 
-#: comdlg32.rc:102
+#: comdlg32.rc:88
 msgid "I/O Active; "
 msgstr "I/O 活動; "
 
-#: comdlg32.rc:103
+#: comdlg32.rc:89
 msgid "Busy; "
 msgstr "繁忙; "
 
-#: comdlg32.rc:104
+#: comdlg32.rc:90
 msgid "Printing; "
 msgstr "正在列印; "
 
-#: comdlg32.rc:105
+#: comdlg32.rc:91
 msgid "Output tray is full; "
 msgstr "出紙托盤已滿; "
 
-#: comdlg32.rc:106
+#: comdlg32.rc:92
 msgid "Not available; "
 msgstr "不可用; "
 
-#: comdlg32.rc:107
+#: comdlg32.rc:93
 msgid "Waiting; "
 msgstr "等待; "
 
-#: comdlg32.rc:108
+#: comdlg32.rc:94
 msgid "Processing; "
 msgstr "正在處理; "
 
-#: comdlg32.rc:109
+#: comdlg32.rc:95
 msgid "Initialising; "
 msgstr "正在啓動; "
 
-#: comdlg32.rc:110
+#: comdlg32.rc:96
 msgid "Warming up; "
 msgstr "預熱; "
 
-#: comdlg32.rc:111
+#: comdlg32.rc:97
 msgid "Toner low; "
 msgstr "墨低; "
 
-#: comdlg32.rc:112
+#: comdlg32.rc:98
 msgid "No toner; "
 msgstr "沒墨; "
 
-#: comdlg32.rc:113
+#: comdlg32.rc:99
 msgid "Page punt; "
 msgstr "頁處理內存超支; "
 
-#: comdlg32.rc:114
+#: comdlg32.rc:100
 msgid "Interrupted by user; "
 msgstr "用戶干預; "
 
-#: comdlg32.rc:115
+#: comdlg32.rc:101
 msgid "Out of memory; "
 msgstr "內存不夠; "
 
-#: comdlg32.rc:116
+#: comdlg32.rc:102
 msgid "The printer door is open; "
 msgstr "印表機蓋是打開的; "
 
-#: comdlg32.rc:117
+#: comdlg32.rc:103
 msgid "Print server unknown; "
 msgstr "找不到列印服務器; "
 
-#: comdlg32.rc:118
+#: comdlg32.rc:104
 msgid "Power save mode; "
 msgstr "省電狀態; "
 
-#: comdlg32.rc:87
+#: comdlg32.rc:73
 msgid "Default Printer; "
 msgstr "默認印表機; "
 
-#: comdlg32.rc:88
+#: comdlg32.rc:74
 msgid "There are %d documents in the queue"
 msgstr "有 %d 個文檔正在等待列印"
 
-#: comdlg32.rc:89
+#: comdlg32.rc:75
 msgid "Margins [inches]"
 msgstr "邊緣空白 [英寸]"
 
-#: comdlg32.rc:90
+#: comdlg32.rc:76
 msgid "Margins [mm]"
 msgstr "邊緣空白 [毫米]"
 
-#: comdlg32.rc:91 sane.rc:33
+#: comdlg32.rc:77 sane.rc:33
 msgctxt "unit: millimeters"
 msgid "mm"
 msgstr "毫米"
@@ -8109,6 +8067,16 @@ msgstr ""
 msgid "Date deleted"
 msgstr "刪除"
 
+#: shell32.rc:153 winecfg.rc:98 winefile.rc:103
+#, fuzzy
+msgctxt "display name"
+msgid "Desktop"
+msgstr "桌面"
+
+#: shell32.rc:154 regedit.rc:200
+msgid "My Computer"
+msgstr "我的電腦"
+
 #: shell32.rc:156
 #, fuzzy
 msgid "Control Panel"
@@ -8140,6 +8108,10 @@ msgstr ""
 msgid "Start Menu\\Programs"
 msgstr ""
 
+#: shell32.rc:200
+msgid "My Documents"
+msgstr "我的檔案"
+
 #: shell32.rc:201
 #, fuzzy
 msgid "Favorites"
@@ -13618,6 +13590,10 @@ msgstr "定義(&D)..."
 msgid "History"
 msgstr "歷史"
 
+#: winhlp32.rc:46 winhlp32.rc:67
+msgid "Fonts"
+msgstr "å­—åž‹"
+
 #: winhlp32.rc:48 winhlp32.rc:69
 msgid "Small"
 msgstr "小號"
-- 
GitLab