[CMAKE]

* Sync with trunk r51323. svn path=/branches/cmake-bringup/; revision=51329
2025-04-05 05:01:03 +00:00 · 2011-04-13 08:39:17 +00:00 · 2011-04-13 08:39:17 +00:00 · 46a8da69da
commit 46a8da69da
parent 2e8b524c99 9c9874002e
161 changed files with 4230 additions and 1868 deletions
--- a/base/applications/cacls/lang/pl-PL.rc
+++ b/base/applications/cacls/lang/pl-PL.rc
@ -2,7 +2,7 @@
 *         translated by TestamenT
 *      testament@users.sourceforge.net
 * https://sourceforge.net/projects/reactospl
- *
+ * updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (Apr, 2011)
 */

 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
@ -13,7 +13,7 @@ BEGIN
 IDS_HELP, "Pokaż lub modyfikuj listę kontroli dostępu (Access Control List) plików\n\n\
 CACLS nazwa pliku [/T] [/E] [/C] [/G użytkownik:dostęp [...]] [/R użytkownik [...]]\n\
               [/P użytkownik:dostęp [...]] [/D użytkownik [...]]\n\
-   filename      Poka¿ ACL.\n\
+   nazwa pliku   Poka¿ ACL.\n\
   /T            Zmiana ACL określonych plików w\n\
                 aktualnym katalogu i wszystkich podkatalogach.\n\
   /E            Umożliwia edycję listy ACL zamiast jej zamiany.\n\
--- a/base/applications/calc/lang/pl-PL.rc
+++ b/base/applications/calc/lang/pl-PL.rc
@ -3,6 +3,7 @@
 *      Use ReactOS forum PM or IRC to contact me
 *      http://www.reactos.org
 *      IRC: irc.freenode.net #reactos-pl;
+ *      updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (Apr, 2011)
 */

 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
@ -234,7 +235,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Calculator"
+CAPTION "Kalkulator ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@ -252,7 +253,7 @@ BEGIN
                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17
    CONTROL         "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | 
                    BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17
-    CONTROL         "Back",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | 
+    CONTROL         "Wstecz",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | 
                    BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24,
                    40,17
    RTEXT           "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE,
--- a/base/applications/charmap/lang/cs-CZ.rc
+++ b/base/applications/charmap/lang/cs-CZ.rc
@ -1,6 +1,6 @@
 /* FILE:        applications/charmap/lang/cs-CZ.rc
 * TRANSLATOR:  Radek Liska aka Black_Fox (radekliska at gmail dot com)
- * UPDATED:     2008-02-29
+ * UPDATED:     2011-03-31
 */

 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
@ -10,7 +10,7 @@ CAPTION "Mapa znak
 FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
 BEGIN
-  LTEXT         "Font:", IDC_STATIC, 6, 7, 24, 9
+  LTEXT         "Písmo:", IDC_STATIC, 6, 7, 24, 9
  COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
  PUSHBUTTON    "Nápovìda", IDC_CMHELP, 249, 5, 35, 13
  CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
--- a/base/applications/cmdutils/doskey/doskey.rc
+++ b/base/applications/cmdutils/doskey/doskey.rc
@ -9,4 +9,5 @@
 #include "lang/bg-BG.rc"
 #include "lang/de-DE.rc"
 #include "lang/en-US.rc"
+#include "lang/pl-PL.rc"
 #include "lang/uk-UA.rc"
--- a/base/applications/cmdutils/doskey/lang/pl-PL.rc
+++ b/base/applications/cmdutils/doskey/lang/pl-PL.rc
@ -0,0 +1,34 @@
+/*
+ *      translated by Saibamen - Adam Stachowicz (Apr,2011)
+ *      Use ReactOS forum PM, IRC or saibamenppl at gmail.com to contact me
+ *      http://www.reactos.org
+ *      IRC: irc.freenode.net #reactos-pl
+ */
+ 
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+BEGIN
+
+IDS_HELP, "Zarządza ustawieniami linii komend, historii i makr.\n\
+\n\
+DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=rozmiar]\n\
+       [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=plik] [macroname=[tekst]]\n\
+\n\
+  /INSERT             Włącza tryb wstawiania tekstu.\n\
+  /OVERSTRIKE         Wyłącza tryb nadpisywania tekstu.\n\
+  /EXENAME=exename    Ustawia nazwę programu do przeglądania/zmiany historii\n\
+                      i makra. Domyślnie jest to cmd.exe.\n\
+  /HISTORY            Wyświetla historię komend.\n\
+  /LISTSIZE=rozmiar   Ustawia ilość wyświetlanych komend dla buforu historii.\n\
+  /REINSTALL          Czyści historię komend.\n\
+  /MACROS             Wyświetla definicje makro.\n\
+  /MACROS:exename     Wyświetla definicje makro dla określonego programu.\n\
+  /MACROS:ALL         Wyświetla definicje makro dla wszystkich programów.\n\
+  /MACROFILE=plik     Ładuje definicje makro z pliku.\n\
+  macroname           Nazwa dla tworzonego makro.\n\
+  tekst               Określa zastępczy tekst dla makro.\n"
+
+IDS_INVALID_MACRO_DEF, "Nieprawidłowa definicja makro: %s\n"
+
+END
--- a/base/applications/cmdutils/find/lang/pl-PL.rc
+++ b/base/applications/cmdutils/find/lang/pl-PL.rc
@ -15,7 +15,7 @@ IDS_USAGE, "FIND: Wy
    /C  Oblicza w ilu liniach pojawił się szukany ciąg znaków\n\
    /I  Ignoruje wielkość liter\n\
    /N  Numeruje wyświetlane linie, zaczynając od 1\n\
-    /V  Wyświetla te linie które nie zawierają szukanego ciągu znaków"
+    /V  Wyświetla te linie, które nie zawierają szukanego ciągu znaków"

 IDS_NO_SUCH_FILE, "FIND: %s: Plik nie został znaleziony\n"

--- a/base/applications/cmdutils/more/lang/pl-PL.rc
+++ b/base/applications/cmdutils/more/lang/pl-PL.rc
@ -15,7 +15,7 @@ BEGIN
  MORE [Napęd:][Ścieżka]Nazwa pliku\n\n\
  [Napęd:][Ścieżka]Nazwa pliku    Plik, którego zawartość ma być wyświetlona.\n\
  Polecenie\t\t     Polecenie, którego wynik ma być wyświetlony.\n\n\
-  Po wyświetleniu ""-- Kontynuuj --"" możesz nacisnąć dowolny klawisz by przejść na następną stronę.\n"
+  Po wyświetleniu ""-- Kontynuuj --"" możesz nacisnąć dowolny klawisz, aby przejść na następną stronę.\n"

  IDS_CONTINUE, " -- Kontynuuj (100%) -- "
  IDS_FILE_ACCESS, "Brak dostępu do pliku: %s."
--- a/base/applications/cmdutils/xcopy/Pl.rc
+++ b/base/applications/cmdutils/xcopy/Pl.rc
@ -70,7 +70,7 @@ Gdzie:\n\
 [/U]  Kopiuje tylko pliki, które już istniejš w miejscu docelowym\n\
 [/R]  Zastępuje pliki tylko do odczytu\n\
 [/H]  Kopiuje również pliki ukryte i systemowe\n\
-[/C]  Kontynuuje nawet jeżeli podczas kopiowania występiły błędy\n\
+[/C]  Kontynuuje nawet jeżeli podczas kopiowania wystšpiły błędy\n\
 [/A]  Kopiuje tylko pliki z atrybutem archiwalny\n\
 [/M]  Kopiuje tylko pliki z atrybutem archiwalny i usuwa ten atrybut\n\
 [/D | /D:m-d-y] Kopiuje tylko nowe pliki lub te zmodifikowane po podanej dacie.\n\
--- a/base/applications/dxdiag/lang/pl-PL.rc
+++ b/base/applications/dxdiag/lang/pl-PL.rc
@ -1,5 +1,6 @@
 /*
 *      translated by Caemyr - Olaf Siejka (Apr,2008)
+ *      updated by Saibamen - Adam Stachowicz (Apr, 2011)
 *      Use ReactOS forum PM or IRC to contact me
 *      http://www.reactos.org
 *      IRC: irc.freenode.net #reactos-pl
@ -25,7 +26,7 @@ IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 190
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Ten program dostarcza szczegółowych danych o komponentach ReactX i sterownikach, zainstalowanych na twoim systemie..", -1, 10, 10, 443, 17
+    LTEXT "Ten program dostarcza szczegółowe dane o komponentach ReactX i sterownikach, zainstalowanych na twoim systemie..", -1, 10, 10, 443, 17
    LTEXT "Jeœli wiesz ju¿, gdzie tkwi b³¹d, kliknij na odpowiedni¹ zak³adkê. W innym wypadku mo¿esz przejœæ przez wszystkie zak³adki przyciskiem Nastêpna", -1, 10, 30, 443, 25
    GROUPBOX "Informacje o systemie", -1, 10, 55, 443, 130, SS_RIGHT
    LTEXT "Data i czas:", -1, 70, 70, 80, 10, SS_RIGHT
@ -138,7 +139,7 @@ BEGIN
    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
    GROUPBOX "ReactX-", -1, 10, 115, 450, 60
    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Przyspiesznie sprzętowe\nPoziom:", -1, 20, 135, 90, 20
+    RTEXT "Przyspieszenie sprzętowe\nPoziom:", -1, 20, 135, 90, 20
    PUSHBUTTON "Testuj DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
    GROUPBOX "Uwagi", -1, 10, 180, 450, 40
    EDITTEXT  IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
--- a/base/applications/findstr/lang/pl-PL.rc
+++ b/base/applications/findstr/lang/pl-PL.rc
@ -15,7 +15,7 @@ IDS_USAGE, "FIND: Wy
    /C  Oblicza w ilu liniach pojawił się szukany ciąg znaków\n\
    /I  Ignoruje wielkość liter\n\
    /N  Numeruje wyświetlane linie, zaczynając od 1\n\
-    /V  Wyświetla te linie które nie zawierają szukanego ciągu znaków"
+    /V  Wyświetla te linie, które nie zawierają szukanego ciągu znaków"

 IDS_NO_SUCH_FILE, "FIND: %s: Plik nie został znaleziony\n"

--- a/base/applications/games/solitaire/lang/pl-PL.rc
+++ b/base/applications/games/solitaire/lang/pl-PL.rc
@ -3,6 +3,7 @@
 *      testament@users.sourceforge.net
 * https://sourceforge.net/projects/reactospl
 * updated by Caemyr (olaf_siejka@o2.pl), Nov, 2008
+ * updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (Apr, 2011)
 */

 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
@ -53,7 +54,7 @@ END
 STRINGTABLE
 BEGIN
    IDS_SOL_NAME    "Pasjans"
-    IDS_SOL_ABOUT   "Solitaire by J. Brown\n\nCardLib version 1.0."
+    IDS_SOL_ABOUT   "Pasjans by J. Brown\n\nCardLib version 1.0."
    IDS_SOL_QUIT    "Zakoñczyæ aktualn¹ grê?"
    IDS_SOL_WIN     "Gratulacje, wygra³eœ!"
    IDS_SOL_DEAL    "Nowe rozdanie?"
@ -76,7 +77,7 @@ BEGIN
    POPUP "Pomo&c"
    BEGIN
        MENUITEM "&Spis treœci\tF1",               IDM_HELP_CONTENTS
-        MENUITEM "Solit&aire - informacje",        IDM_HELP_ABOUT
+        MENUITEM "Pasj&ans - informacje",        IDM_HELP_ABOUT
    END
 END

--- a/base/applications/logoff/lang/pl-PL.rc
+++ b/base/applications/logoff/lang/pl-PL.rc
@ -14,7 +14,7 @@ IDS_USAGE, "Przerywa sesj
  /v\t\tWyświetla informację o wykonanej czynności.\n\
  /?\t\tWyświetla niniejszą pomoc.\n\n"

-IDS_LOGOFF_REMOTE, "Przeywanie sesji na maszynie zdalnej."
+IDS_LOGOFF_REMOTE, "Przerywanie sesji na maszynie zdalnej."
 IDS_LOGOFF_LOCAL, "Przerywanie niniejszej sesji na maszynie lokalnej."

 IDS_ILLEGAL_PARAM, "Nieprawidłowy parametr\n"
--- a/base/applications/mmc/lang/pl-PL.rc
+++ b/base/applications/mmc/lang/pl-PL.rc
@ -14,7 +14,7 @@ BEGIN
        MENUITEM "Za&kończ\tAlt+F4", ID_FILE_EXIT
    END

-    POPUP "&Help"
+    POPUP "&Pomoc"
    BEGIN
        MENUITEM "Konsola Zarzšdzania ReactOS - i&nformacje...", ID_HELP_ABOUT
    END
--- a/base/applications/mscutils/eventvwr/lang/pl-PL.rc
+++ b/base/applications/mscutils/eventvwr/lang/pl-PL.rc
@ -97,7 +97,7 @@ END
 STRINGTABLE
 BEGIN
 	IDS_APP_TITLE                  "Podgl¹d zdarzeñ"
-	IDC_EVENTSTRINGIDNOTFOUND      "Opis zdarzenia dla danego numeru ID: ( %lu ) nie został odnaleziony w źródle: ( %s ). Ten komputer może nie miec wystarczających informacji w rejestrze albo bibliotek DLL by wyświetlić wiadomości z komputera zdalnego."
+	IDC_EVENTSTRINGIDNOTFOUND      "Opis zdarzenia dla danego numeru ID: ( %lu ) nie został odnaleziony w źródle: ( %s ). Ten komputer może nie miec wystarczających informacji w rejestrze albo bibliotek DLL, aby wyświetlić wiadomości z komputera zdalnego."
 	IDC_EVENTLOG_ERROR_TYPE        "B³¹d"
 	IDC_EVENTLOG_WARNING_TYPE      "Ostrze¿enie"
 	IDC_EVENTLOG_INFORMATION_TYPE  "Informacja"
--- a/base/applications/mscutils/servman/lang/bg-BG.rc
+++ b/base/applications/mscutils/servman/lang/bg-BG.rc
@ -68,7 +68,7 @@ CAPTION "
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
+  LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
  PUSHBUTTON "Close", IDOK, 75, 162, 44, 15
  ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
  EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
--- a/base/applications/mscutils/servman/lang/pl-PL.rc
+++ b/base/applications/mscutils/servman/lang/pl-PL.rc
@ -4,7 +4,7 @@
 * https://sourceforge.net/projects/reactospl
 *
 * updated by Caemyr - Olaf Siejka (Jan, 2008)
- * updated by Saibamen - Adam Stachowicz (Mar, 2011)
+ * updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (Apr, 2011)
 */

 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
@ -77,7 +77,7 @@ CAPTION "Mened
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Mened¿er Us³ug v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 135, 26
+  LTEXT "Mened¿er Us³ug v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 135, 26
  PUSHBUTTON "Zamknij", IDOK, 75, 162, 44, 15
  ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
  EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
@ -224,7 +224,7 @@ BEGIN
  IDS_CREATE_SUCCESS "Us³uga utworzona pomyœlnie"
  IDS_DELETE_SUCCESS "Us³uga skasowana pomyœlnie"
  IDS_CREATE_REQ "Pola oznaczone gwiazdkami\ns¹ obowi¹zkowe"
-  IDS_DELETE_STOP "Musisz rêcznie zatrzymaæ us³ugê przed usuwaniem!"
+  IDS_DELETE_STOP "Musisz rêcznie zatrzymaæ us³ugê przed usuniêciem!"
 END

 STRINGTABLE DISCARDABLE
@ -287,7 +287,7 @@ BEGIN
  IDS_HINT_SYS_MOVE     " Przesuñ to okno."
  IDS_HINT_SYS_SIZE     " Zmienia wielkoœæ tego okna."
  IDS_HINT_SYS_MINIMIZE " Ukryj to okno do ikony."
-  IDS_HINT_SYS_MAXIMIZE " Rozwiñ to okno na pe³en ekran."
+  IDS_HINT_SYS_MAXIMIZE " Rozwiñ to okno na pe³ny ekran."
  IDS_HINT_SYS_CLOSE    " Zamknij to okno."
 END

--- a/base/applications/mstsc/lang/pl-PL.rc
+++ b/base/applications/mstsc/lang/pl-PL.rc
@ -3,6 +3,7 @@
 *      Use ReactOS forum PM or IRC to contact me
 *      http://www.reactos.org
 *      IRC: irc.freenode.net #reactos-pl;
+ * updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (Apr, 2011)
 */

 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
@ -22,7 +23,7 @@ BEGIN
    PUSHBUTTON      "Zapisz jako...",IDC_SAVEAS,123,139,50,14
    PUSHBUTTON      "Otwórz...",IDC_OPEN,177,139,50,14
    ICON            "", IDC_CONNICON, 16,114,20,20
-    LTEXT           "Zapisz obecne połšczenie albo otwórz istniejšcy już plik z ustawieniami",IDC_STATIC,50,115,172,20
+    LTEXT           "Zapisz obecne połšczenie albo otwórz już istniejšcy plik z ustawieniami",IDC_STATIC,50,115,172,20
 END

 IDD_DISPLAY DIALOGEX 0, 0, 242, 175
@ -33,7 +34,7 @@ BEGIN
    GROUPBOX        "Liczba kolorów",IDC_STATIC,7,83,228,85
    ICON            "", IDC_REMICON, 15,19,20,20
    ICON            "", IDC_COLORSICON, 15,98,20,20
-    LTEXT           "Ustaw rozmiar twojego pulpitu zdalnego. Przesuń suwak do końca w prawo by uruchomić pulpit na pełnym ekranie",IDC_STATIC,53,22,175,21
+    LTEXT           "Ustaw rozmiar twojego pulpitu zdalnego. Przesuń suwak do końca w prawo, aby uruchomić pulpit na pełnym ekranie",IDC_STATIC,53,22,175,21
    CONTROL         "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17
    COMBOBOX        IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
    CONTROL         "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10
@ -45,7 +46,7 @@ END

 IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Remote Desktop Connection"
+CAPTION "Połšczenie pulpitu zdalnego"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
    DEFPUSHBUTTON   "Po³¹cz",IDOK,147,245,50,14
--- a/base/applications/network/ipconfig/lang/pl-PL.rc
+++ b/base/applications/network/ipconfig/lang/pl-PL.rc
@ -64,7 +64,7 @@ BEGIN
    \n \
    Przykłady:\n \
        > ipconfig                   ... Pokazuje informacje.\n \
-        > ipconfig /all              ... Pokazuje informacje szczegó³owe.\n \
+        > ipconfig /all              ... Pokazuje szczegó³owe informacje.\n \
        > ipconfig /renew            ... Odnawia wszystkie karty.\n \
        > ipconfig /renew EL*        ... Odnawia każde połšczenie o nazwie\n \
                                         zaczynajšcej się od EL\n \
--- a/base/applications/network/ping/lang/cs-CZ.rc
+++ b/base/applications/network/ping/lang/cs-CZ.rc
@ -0,0 +1,40 @@
+/* FILE:        base/applications/network/ping/lang/cs-CZ.rc
+ * TRANSLATOR:  Radek Liska aka Black_Fox (radekliska at gmail dot com)
+ * UPDATED:     2011-03-31
+ */
+
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_USAGE "\nPoužití: ping [-t] [-n počet] [-l velikost] [-w timeout] cíl\n\n\
+Options:\n\
+    -t             Opakovaně zasílá požadavky o ozvěnu zadanému cíli až do zastavení.\n\
+                   Ukončení stisknutím Ctrl+C.\n\
+    -n počet       Počet požadavků o ozvěnu, které budou zaslány.\n\
+    -l velikost    Velikost vyrovnávací paměti.\n\
+    -w timeout     Doba v milisekundách, po kterou se bude čekat na odpověď.\n\n\0"
+
+    IDS_PING_WITH_BYTES             "\nPing na %1 [%2] s %3!d! bajty dat:\n\n\0"
+    IDS_PING_STATISTICS             "\nStatistika pro %1:\n\0"
+    IDS_PACKETS_SENT_RECEIVED_LOST  "    Pakety: Odesláno = %1!d!, Přijato = %2!d!, Ztraceno = %3!d! (%4!d!%% ztráta),\n\0"
+    IDS_APPROXIMATE_ROUND_TRIP      "Přibližná doba do přijetí odezvy v milisekundách:\n\0"
+    IDS_MIN_MAX_AVERAGE             "    Minimum = %1, Maximum = %2, Průměr = %3\n\0"
+    IDS_NOT_ENOUGH_RESOURCES        "Není k dispozici dostatek volných zdrojů.\n\0"
+    IDS_UNKNOWN_HOST                "Neznámý hostitel %1.\n\0"
+    IDS_SETSOCKOPT_FAILED           "setsockopt selhalo (%1!d!).\n\0"
+    IDS_COULD_NOT_CREATE_SOCKET     "Nebylo možné vytvořit socket (#%1!d!).\n\0"
+    IDS_COULD_NOT_INIT_WINSOCK      "Nebylo možné inicializovat knihovnu winsock.\n\0"
+    IDS_DEST_MUST_BE_SPECIFIED      "Je nutno zadat název nebo IP adresu cíle.\n\0"
+    IDS_BAD_PARAMETER               "Nesprávný parametr %1.\n\0"
+    IDS_BAD_OPTION_FORMAT           "Nesprávný formát volby %1.\n\0"
+    IDS_BAD_OPTION                  "Nesprávná volba %1.\n\0"
+    IDS_BAD_VALUE_OPTION_L          "Nesprávná hodnota volby -l, platný rozsah je od 0 do %1!d!.\n\0"
+    IDS_REPLY_FROM                  "Odpověď od %1: bajtů=%2!d! čas%3%4 TTL=%5!d!\n\0"
+    IDS_DEST_UNREACHABLE            "Cíl je nedostupný.\n\0"
+    IDS_COULD_NOT_TRANSMIT          "Nebylo možné přenést data (%1!d!).\n\0"
+    IDS_COULD_NOT_RECV              "Nebylo možné přijmout data (%1!d!).\n\0"
+    IDS_REQUEST_TIMEOUT             "Časový limit žádosti vypršel.\n\0"
+    IDS_MS                          "ms\0"
+    IDS_1MS                         "1ms\0"
+END
--- a/base/applications/network/ping/ping.rc
+++ b/base/applications/network/ping/ping.rc
@ -8,6 +8,7 @@
 #define REACTOS_STR_ORIGINAL_COPYRIGHT  "Casper S. Hornstrup (chorns@users.sourceforge.net)\0"
 #include <reactos/version.rc>

+#include "lang/cs-CZ.rc"
 #include "lang/de-DE.rc"
 #include "lang/en-US.rc"
 #include "lang/fr-FR.rc"
--- a/base/applications/notepad/lang/pl-PL.rc
+++ b/base/applications/notepad/lang/pl-PL.rc
@ -153,10 +153,10 @@ END

 IDD_ABOUTBOX DIALOGEX DISCARDABLE  22,16,284,170
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Notatnik"
+CAPTION "Notatnik ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "ReactOS Notatnik v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
+    CONTROL         "Notatnik ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
                    -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
    CONTROL         " ",
                    -1,"Static",0x50000000,8,48,272,11
@ -209,5 +209,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
-STRING_LINE_COLUMN,                             "Line %d, column %d"
+STRING_LINE_COLUMN,                             "Linia %d, kolumna %d"
 END
--- a/base/applications/rapps/lang/pl-PL.rc
+++ b/base/applications/rapps/lang/pl-PL.rc
@ -1,4 +1,5 @@
 // * translated by Caemyr - Olaf Siejka (Aug, 2009)
+// * updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (Apr, 2011)

 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

@ -41,7 +42,7 @@ BEGIN
 	POPUP "popup"
 	BEGIN
 		MENUITEM "&Instaluj",   ID_INSTALL
-		MENUITEM "&odinstaluj", ID_UNINSTALL
+		MENUITEM "&Odinstaluj", ID_UNINSTALL
 		MENUITEM "&Modyfikuj",    ID_MODIFY
 		MENUITEM SEPARATOR
 		MENUITEM "&Usuñ z rejestru", ID_REGREMOVE
@ -78,7 +79,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
 	LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35

-	AUTORADIOBUTTON "&Zainstaluj z dysku (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+	AUTORADIOBUTTON "&Zainstaluj z dysku (CD lub DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
 	AUTORADIOBUTTON "&Pobierz i zainstaluj", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP

 	PUSHBUTTON "OK", IDOK, 86, 78, 60, 14
@ -100,7 +101,7 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 CAPTION "O programie"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
+	LTEXT "Menedżer aplikacji ReactOS\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
 	PUSHBUTTON "Zamknij", IDOK, 133, 46, 50, 14
 	ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
 END
@ -180,15 +181,15 @@ BEGIN
 	IDS_MODIFY "Modyfikuj"
 	IDS_APPS_COUNT "Licznik aplikacji: %d"
 	IDS_WELCOME_TITLE "Witamy w Mened¿erze aplikacji ReactOS!\n\n"
-	IDS_WELCOME_TEXT "Z listy po lewej wybierz kategorię, a następnie aplikację by jš zainstalować lub odinstalować.\nStrona projektu ReactOS: "
+	IDS_WELCOME_TEXT "Z listy po lewej wybierz kategorię, a następnie aplikację, by jš zainstalować lub odinstalować.\nStrona projektu ReactOS: "
 	IDS_WELCOME_URL "http://www.reactos.org"
 	IDS_INSTALLED "Zainstalowane"
 	IDS_AVAILABLEFORINST "Dostêpne"
 	IDS_UPDATES "Uaktualnienia"
 	IDS_APPLICATIONS "Aplikacje"
-	IDS_CHOOSE_FOLDER_TEXT "Wybierz katalog w którym będa zapisywane pobrane programy:"
+	IDS_CHOOSE_FOLDER_TEXT "Wybierz katalog, w którym będa zapisywane pobrane programy:"
 	IDS_CHOOSE_FOLDER_ERROR "Wybra³eœ nieistniej¹cy katalog! Czy chcesz utworzyæ nowy?"
-	IDS_USER_NOT_ADMIN "Musisz mieć uprawnienia administratora aby uruchomić ""ReactOS Applications Manager""!"
+	IDS_USER_NOT_ADMIN "Musisz mieć uprawnienia administratora, aby uruchomić ""Menedżer aplikacji ReactOS""!"
 	IDS_APP_REG_REMOVE "Czy na pewno chcesz usun¹æ wpis tego programu z rejestru?"
 	IDS_INFORMATION "Informacja"
 	IDS_UNABLE_TO_REMOVE "Nie mo¿na by³o usun¹æ wpisu z rejestru!"
--- a/base/applications/rapps/lang/sv-SE.rc
+++ b/base/applications/rapps/lang/sv-SE.rc
@ -0,0 +1,199 @@
+/*
+ * PROJECT:         ReactOS RAPPS
+ * FILE:                  \base\applications\rapps\lang\sv-SE.rc
+ * PURPOSE:         Swedish resource file
+ * Translation:      Jaix Bly
+ */
+LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
+
+IDR_MAINMENU MENU
+BEGIN
+	POPUP "&Arkiv"
+	BEGIN
+		MENUITEM "&Inställningar", ID_SETTINGS
+		MENUITEM SEPARATOR
+		MENUITEM "A&vsluta",     ID_EXIT
+	END
+	POPUP "&Program"
+	BEGIN
+		MENUITEM "&Installera",  ID_INSTALL
+		MENUITEM "&Avinstallera",ID_UNINSTALL
+		MENUITEM "&Ändra",   ID_MODIFY
+		MENUITEM SEPARATOR
+		MENUITEM "&Ta bort från Registret", ID_REGREMOVE
+		MENUITEM SEPARATOR
+		MENUITEM "&Uppdatere",  ID_REFRESH
+	END
+	POPUP "Hjälp"
+	BEGIN
+		MENUITEM "Hjälp",      ID_HELP, GRAYED
+		MENUITEM "Om...",     ID_ABOUT
+	END
+END
+
+IDR_LINKMENU MENU
+BEGIN
+	POPUP "popup"
+	BEGIN
+		MENUITEM "&Öppne länk i webläsare", ID_OPEN_LINK
+		MENUITEM "&Kopier länk till urklipp", ID_COPY_LINK
+	END
+END
+
+IDR_APPLICATIONMENU MENU
+BEGIN
+	POPUP "popup"
+	BEGIN
+		MENUITEM "&Installera",   ID_INSTALL
+		MENUITEM "&Avinstallera", ID_UNINSTALL
+		MENUITEM "&Ändre",    ID_MODIFY
+		MENUITEM SEPARATOR
+		MENUITEM "&Ta bort från Registret", ID_REGREMOVE
+		MENUITEM SEPARATOR
+		MENUITEM "&Uppdatera",   ID_REFRESH
+	END
+END
+
+IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 250, 144
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Inställningar"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	GROUPBOX "Allmänna", -1, 4, 2, 240, 61
+	AUTOCHECKBOX "&Spara fönster position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
+	AUTOCHECKBOX "&Uppdatera listan med tillgängliga program vid start", IDC_UPDATE_AVLIST, 15, 29, 219, 12
+	AUTOCHECKBOX "&Logga ur installation och borttagning program", IDC_LOG_ENABLED, 15, 46, 219, 12
+
+	GROUPBOX "Nerladding", -1, 4, 65, 240, 51
+	LTEXT "Mapp för nerladdningar:", -1, 16, 75, 100, 9
+	EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP
+	PUSHBUTTON "&Välj", IDC_CHOOSE, 187, 85, 50, 14
+	AUTOCHECKBOX "&Ta bort programms installerare efter installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+
+	PUSHBUTTON "Förinställd", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
+	PUSHBUTTON "OK", IDOK, 116, 124, 60, 14
+	PUSHBUTTON "Avbryt", IDCANCEL, 181, 124, 60, 14
+END
+
+IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 216, 97
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Programinstallation"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35
+
+	AUTORADIOBUTTON "&Installera från disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+	AUTORADIOBUTTON "&Ladda ner och installera", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
+
+	PUSHBUTTON "OK", IDOK, 86, 78, 60, 14
+	PUSHBUTTON "Avbryt", IDCANCEL, 150, 78, 60, 14
+END
+
+IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
+STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+CAPTION "Ladda ner..."
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
+    LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER
+    PUSHBUTTON "Avbryt", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP
+END
+
+IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+CAPTION "Om"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT "ReactOS Programhanterare\nCopyright (C) 2009\nav Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
+	PUSHBUTTON "Stäng", IDOK, 133, 46, 50, 14
+	ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+	IDS_TOOLTIP_INSTALL "Installera"
+	IDS_TOOLTIP_UNINSTALL "Avinstallera"
+	IDS_TOOLTIP_MODIFY "Redigera"
+	IDS_TOOLTIP_SETTINGS "Inställingar"
+	IDS_TOOLTIP_REFRESH "Uppdatera"
+	IDS_TOOLTIP_EXIT "Avsluta"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+	IDS_APP_NAME "Namn"
+	IDS_APP_INST_VERSION "Version"
+	IDS_APP_DESCRIPTION "Beskrivning"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+	IDS_INFO_VERSION "\nVersion: "
+	IDS_INFO_DESCRIPTION "\nBeskrivning: "
+	IDS_INFO_PUBLISHER "\nUtgivare: "
+	IDS_INFO_HELPLINK "\nHjälplänk: "
+	IDS_INFO_HELPPHONE "\nHjälptelefon: "
+	IDS_INFO_README "\nLäs mig: "
+	IDS_INFO_REGOWNER "\nRegistrerad ägare: "
+	IDS_INFO_PRODUCTID "\nProdukt ID: "
+	IDS_INFO_CONTACT "\nKontakt: "
+	IDS_INFO_UPDATEINFO "\nUppdaterinsinformation: "
+	IDS_INFO_INFOABOUT "\nInformation om: "
+	IDS_INFO_COMMENTS "\nKommentarer: "
+	IDS_INFO_INSTLOCATION "\nInstallationsplacering: "
+	IDS_INFO_INSTALLSRC "\nInstallationskälla: "
+	IDS_INFO_UNINSTALLSTR "\nAvinstallationssträng: "
+	IDS_INFO_MODIFYPATH "\nÄndra sökväg: "
+	IDS_INFO_INSTALLDATE "\nInstallationsdatum: "
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+	IDS_AINFO_VERSION "\nVersion: "
+	IDS_AINFO_DESCRIPTION "\nBeskrivning: "
+	IDS_AINFO_SIZE "\nStorlek: "
+	IDS_AINFO_URLSITE "\nHemsida: "
+	IDS_AINFO_LICENCE "\nLicens: "
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+	IDS_CAT_AUDIO "Audio"
+	IDS_CAT_DEVEL "Utveckling"
+	IDS_CAT_DRIVERS "Drivrutiner"
+	IDS_CAT_EDU "Edutainment"
+	IDS_CAT_ENGINEER "Engineering"
+	IDS_CAT_FINANCE "Finans"
+	IDS_CAT_GAMES "Spel & kul"
+	IDS_CAT_GRAPHICS "Grafik"
+	IDS_CAT_INTERNET "Internet & Nätverk"
+	IDS_CAT_LIBS "Bibliotek"
+	IDS_CAT_OFFICE "Kontor"
+	IDS_CAT_OTHER "Annat"
+	IDS_CAT_SCIENCE "Vetenskap"
+	IDS_CAT_TOOLS "Verktyg"
+	IDS_CAT_VIDEO "Video"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+	IDS_APPTITLE "ReactOS programhanterare"
+	IDS_SEARCH_TEXT "Sök..."
+	IDS_INSTALL "Installera"
+	IDS_UNINSTALL "Avinstallera"
+	IDS_MODIFY "Ändra"
+	IDS_APPS_COUNT "Programantal: %d"
+	IDS_WELCOME_TITLE "Välkommen till ReactOS programhanterare!\n\n"
+	IDS_WELCOME_TEXT "Välj en kategori till vänstre, och sedan ett program för att installera eller avinstallera.\nReactOS Web sida: "
+	IDS_WELCOME_URL "http://www.reactos.org"
+	IDS_INSTALLED "Installerat"
+	IDS_AVAILABLEFORINST "Tillgängliga for installation"
+	IDS_UPDATES "Uppdateringar"
+	IDS_APPLICATIONS "Program"
+	IDS_CHOOSE_FOLDER_TEXT "Välj en mapp som kommer att användas för nerladdning av program:"
+	IDS_CHOOSE_FOLDER_ERROR "Du har specificrat en obefintlig mapp!"
+	IDS_USER_NOT_ADMIN "Du måste vara administratör för att starta ""ReactOS programhanterare""!"
+	IDS_APP_REG_REMOVE "Är du säker på att du vill ta bort data det installerade programmets data från registret?"
+	IDS_INFORMATION "Information"
+	IDS_UNABLE_TO_REMOVE "Det gick ej att ta bort programmets data från registret!"
+END
--- a/base/applications/rapps/rsrc.rc
+++ b/base/applications/rapps/rsrc.rc
@ -10,4 +10,5 @@
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"
+#include "lang/sv-SE.rc"
 #include "lang/uk-UA.rc"
--- a/base/applications/regedit/lang/pl-PL.rc
+++ b/base/applications/regedit/lang/pl-PL.rc
@ -8,6 +8,8 @@
 * http://www.reactos.org
 * IRC: irc.freenode.net #reactos-pl; 
 *
+ * updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (Apr, 2011)
+ *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
@ -169,12 +171,12 @@ BEGIN
  END
  POPUP ""
  BEGIN
-        MENUITEM "C&ut", ID_HEXEDIT_CUT
-        MENUITEM "&Copy", ID_HEXEDIT_COPY
-        MENUITEM "&Paste", ID_HEXEDIT_PASTE
-        MENUITEM "&Delete", ID_HEXEDIT_DELETE
+        MENUITEM "W&ytnij", ID_HEXEDIT_CUT
+        MENUITEM "&Kopiuj", ID_HEXEDIT_COPY
+        MENUITEM "&Wklej", ID_HEXEDIT_PASTE
+        MENUITEM "&Usuñ", ID_HEXEDIT_DELETE
        MENUITEM SEPARATOR
-        MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL
+        MENUITEM "Zaznacz &ca³oœæ", ID_HEXEDIT_SELECT_ALL
  END
 END

@ -184,13 +186,13 @@ END
 */
 IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Hive"
+CAPTION "£aduj drzewo"
 FONT 8, "Ms Shell Dlg"
 {
-    LTEXT           "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
+    LTEXT           "&Klucz:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT
    EDITTEXT        IDC_EDIT_KEY, 23, 2, 167, 13
    DEFPUSHBUTTON   "OK", IDOK, 140, 17, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 89, 17, 50, 14
+    PUSHBUTTON      "Anuluj", IDCANCEL, 89, 17, 50, 14
 }

 IDD_EDIT_STRING DIALOGEX  32, 24, 252, 84
@ -292,9 +294,9 @@ BEGIN
    ID_REGISTRY_EXPORTREGISTRYFILE
                            "Eksportuje ca³oœæ lub czêœæ rejestru do pliku"
    ID_REGISTRY_LOADHIVE
-                            "Loads a hive file into the registry"
+                            "£aduje plik Drzewa do rejestru"
    ID_REGISTRY_UNLOADHIVE
-                            "Unloads a hive from the registry"
+                            "Wy³adowuje Drzewo z rejestru"
    ID_REGISTRY_CONNECTNETWORKREGISTRY
                            "Po³¹czenie z rejestrem zdalnego komputera"
    ID_REGISTRY_DISCONNECTNETWORKREGISTRY
@ -351,8 +353,8 @@ BEGIN
    IDS_MY_COMPUTER         "Mój komputer"
    IDS_IMPORT_REG_FILE     "Importuj plik rejestru"
    IDS_EXPORT_REG_FILE     "Eksportuj plik rejestru"
-    IDS_LOAD_HIVE           "Load Hive"
-    IDS_UNLOAD_HIVE         "Unload Hive"
+    IDS_LOAD_HIVE           "£aduj Drzewo"
+    IDS_UNLOAD_HIVE         "Wy³aduj Drzewo"
    IDS_INVALID_DWORD       "(niew³aœciwa wartoœæ DWORD)"
 END

--- a/base/applications/sndrec32/lang/cs-CZ.rc
+++ b/base/applications/sndrec32/lang/cs-CZ.rc
@ -0,0 +1,59 @@
+/* FILE:        applications/sndrec32/lang/cs-CZ.rc
+ * TRANSLATOR:  Radek Liska aka Black_Fox (radekliska at gmail dot com)
+ * UPDATED:     2011-04-09
+ */
+
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+IDC_REACTOS_SNDREC32 ACCELERATORS
+BEGIN
+    "?",            IDM_ABOUT,              ASCII,  ALT
+    "/",            IDM_ABOUT,              ASCII,  ALT
+END
+
+IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Záznam zvuku"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    ICON            128,IDC_REACTOS_SNDREC32,19,14,21,20
+    LTEXT           "ReactOS Záznam zvuku, verze 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX
+    LTEXT           "Copyright (C) 2009",IDC_STATIC,55,25,114,8
+    DEFPUSHBUTTON   "OK",IDOK,139,54,50,14,WS_GROUP
+END
+
+IDR_MENU1 MENU
+BEGIN
+    POPUP "Soubor"
+    BEGIN
+        MENUITEM "Nový",                        ID_NEW
+        MENUITEM "Otevøít...",                  ID_FILE_OPEN
+        MENUITEM "Uložit",                      ID_FILE_SAVE, GRAYED
+        MENUITEM "Uložit jako...",              ID_FILE_SAVEAS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Konec",                       ID_EXIT
+    END
+    MENUITEM "todo1",                       0
+    MENUITEM "todo2",                       0
+    POPUP "?"
+    BEGIN
+        MENUITEM "O programu...",                    ID__ABOUT
+    END
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_APP_TITLE           "Záznam zvuku"
+    IDC_REACTOS_SNDREC32    "REACTOS_SNDREC32"
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_STRPOS              "Pozice: %.2f s"
+    IDS_STRDUR              "Délka: %.2f s"
+    IDS_STRBUF              "Buffer: %.2f kb"
+    IDS_STRFMT              "%.1f kHz %u bitù"
+    IDS_STRMONO             "mono"
+    IDS_STRSTEREO           "stereo"
+    IDS_STRCHAN             "%s"
+END
--- a/base/applications/sndrec32/lang/pl-PL.rc
+++ b/base/applications/sndrec32/lang/pl-PL.rc
@ -0,0 +1,61 @@
+/*
+ *      translated by Saibamen - Adam Stachowicz (Apr,2011)
+ *      Use ReactOS forum PM, IRC or saibamenppl at gmail.com to contact me
+ *      http://www.reactos.org
+ *      IRC: irc.freenode.net #reactos-pl;
+ */
+ 
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+IDC_REACTOS_SNDREC32 ACCELERATORS
+BEGIN
+    "?",            IDM_ABOUT,              ASCII,  ALT
+    "/",            IDM_ABOUT,              ASCII,  ALT
+END
+
+IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Informacje o reactOS_sndrec32"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    ICON            128,IDC_REACTOS_SNDREC32,19,14,21,20
+    LTEXT           "ReactOS_sndrec32, wersja 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX
+    LTEXT           "Copyright (C) 2009",IDC_STATIC,55,25,114,8
+    DEFPUSHBUTTON   "OK",IDOK,139,54,50,14,WS_GROUP
+END
+
+IDR_MENU1 MENU
+BEGIN
+    POPUP "Plik"
+    BEGIN
+        MENUITEM "Nowy",                         ID_NEW
+        MENUITEM "Otwórz...",                     ID_FILE_OPEN
+        MENUITEM "Zapisz",                        ID_FILE_SAVE, GRAYED
+        MENUITEM "Zapisz jako...",                  ID_FILE_SAVEAS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Wyjœcie",                        ID_EXIT
+    END
+    MENUITEM "todo1",                       0
+    MENUITEM "todo2",                       0
+    POPUP "?"
+    BEGIN
+        MENUITEM "O programie...",                    ID__ABOUT
+    END
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_APP_TITLE           "Rejestrator dŸwiêku"
+    IDC_REACTOS_SNDREC32    "REACTOS_SNDREC32"
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_STRPOS              "Pozycja: %.2f s"
+    IDS_STRDUR              "D³ugoœæ: %.2f s"
+    IDS_STRBUF              "Bufor: %.2f kb"
+    IDS_STRFMT              "%.1f kHz %u bits"
+    IDS_STRMONO             "mono"
+    IDS_STRSTEREO           "stereo"
+    IDS_STRCHAN             "%s"
+END
--- a/base/applications/sndrec32/rsrc.rc
+++ b/base/applications/sndrec32/rsrc.rc
@ -16,11 +16,13 @@ IDB_BITMAP2_REC_DIS     BITMAP                  "resources/but_rec_dis.bmp"
 IDB_BITMAP2_START_DIS   BITMAP                  "resources/but_start_dis.bmp"
 IDB_BITMAP2_STOP_DIS    BITMAP                  "resources/but_stop_dis.bmp"

+#include "lang/cs-CZ.rc"
 #include "lang/de-DE.rc"
 #include "lang/en-US.rc"
 #include "lang/es-ES.rc"
 #include "lang/it-IT.rc"
 #include "lang/ja-JP.rc"
+#include "lang/pl-PL.rc"
 #include "lang/sk-SK.rc"
 #include "lang/uk-UA.rc"

--- a/base/applications/sndvol32/CMakeLists.txt
+++ b/base/applications/sndvol32/CMakeLists.txt
@ -4,7 +4,8 @@ add_definitions(-D_DLL -D__USE_CRTIMP)
 set_unicode()

 list(APPEND SOURCE
-    misc.c
+    dialog.c
+	misc.c
    mixer.c
    sndvol32.c
    sndvol32.rc)
--- a/base/applications/sndvol32/dialog.c
+++ b/base/applications/sndvol32/dialog.c
@ -0,0 +1,566 @@
+/* $Id: misc.c 43790 2009-10-27 10:34:16Z dgorbachev $
+ *
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS Sound Volume Control
+ * FILE:        subsys/system/sndvol32/dialog.c
+ * PROGRAMMERS: Johannes Anderwald
+ */
+#include "sndvol32.h"
+
+
+#define XLEFT (30)
+#define XTOP (20)
+#define DIALOG_VOLUME_SIZE (150)
+
+LPVOID
+LoadDialogResource(
+    IN HMODULE hModule,
+    IN LPCWSTR ResourceName,
+    OUT LPDWORD ResourceLength)
+{
+    HRSRC hSrc;
+    HGLOBAL hRes;
+    PVOID Result;
+
+    /* find resource */
+    hSrc = FindResourceW(hModule, ResourceName, (LPCWSTR)RT_DIALOG);
+
+    if (!hSrc)
+    {
+        /* failed to find resource */
+        return NULL;
+    }
+
+    /* now load the resource */
+    hRes = LoadResource(hAppInstance, hSrc);
+    if (!hRes)
+    {
+        /* failed to load resource */
+        return NULL;
+    }
+
+    /* now lock the resource */
+    Result = LockResource(hRes);
+
+    if (!Result)
+    {
+        /* failed to lock resource */
+        return NULL;
+    }
+
+    if (ResourceLength)
+    {
+        /* store output length */
+        *ResourceLength = SizeofResource(hAppInstance, hSrc);
+    }
+
+    /* done */
+    return Result;
+}
+
+LPWORD
+AddDialogControl(
+    IN HWND hwndDialog,
+    IN HWND * OutWnd,
+    IN LPRECT DialogOffset,
+    IN PDLGITEMTEMPLATE DialogItem,
+    IN DWORD DialogIdMultiplier,
+    IN HFONT hFont)
+{
+    RECT rect;
+    LPWORD Offset;
+    LPWSTR ClassName, WindowName = NULL;
+    HWND hwnd;
+    DWORD wID;
+
+    /* initialize client rectangle */
+    rect.left = DialogItem->x + DialogOffset->left;
+    rect.top = DialogItem->y + DialogOffset->top;
+    rect.right = DialogItem->cx;
+    rect.bottom = DialogItem->cy;
+
+    //MapDialogRect(hwndDialog, &rect);
+
+    /* move offset after dialog item */
+    Offset = (LPWORD)(DialogItem + 1);
+
+    if (*Offset == 0xFFFF)
+    {
+        /* class is encoded as type */
+        Offset++;
+
+        /* get control type */
+        switch(*Offset)
+        {
+            case 0x80:
+                ClassName = L"button";
+                WindowName = (LPWSTR)(Offset + 1);
+                break ;
+            case 0x82:
+                ClassName = L"static";
+                WindowName = (LPWSTR)(Offset + 1);
+                break;
+            default:
+               /* FIXME */
+               assert(0);
+               ClassName = 0;
+        }
+    }
+    else
+    {
+        /* class name is encoded as string */
+        ClassName = (LPWSTR)Offset;
+
+        /* adjust offset */
+        Offset += wcslen(ClassName) + 1;
+
+        /* get offset */
+        WindowName = (LPWSTR)(Offset + 1);
+    }
+
+    if (DialogItem->id == MAXWORD)
+    {
+        /* id is not important */
+        wID = DialogItem->id;
+    }
+    else
+    {
+        /* calculate id */
+        wID = DialogItem->id * (DialogIdMultiplier + 1);
+
+    }
+    /* now create the window */
+    hwnd = CreateWindowExW(DialogItem->dwExtendedStyle,
+                           ClassName,
+                           WindowName,
+                           DialogItem->style,
+                           rect.left,
+                           rect.top,
+                           rect.right,
+                           rect.bottom,
+                           hwndDialog,
+                           (HMENU)(wID),
+                           hAppInstance,
+                           NULL);
+
+    /* sanity check */
+    assert(hwnd);
+
+    /* store window */
+    *OutWnd = hwnd;
+
+    /* check if this the track bar */
+    if (!wcsicmp(ClassName, L"msctls_trackbar32"))
+    {
+        /* set up range */
+        SendMessage(hwnd, TBM_SETRANGE, (WPARAM) TRUE, (LPARAM) MAKELONG(0, 5));
+
+        /* set up page size */
+        SendMessage(hwnd, TBM_SETPAGESIZE, 0, (LPARAM) 1);
+
+        /* set available range */
+        //SendMessage(hwnd, TBM_SETSEL, (WPARAM) FALSE, (LPARAM) MAKELONG(0, 5));
+
+        /* set position */
+        SendMessage(hwnd, TBM_SETPOS, (WPARAM) TRUE, (LPARAM) 0);
+
+    }
+    else if (!wcsicmp(ClassName, L"static") || !wcsicmp(ClassName, L"button"))
+    {
+        /* set font */
+        SendMessageW(hwnd, WM_SETFONT, (WPARAM)hFont, TRUE);
+    }
+
+    //ShowWindow(hwnd, SW_SHOWNORMAL);
+
+    if (WindowName != NULL)
+    {
+        /* position offset to start of name */
+        Offset++;
+
+        /* move offset past name */
+        Offset += wcslen((LPWSTR)Offset) + 1;
+    }
+    else
+    {
+        /* no name so just adjust offset */
+        Offset++;
+    }
+
+    /* check if there is additional data */
+    if (*Offset == 0)
+    {
+        /* no additional data */
+        Offset++;
+    }
+    else
+    {
+        /* add data offset */
+        Offset += *Offset;
+    }
+
+    /* make sure next template is word-aligned */
+    Offset = (LPWORD)(((ULONG_PTR)Offset + 3) & ~3);
+
+    /* done */
+    return Offset;
+}
+
+VOID
+LoadDialogControls(
+    IN PMIXER_WINDOW MixerWindow,
+    LPRECT DialogOffset,
+    LPVOID DlgResource,
+    DWORD DialogIdMultiplier)
+{
+    LPDLGTEMPLATE DialogHeader;
+    PDLGITEMTEMPLATE DialogItem;
+    LPWORD Offset;
+    WORD FontSize;
+    WCHAR FontName[100];
+    WORD Length, Index;
+    HFONT Font;
+
+    /* get dialog header */
+    DialogHeader = (LPDLGTEMPLATE)DlgResource;
+
+    /* sanity check */
+    assert(DialogHeader->cdit);
+
+    if (MixerWindow->Window)
+        MixerWindow->Window = (HWND*)HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MixerWindow->Window, (MixerWindow->WindowCount + DialogHeader->cdit) * sizeof(HWND));
+    else
+        MixerWindow->Window = (HWND*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, DialogHeader->cdit * sizeof(HWND));
+    if (!MixerWindow->Window)
+    {
+        /* no memory */
+        return;
+    }
+
+    /* now walk past the dialog header */
+    Offset = (LPWORD)(DialogHeader + 1);
+
+    /* FIXME: support menu */
+    assert(*Offset == 0);
+    Offset++;
+
+    /* FIXME: support classes */
+    assert(*Offset == 0);
+    Offset++;
+
+    /* FIXME: support titles */
+    assert(*Offset == 0);
+    Offset++;
+
+    /* get font size */
+    FontSize = *Offset;
+    Offset++;
+
+    /* calculate font length */
+    Length = wcslen((LPWSTR)Offset) + 1;
+    assert(Length < (sizeof(FontName) / sizeof(WCHAR)));
+
+    /* copy font */
+    wcscpy(FontName, (LPWSTR)Offset);
+
+    Font = CreateFontW(FontSize+8, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, FontName);
+    assert(Font);
+
+    /* move offset after font name */
+    Offset += Length;
+
+    /* offset is now at first dialog item control */
+    DialogItem = (PDLGITEMTEMPLATE)Offset;
+
+    /* enumerate now all controls */
+    for(Index = 0; Index < DialogHeader->cdit; Index++)
+    {
+        /* add controls */
+        Offset = AddDialogControl(MixerWindow->hWnd, &MixerWindow->Window[MixerWindow->WindowCount], DialogOffset, DialogItem, DialogIdMultiplier, Font);
+
+        /* sanity check */
+        assert(Offset);
+
+        /* move dialog item to new offset */
+        DialogItem =(PDLGITEMTEMPLATE)Offset;
+
+        /* increment window count */
+        MixerWindow->WindowCount++;
+    }
+}
+
+VOID
+LoadDialog(
+    IN HMODULE hModule,
+    IN PMIXER_WINDOW MixerWindow,
+    IN LPCWSTR DialogResId,
+    IN DWORD Index)
+{
+    LPVOID DlgResource;
+    RECT rect;
+
+    /* first load the dialog resource */
+    DlgResource = LoadDialogResource(hModule, DialogResId, NULL);
+
+    if (!DlgResource)
+    {
+        /* failed to load resource */
+        return;
+    }
+
+    /* get window size */
+    GetClientRect(MixerWindow->hWnd, &rect);
+
+    /* adjust client position */
+    rect.left += (Index * DIALOG_VOLUME_SIZE);
+
+
+    /* now add the controls */
+    LoadDialogControls(MixerWindow, &rect, DlgResource, Index);
+
+}
+
+BOOL
+CALLBACK
+EnumConnectionsCallback(
+    PSND_MIXER Mixer,
+    DWORD LineID,
+    LPMIXERLINE Line,
+    PVOID Context)
+{
+    WCHAR LineName[MIXER_LONG_NAME_CHARS];
+    DWORD Flags;
+    DWORD wID;
+    RECT rect;
+    UINT ControlCount = 0, Index;
+    LPMIXERCONTROL Control = NULL;
+    HWND hDlgCtrl;
+    PPREFERENCES_CONTEXT PrefContext = (PPREFERENCES_CONTEXT)Context;
+
+    if (Line->cControls != 0)
+    {
+      /* get line name */
+      if (SndMixerGetLineName(PrefContext->MixerWindow->Mixer, PrefContext->SelectedLine, LineName, MIXER_LONG_NAME_CHARS, TRUE) == -1)
+      {
+          /* failed to get line name */
+          LineName[0] = L'\0';
+      }
+
+      /* check if line is found in registry settings */
+      if (ReadLineConfig(PrefContext->DeviceName,
+                         LineName,
+                         Line->szName,
+                         &Flags))
+      {
+          /* is it selected */
+          if (Flags != 0x4)
+          {
+              /* load dialog resource */
+              LoadDialog(hAppInstance, PrefContext->MixerWindow, MAKEINTRESOURCE(IDD_VOLUME_CTRL), PrefContext->Count);
+
+              /* get id */
+              wID = (PrefContext->Count + 1) * IDC_LINE_NAME;
+
+              /* set line name */
+              SetDlgItemTextW(PrefContext->MixerWindow->hWnd, wID, Line->szName);
+
+              /* query controls */
+              if (SndMixerQueryControls(Mixer, &ControlCount, Line, &Control) == TRUE)
+              {
+                  /* now go through all controls and update their states */
+                  for(Index = 0; Index < ControlCount; Index++)
+                  {
+                     if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_SWITCH)
+                     {
+                         MIXERCONTROLDETAILS_BOOLEAN Details;
+
+                         /* get volume control details */
+                         if (SndMixerGetVolumeControlDetails(Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_BOOLEAN), (LPVOID)&Details) != -1)
+                         {
+                             /* update dialog control */
+                             wID = (PrefContext->Count + 1) * IDC_LINE_SWITCH;
+
+                            /* get dialog control */
+                            hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, wID);
+
+                            if (hDlgCtrl != NULL)
+                            {
+                                /* check state */
+                                if (SendMessageW(hDlgCtrl, BM_GETCHECK, 0, 0) != Details.fValue)
+                                {
+                                    /* update control state */
+                                    SendMessageW(hDlgCtrl, BM_SETCHECK, (WPARAM)Details.fValue, 0);
+                                }
+                            }
+                         }
+                     }
+                     else if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_FADER)
+                     {
+                         MIXERCONTROLDETAILS_UNSIGNED Details;
+
+                         /* get volume control details */
+                         if (SndMixerGetVolumeControlDetails(Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&Details) != -1)
+                         {
+                             /* update dialog control */
+                             DWORD Position;
+                             DWORD Step = 0x10000 / 5;
+
+                             /* FIXME: give me granularity */
+                             Position = 5 - (Details.dwValue / Step);
+
+                             /* FIXME support left - right slider */
+                             wID = (PrefContext->Count + 1) * IDC_LINE_SLIDER_VERT;
+
+                             /* get dialog control */
+                             hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, wID);
+
+                             if (hDlgCtrl != NULL)
+                             {
+                                 /* check state */
+                                 LRESULT OldPosition = SendMessageW(hDlgCtrl, TBM_GETPOS, 0, 0);
+                                 if (OldPosition != Position)
+                                 {
+                                     /* update control state */
+                                     SendMessageW(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, Position + Index);
+                                 }
+                             }
+                        }
+                     }
+                  }
+
+                  /* free controls */
+                  HeapFree(GetProcessHeap(), 0, Control);
+              }
+
+              /* increment dialog count */
+              PrefContext->Count++;
+
+              /* get application rectangle */
+              GetWindowRect(PrefContext->MixerWindow->hWnd, &rect);
+
+              /* now move the window */
+              MoveWindow(PrefContext->MixerWindow->hWnd, rect.left, rect.top, (PrefContext->Count * DIALOG_VOLUME_SIZE), rect.bottom - rect.top, TRUE);
+          }
+      }
+    }
+    return TRUE;
+}
+
+VOID
+LoadDialogCtrls(
+    PPREFERENCES_CONTEXT PrefContext)
+{
+    HWND hDlgCtrl;
+
+    /* set dialog count to zero */
+    PrefContext->Count = 0;
+
+    /* enumerate controls */
+    SndMixerEnumConnections(PrefContext->MixerWindow->Mixer, PrefContext->SelectedLine, EnumConnectionsCallback, (PVOID)PrefContext);
+
+    /* get last line seperator */
+    hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, IDC_LINE_SEP * PrefContext->Count);
+
+    if (hDlgCtrl != NULL)
+    {
+        /* hide last seperator */
+        ShowWindow(hDlgCtrl, SW_HIDE);
+    }
+
+}
+
+VOID
+UpdateDialogLineSwitchControl(
+    PPREFERENCES_CONTEXT PrefContext,
+    LPMIXERLINE Line,
+    LONG fValue)
+{
+    DWORD Index;
+    DWORD wID;
+    HWND hDlgCtrl;
+    WCHAR LineName[MIXER_LONG_NAME_CHARS];
+
+    /* find the index of this line */
+    for(Index = 0; Index < PrefContext->Count; Index++)
+    {
+        /* get id */
+        wID = (Index + 1) * IDC_LINE_NAME;
+
+        if (GetDlgItemText(PrefContext->MixerWindow->hWnd, wID, LineName, MIXER_LONG_NAME_CHARS) == 0)
+        {
+            /* failed to retrieve id */
+            continue;
+        }
+
+        /* check if the line name matches */
+        if (!wcsicmp(LineName, Line->szName))
+        {
+            /* found matching line name */
+            wID = (Index + 1) * IDC_LINE_SWITCH;
+
+            /* get dialog control */
+            hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, wID);
+
+            if (hDlgCtrl != NULL)
+            {
+                /* check state */
+                if (SendMessageW(hDlgCtrl, BM_GETCHECK, 0, 0) != fValue)
+                {
+                    /* update control state */
+                    SendMessageW(hDlgCtrl, BM_SETCHECK, (WPARAM)fValue, 0);
+                }
+            }
+            break;
+        }
+    }
+}
+
+VOID
+UpdateDialogLineSliderControl(
+    PPREFERENCES_CONTEXT PrefContext,
+    LPMIXERLINE Line,
+    DWORD dwControlID,
+    DWORD dwDialogID,
+    DWORD Position)
+{
+    DWORD Index;
+    DWORD wID;
+    HWND hDlgCtrl;
+    WCHAR LineName[MIXER_LONG_NAME_CHARS];
+
+    /* find the index of this line */
+    for(Index = 0; Index < PrefContext->Count; Index++)
+    {
+        /* get id */
+        wID = (Index + 1) * IDC_LINE_NAME;
+
+        if (GetDlgItemText(PrefContext->MixerWindow->hWnd, wID, LineName, MIXER_LONG_NAME_CHARS) == 0)
+        {
+            /* failed to retrieve id */
+            continue;
+        }
+
+        /* check if the line name matches */
+        if (!wcsicmp(LineName, Line->szName))
+        {
+            /* found matching line name */
+            wID = (Index + 1) * dwDialogID;
+
+            /* get dialog control */
+            hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, wID);
+
+            if (hDlgCtrl != NULL)
+            {
+                /* check state */
+                LRESULT OldPosition = SendMessageW(hDlgCtrl, TBM_GETPOS, 0, 0);
+                if (OldPosition != Position)
+                {
+                    /* update control state */
+                    SendMessageW(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, Position + Index);
+                }
+            }
+            break;
+        }
+    }
+}
+
--- a/base/applications/sndvol32/lang/bg-BG.rc
+++ b/base/applications/sndvol32/lang/bg-BG.rc
@ -26,7 +26,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Ñâîéñòâà"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&Ñìåñèòåëíî óñòðîéñòâî:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -41,3 +41,17 @@ BEGIN
  PUSHBUTTON "Äîáðå", IDOK, 114,226,50,14
  PUSHBUTTON "Îòêàç", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/cs-CZ.rc
+++ b/base/applications/sndvol32/lang/cs-CZ.rc
@ -1,7 +1,7 @@
 /* FILE:        applications/sndvol32/lang/cs-CZ.rc
 * TRANSLATOR:  Radek Liska aka Black_Fox (radekliska at gmail dot com)
 * THANKS TO:   Denzil, who translated major part of this file
- * UPDATED:     2010-05-25
+ * UPDATED:     2011-04-09
 */

 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
@ -32,7 +32,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Možnosti"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&Smìšovací zaøízení:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -47,3 +47,17 @@ BEGIN
  PUSHBUTTON "OK", IDOK, 114,226,50,14
  PUSHBUTTON "Storno", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Celková hlasitost", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Vyvážení", -1, 4, 35, 80, 42
+   LTEXT "Hlasitost", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Ztlumit", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/de-DE.rc
+++ b/base/applications/sndvol32/lang/de-DE.rc
@ -26,7 +26,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Eigenschaften"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&Mixer:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -41,3 +41,17 @@ BEGIN
  PUSHBUTTON "OK", IDOK, 114,226,50,14
  PUSHBUTTON "Abbrechen", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Lautstärke", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Stumm", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/el-GR.rc
+++ b/base/applications/sndvol32/lang/el-GR.rc
@ -26,7 +26,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Éäéüôçôåò"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&ÓõóêåõÞ ìßîçò:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -41,3 +41,17 @@ BEGIN
  PUSHBUTTON "OK", IDOK, 114,226,50,14
  PUSHBUTTON "¢êõñï", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/en-US.rc
+++ b/base/applications/sndvol32/lang/en-US.rc
@ -26,7 +26,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Properties"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&Mixer device:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -41,3 +41,17 @@ BEGIN
  PUSHBUTTON "OK", IDOK, 114,226,50,14
  PUSHBUTTON "Cancel", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/es-ES.rc
+++ b/base/applications/sndvol32/lang/es-ES.rc
@ -30,7 +30,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Propiedades"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&Dispositivo me&zclador:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -45,3 +45,17 @@ BEGIN
  PUSHBUTTON "Aceptar", IDOK, 114,226,50,14
  PUSHBUTTON "Cancelar", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volumen", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Silencio", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/fr-FR.rc
+++ b/base/applications/sndvol32/lang/fr-FR.rc
@ -26,7 +26,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Propriétés"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&Périphérique de mixage :", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -42,3 +42,16 @@ BEGIN
  PUSHBUTTON "Annuler", IDCANCEL, 168,226,50,14
 END

+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Volume principal", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Muet", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200
+END
--- a/base/applications/sndvol32/lang/hu-HU.rc
+++ b/base/applications/sndvol32/lang/hu-HU.rc
@ -30,7 +30,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Tulajdonságok"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&Keverõ eszköz:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -45,3 +45,17 @@ BEGIN
  PUSHBUTTON "OK", IDOK, 114,226,50,14
  PUSHBUTTON "Mégse", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/id-ID.rc
+++ b/base/applications/sndvol32/lang/id-ID.rc
@ -26,7 +26,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Properti"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&Mixer device:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -41,3 +41,17 @@ BEGIN
  PUSHBUTTON "OK", IDOK, 114,226,50,14
  PUSHBUTTON "Batal", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/it-IT.rc
+++ b/base/applications/sndvol32/lang/it-IT.rc
@ -26,7 +26,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Proprietà"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&Mixer:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -41,3 +41,17 @@ BEGIN
  PUSHBUTTON "OK", IDOK, 114,226,50,14
  PUSHBUTTON "Annulla", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Bilanciamento", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Disattiva", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/ja-JP.rc
+++ b/base/applications/sndvol32/lang/ja-JP.rc
@ -26,7 +26,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "プロパティ"
-FONT 9, "MS UI Gothic", 0, 0, 0x0
+FONT 9, "MS UI Gothic"
 BEGIN
  LTEXT "ミキサー デバイス(&M):", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -41,3 +41,17 @@ BEGIN
  PUSHBUTTON "OK", IDOK, 114,226,50,14
  PUSHBUTTON "キャンセル", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 9, "MS UI Gothic"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/ko-KR.rc
+++ b/base/applications/sndvol32/lang/ko-KR.rc
@ -29,7 +29,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "속성"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "믹서 장치(&M):", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -44,3 +44,17 @@ BEGIN
  PUSHBUTTON "확인", IDOK, 114,226,50,14
  PUSHBUTTON "취소", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/lt-LT.rc
+++ b/base/applications/sndvol32/lang/lt-LT.rc
@ -28,7 +28,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Nustatymai"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&Garsø maiðymo árenginys:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -43,3 +43,17 @@ BEGIN
  PUSHBUTTON "Gerai", IDOK, 114,226,50,14
  PUSHBUTTON "Atsisakyti", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/nl-NL.rc
+++ b/base/applications/sndvol32/lang/nl-NL.rc
@ -26,7 +26,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Eigenschappen"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&Mixerapparaat:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -41,3 +41,17 @@ BEGIN
  PUSHBUTTON "OK", IDOK, 114,226,50,14
  PUSHBUTTON "Annuleren", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/no-NO.rc
+++ b/base/applications/sndvol32/lang/no-NO.rc
@ -26,7 +26,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Egenskaper"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&Mikser enhet:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -41,3 +41,17 @@ BEGIN
  PUSHBUTTON "OK", IDOK, 114,226,50,14
  PUSHBUTTON "Avbryt", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/pl-PL.rc
+++ b/base/applications/sndvol32/lang/pl-PL.rc
@ -2,6 +2,7 @@
 *         translated by TestamenT
 *      testament@users.sourceforge.net
 * https://sourceforge.net/projects/reactospl
+ * Update by Caemyr - Olaf Siejka (Apr, 2011)
 *
 */

@ -33,7 +34,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "W³aœciwoœci"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "Urz¹dzenie &miksuj¹ce", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -48,3 +49,17 @@ BEGIN
  PUSHBUTTON "OK", IDOK, 114,226,50,14
  PUSHBUTTON "Anuluj", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Kana³ g³ówny", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balans", -1, 4, 35, 80, 42
+   LTEXT "G³oœnoœæ", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Wycisz", IDC_LINE_SWITCH, 4, 190, 90, 12
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/pt-BR.rc
+++ b/base/applications/sndvol32/lang/pt-BR.rc
@ -32,7 +32,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Propriedades"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "Dispositivo de &mixagem:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -47,3 +47,17 @@ BEGIN
  PUSHBUTTON "OK", IDOK, 114,226,50,14
  PUSHBUTTON "Cancelar", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/ru-RU.rc
+++ b/base/applications/sndvol32/lang/ru-RU.rc
@ -28,7 +28,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Ñâîéñòâà"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&Ìèêøåð:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -43,3 +43,17 @@ BEGIN
  PUSHBUTTON "OK", IDOK, 114,226,50,14
  PUSHBUTTON "Îòìåíà", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/sk-SK.rc
+++ b/base/applications/sndvol32/lang/sk-SK.rc
@ -30,7 +30,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Vlastnosti"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&Zariadenie zmiešavaèa:", -1, 7,4,43,16
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -45,3 +45,17 @@ BEGIN
  PUSHBUTTON "OK", IDOK, 114,226,50,14
  PUSHBUTTON "Zruši<C5A1>", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/sv-SE.rc
+++ b/base/applications/sndvol32/lang/sv-SE.rc
@ -46,7 +46,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Inställningar"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&Mixerenhet:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -61,3 +61,17 @@ BEGIN
  PUSHBUTTON "OK", IDOK, 114,226,50,14
  PUSHBUTTON "Avbryt", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/th-TH.rc
+++ b/base/applications/sndvol32/lang/th-TH.rc
@ -34,7 +34,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "¤Ø³ÊÁºÑµÔ"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "ÍØ»¡Ã³ì&»ÃÑºáµè§àÊÕÂ§:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -49,3 +49,17 @@ BEGIN
  PUSHBUTTON "µ¡Å§", IDOK, 114,226,50,14
  PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/lang/uk-UA.rc
+++ b/base/applications/sndvol32/lang/uk-UA.rc
@ -34,7 +34,7 @@ END
 IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Âëàñòèâîñò³"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg"
 BEGIN
  LTEXT "&Ì³êøåð:", -1, 7,8,48,9
  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
@ -49,3 +49,17 @@ BEGIN
  PUSHBUTTON "OK", IDOK, 114,226,50,14
  PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 168,226,50,14
 END
+
+IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150
+STYLE WS_POPUP | WS_BORDER
+FONT 8, "MS Shell Dlg"
+BEGIN
+   LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15
+   CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 
+   LTEXT "Balance", -1, 4, 35, 80, 42
+   LTEXT "Volume", -1, 4, 100, 77, 108
+   CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30
+   CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70
+   CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX
+   CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200  
+END
--- a/base/applications/sndvol32/misc.c
+++ b/base/applications/sndvol32/misc.c
@ -23,7 +23,8 @@
 * FILE:        subsys/system/sndvol32/misc.c
 * PROGRAMMERS: Thomas Weidenmueller <w3seek@reactos.com>
 */
-#include <sndvol32.h>
+#include "sndvol32.h"
+

 static INT
 LengthOfStrResource(IN HINSTANCE hInst,
@ -125,13 +126,6 @@ LoadAndFormatString(IN HINSTANCE hInstance,
    return Ret;
 }

-/* NOTE: do NOT modify SNDVOL_REG_LINESTATE for binary compatibility with XP! */
-typedef struct _SNDVOL_REG_LINESTATE
-{
-    DWORD Flags;
-    WCHAR LineName[MIXER_LONG_NAME_CHARS];
-} SNDVOL_REG_LINESTATE, *PSNDVOL_REG_LINESTATE;
-
 static const TCHAR AppRegSettings[] = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Volume Control");
 static const TCHAR AppOptionsKey[] = TEXT("Options");
 static const TCHAR LineStatesValue[] = TEXT("LineStates");
@ -163,6 +157,41 @@ CloseAppConfig(VOID)
    }
 }

+BOOL
+WriteLineConfig(IN LPTSTR szDeviceName,
+                IN LPTSTR szLineName,
+                IN PSNDVOL_REG_LINESTATE LineState,
+                IN DWORD cbSize)
+{
+    HKEY hLineKey;
+    TCHAR szDevRegKey[MAX_PATH];
+    BOOL Ret = FALSE;
+
+    _stprintf(szDevRegKey,
+              TEXT("%s\\%s"),
+              szDeviceName,
+              szLineName);
+
+    if (RegCreateKeyEx(hAppSettingsKey,
+                       szDevRegKey,
+                       0,
+                       NULL,
+                       REG_OPTION_NON_VOLATILE,
+                       KEY_READ | KEY_WRITE,
+                       NULL,
+                       &hLineKey,
+                       NULL) == ERROR_SUCCESS)
+    {
+        /* now update line states */
+        RegSetValueEx(hLineKey, LineStatesValue, 0, REG_BINARY, (const BYTE*)LineState, cbSize);
+        Ret = TRUE;
+
+        RegCloseKey(hLineKey);
+    }
+
+    return Ret;
+}
+
 BOOL
 ReadLineConfig(IN LPTSTR szDeviceName,
               IN LPTSTR szLineName,
@ -204,7 +233,7 @@ ReadLineConfig(IN LPTSTR szDeviceName,
        }

        LineStates = HeapAlloc(GetProcessHeap(),
-                               0,
+                               HEAP_ZERO_MEMORY,
                               Size);

        if (LineStates != NULL)
--- a/base/applications/sndvol32/mixer.c
+++ b/base/applications/sndvol32/mixer.c
@ -23,7 +23,7 @@
 * FILE:        subsys/system/sndvol32/mixer.c
 * PROGRAMMERS: Thomas Weidenmueller <w3seek@reactos.com>
 */
-#include <sndvol32.h>
+#include "sndvol32.h"

 #define NO_MIXER_SELECTED ((UINT)(~0))

@ -107,7 +107,7 @@ SndMixerClose(PSND_MIXER Mixer)
    }
 }

-static BOOL
+BOOL
 SndMixerQueryControls(PSND_MIXER Mixer,
                      PUINT DisplayControls,
                      LPMIXERLINE LineInfo,
@ -116,7 +116,7 @@ SndMixerQueryControls(PSND_MIXER Mixer,
    if (LineInfo->cControls > 0)
    {
        *Controls = (MIXERCONTROL*) HeapAlloc(GetProcessHeap(),
-                              0,
+                              HEAP_ZERO_MEMORY,
                              LineInfo->cControls * sizeof(MIXERCONTROL));
        if (*Controls != NULL)
        {
@ -207,7 +207,7 @@ SndMixerQueryConnections(PSND_MIXER Mixer,
            }

            Con = (SND_MIXER_CONNECTION*) HeapAlloc(GetProcessHeap(),
-                            0,
+                            HEAP_ZERO_MEMORY,
                            sizeof(SND_MIXER_CONNECTION));
            if (Con != NULL)
            {
@ -469,6 +469,52 @@ SndMixerEnumProducts(PSND_MIXER Mixer,
    return Ret;
 }

+INT
+SndMixerSetVolumeControlDetails(PSND_MIXER Mixer, DWORD dwControlID, DWORD cbDetails, LPVOID paDetails)
+{
+    MIXERCONTROLDETAILS MixerDetails;
+
+    if (Mixer->hmx)
+    {
+        MixerDetails.cbStruct = sizeof(MIXERCONTROLDETAILS);
+        MixerDetails.dwControlID = dwControlID;
+        MixerDetails.cChannels = 1; //FIXME
+        MixerDetails.cMultipleItems = 0;
+        MixerDetails.cbDetails = cbDetails;
+        MixerDetails.paDetails = paDetails;
+
+        if (mixerSetControlDetails((HMIXEROBJ)Mixer->hmx, &MixerDetails, MIXER_GETCONTROLDETAILSF_VALUE | MIXER_OBJECTF_HMIXER) == MMSYSERR_NOERROR)
+        {
+            return 1;
+        }
+    }
+
+    return -1;
+}
+
+
+INT
+SndMixerGetVolumeControlDetails(PSND_MIXER Mixer, DWORD dwControlID, DWORD cbDetails, LPVOID paDetails)
+{
+    MIXERCONTROLDETAILS MixerDetails;
+
+    if (Mixer->hmx)
+    {
+        MixerDetails.cbStruct = sizeof(MIXERCONTROLDETAILS);
+        MixerDetails.dwControlID = dwControlID;
+        MixerDetails.cChannels = 1; //FIXME
+        MixerDetails.cMultipleItems = 0;
+        MixerDetails.cbDetails = cbDetails;
+        MixerDetails.paDetails = paDetails;
+
+        if (mixerGetControlDetails((HMIXEROBJ)Mixer->hmx, &MixerDetails, MIXER_GETCONTROLDETAILSF_VALUE | MIXER_OBJECTF_HMIXER) == MMSYSERR_NOERROR)
+        {
+            return 1;
+        }
+    }
+    return -1;
+}
+
 INT
 SndMixerGetDestinationCount(PSND_MIXER Mixer)
 {
--- a/base/applications/sndvol32/resources.h
+++ b/base/applications/sndvol32/resources.h
@ -10,7 +10,7 @@
 #define IDC_HELP_TOPICS 1101
 #define IDC_ABOUT 1102

-#define IDD_PREFERENCES 101
+
 #define IDC_MIXERDEVICE 1001
 #define IDC_PLAYBACK 1002
 #define IDC_RECORDING 1003
@ -18,6 +18,14 @@
 #define IDC_LINE 1005
 #define IDC_LABELCONTROLS 1006
 #define IDC_CONTROLS 1007
+#define IDC_LINE_NAME 1008
+#define IDC_LINE_SWITCH 1009
+#define IDC_LINE_SLIDER_HORZ 1010
+#define IDC_LINE_SLIDER_VERT 1011
+#define IDC_LINE_SEP 1012

 #define IDS_SNDVOL32 100
 #define IDS_NOMIXERDEVICES 101
+
+#define IDD_VOLUME_CTRL 200
+#define IDD_PREFERENCES 201
--- a/base/applications/sndvol32/sndvol32.c
+++ b/base/applications/sndvol32/sndvol32.c
@ -23,13 +23,14 @@
 * FILE:        subsys/system/sndvol32/sndvol32.c
 * PROGRAMMERS: Thomas Weidenmueller <w3seek@reactos.com>
 */
-#include <sndvol32.h>
+#include "sndvol32.h"

 HINSTANCE hAppInstance;
 ATOM MainWindowClass;
 HWND hMainWnd;
 HANDLE hAppHeap;
 LPTSTR lpAppTitle;
+PREFERENCES_CONTEXT Preferences;

 #define GetDialogData(hwndDlg, type) \
    ( P##type )GetWindowLongPtr((hwndDlg), DWLP_USER)
@ -38,21 +39,7 @@ LPTSTR lpAppTitle;

 /******************************************************************************/

-typedef struct _PREFERENCES_CONTEXT
-{
-    PMIXER_WINDOW MixerWindow;
-    PSND_MIXER Mixer;
-    HWND hwndDlg;

-    UINT Selected;
-    DWORD SelectedLine;
-    DWORD PlaybackID;
-    DWORD RecordingID;
-    UINT OtherLines;
-    TCHAR DeviceName[128];
-
-    DWORD tmp;
-} PREFERENCES_CONTEXT, *PPREFERENCES_CONTEXT;

 typedef struct _PREFERENCES_FILL_DEVICES
 {
@ -212,7 +199,7 @@ PrefDlgAddConnection(PSND_MIXER Mixer,
                                    PrefContext->SelectedLine,
                                    LineName,
                                    MIXER_LONG_NAME_CHARS,
-                                    FALSE) == -1)
+                                    TRUE) == -1)
            {
                LineName[0] = TEXT('\0');
            }
@ -351,6 +338,69 @@ UpdatePrefDlgControls(PPREFERENCES_CONTEXT Context,
    }
 }

+static 
+VOID
+WriteLineSettings(PPREFERENCES_CONTEXT Context, HWND hwndDlg)
+{
+    HWND hwndControls;
+    INT Count, Index;
+    WCHAR LineName[MIXER_LONG_NAME_CHARS];
+    WCHAR DestinationName[MIXER_LONG_NAME_CHARS];
+    DWORD Flags;
+    PSNDVOL_REG_LINESTATE LineStates;
+
+    /* get list view */
+    hwndControls = GetDlgItem(hwndDlg, IDC_CONTROLS);
+
+    /* get list item count */
+    Count = ListView_GetItemCount(hwndControls);
+
+    /* sanity check */
+    assert(Count);
+
+    if (SndMixerGetLineName(Context->Mixer, Context->SelectedLine, DestinationName, MIXER_LONG_NAME_CHARS, TRUE) == -1)
+    {
+        /* failed to get destination line name */
+        return;
+    }
+
+    /* allocate line states array */
+    LineStates = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SNDVOL_REG_LINESTATE) * Count);
+    if (LineStates == NULL)
+    {
+        /* failed to allocate line states array */
+        return;
+    }
+
+
+    for(Index = 0; Index < Count; Index++)
+    {
+        /* set to empty */
+        LineName[0] = L'\0';
+
+        /* get item text */
+        ListView_GetItemText(hwndControls, Index, 0, LineName, MIXER_LONG_NAME_CHARS);
+
+        /* make sure it is null terminated */
+        LineName[MIXER_LONG_NAME_CHARS-1] = L'\0';
+
+        /* get check state */
+        Flags = (ListView_GetCheckState(hwndControls, Index) == 0 ? 0x4 : 0);
+
+        /* copy line name */
+        wcscpy(LineStates[Index].LineName, LineName);
+
+        /* store flags */
+        LineStates[Index].Flags = Flags;
+    }
+
+    /* now write the line config */
+    WriteLineConfig(Context->DeviceName, DestinationName, LineStates, sizeof(SNDVOL_REG_LINESTATE) * Count);
+
+    /* free line states */
+    HeapFree(GetProcessHeap(), 0, LineStates);
+}
+
 static INT_PTR CALLBACK
 DlgPreferencesProc(HWND hwndDlg,
                   UINT uMsg,
@ -457,6 +507,12 @@ DlgPreferencesProc(HWND hwndDlg,
                }

                case IDOK:
+                {
+                    /* write line settings */
+                    WriteLineSettings(Context, hwndDlg);
+
+                    /* fall through */
+                }
                case IDCANCEL:
                {
                    EndDialog(hwndDlg,
@ -467,18 +523,6 @@ DlgPreferencesProc(HWND hwndDlg,
            break;
        }

-        case MM_MIXM_LINE_CHANGE:
-        {
-            DPRINT("MM_MIXM_LINE_CHANGE\n");
-            break;
-        }
-
-        case MM_MIXM_CONTROL_CHANGE:
-        {
-            DPRINT("MM_MIXM_CONTROL_CHANGE\n");
-            break;
-        }
-
        case WM_INITDIALOG:
        {
            PREFERENCES_FILL_DEVICES FillDevContext;
@ -520,21 +564,10 @@ DlgPreferencesProc(HWND hwndDlg,

            /* update all controls */
            UpdatePrefDlgControls(Context,
-                                  (DWORD)-1);
+                                  (DWORD)Context->SelectedLine);
            return TRUE;
        }

-        case WM_DESTROY:
-        {
-            Context = GetDialogData(hwndDlg,
-                                    PREFERENCES_CONTEXT);
-            if (Context->Mixer != NULL)
-            {
-                SndMixerDestroy(Context->Mixer);
-            }
-            break;
-        }
-
        case WM_CLOSE:
        {
            EndDialog(hwndDlg,
@ -546,22 +579,183 @@ DlgPreferencesProc(HWND hwndDlg,
    return 0;
 }

+
 /******************************************************************************/

 static VOID
 DeleteMixerWindowControls(PMIXER_WINDOW MixerWindow)
 {
-    UNREFERENCED_PARAMETER(MixerWindow);
+    DWORD Index;
+
+    for(Index = 0; Index < MixerWindow->WindowCount; Index++)
+    {
+        /* destroys the window */
+        DestroyWindow(MixerWindow->Window[Index]);
+    }
+
+    /* free memory */
+    HeapFree(GetProcessHeap(), 0, MixerWindow->Window);
+
+    /* set to null */
+    MixerWindow->Window = NULL;
+    MixerWindow->WindowCount = 0;
 }

 static BOOL
-RebuildMixerWindowControls(PMIXER_WINDOW MixerWindow)
+RebuildMixerWindowControls(PPREFERENCES_CONTEXT PrefContext)
 {
-    DeleteMixerWindowControls(MixerWindow);
+    /* delete existing mixer controls */
+    DeleteMixerWindowControls(PrefContext->MixerWindow);
+
+    /* load new mixer controls */
+    LoadDialogCtrls(PrefContext);

    return TRUE;
 }

+static
+BOOL
+CALLBACK
+SetVolumeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Ctx)
+{
+    UINT ControlCount = 0, Index;
+    LPMIXERCONTROL Control = NULL;
+    MIXERCONTROLDETAILS_UNSIGNED uDetails;
+    MIXERCONTROLDETAILS_BOOLEAN bDetails;
+    PSET_VOLUME_CONTEXT Context = (PSET_VOLUME_CONTEXT)Ctx;
+
+    /* check if the line name is equal */
+    if (wcsicmp(Line->szName, Context->LineName))
+    {
+        /* it is not */
+        return TRUE;
+    }
+
+    /* query controls */
+    if (SndMixerQueryControls(Mixer, &ControlCount, Line, &Control) == FALSE)
+    {
+        /* failed to query for controls */
+        return FALSE;
+    }
+
+    /* now go through all controls and compare control ids */
+    for(Index = 0; Index < ControlCount; Index++)
+    {
+        if (Context->bVertical)
+        {
+            if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_FADER)
+            {
+                /* FIXME: give me granularity */
+                DWORD Step = 0x10000 / 5;
+
+                /* set up details */
+                uDetails.dwValue = 0x10000 - Step * Context->SliderPos;
+
+                /* set volume */
+                SndMixerSetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&uDetails);
+
+                /* done */
+                break;
+            }
+        }
+        else if (Context->bSwitch)
+        {
+            if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_SWITCH)
+            {
+                /* set up details */
+                bDetails.fValue = Context->SliderPos;
+
+                /* set volume */
+                SndMixerSetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_BOOLEAN), (LPVOID)&bDetails);
+
+                /* done */
+                break;
+            }
+        }
+        else
+        {
+            /* FIXME: implement left - right channel switch support */
+            assert(0);
+        }
+    }
+
+    /* free controls */
+    HeapFree(GetProcessHeap(), 0, Control);
+
+
+    /* done */
+    return TRUE;
+}
+
+static
+BOOL
+CALLBACK
+MixerControlChangeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Context)
+{
+    UINT ControlCount = 0, Index;
+    LPMIXERCONTROL Control = NULL;
+
+    /* check if the line has controls */
+    if (Line->cControls == 0)
+    {
+        /* no controls */
+        return TRUE;
+    }
+
+    /* query controls */
+    if (SndMixerQueryControls(Mixer, &ControlCount, Line, &Control) == FALSE)
+    {
+        /* failed to query for controls */
+        return FALSE;
+    }
+
+    /* now go through all controls and compare control ids */
+    for(Index = 0; Index < ControlCount; Index++)
+    {
+        if (Control[Index].dwControlID == PtrToUlong(Context))
+        {
+            if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_SWITCH)
+            {
+                MIXERCONTROLDETAILS_BOOLEAN Details;
+
+                /* get volume control details */
+                if (SndMixerGetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_BOOLEAN), (LPVOID)&Details) != -1)
+                {
+                    /* update dialog control */
+                    UpdateDialogLineSwitchControl(&Preferences, Line, Details.fValue);
+                }
+            }
+            else if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_FADER)
+            {
+                MIXERCONTROLDETAILS_UNSIGNED Details;
+
+                /* get volume control details */
+                if (SndMixerGetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&Details) != -1)
+                {
+                    /* update dialog control */
+                    DWORD Position;
+                    DWORD Step = 0x10000 / 5;
+
+                    /* FIXME: give me granularity */
+                    Position = 5 - (Details.dwValue / Step);
+
+                    /* update volume control slider */
+                    UpdateDialogLineSliderControl(&Preferences, Line, Control[Index].dwControlID, IDC_LINE_SLIDER_VERT, Position);
+                }
+            }
+            break;
+        }
+    }
+
+    /* free controls */
+    HeapFree(GetProcessHeap(), 0, Control);
+
+
+    /* done */
+    return TRUE;
+}
+
+
 static LRESULT CALLBACK
 MainWindowProc(HWND hwnd,
               UINT uMsg,
@ -569,7 +763,9 @@ MainWindowProc(HWND hwnd,
               LPARAM lParam)
 {
    PMIXER_WINDOW MixerWindow;
+    DWORD CtrlID, LineOffset;
    LRESULT Result = 0;
+    SET_VOLUME_CONTEXT Context;

    switch (uMsg)
    {
@ -582,18 +778,64 @@ MainWindowProc(HWND hwnd,
            {
                case IDC_PROPERTIES:
                {
-                    PREFERENCES_CONTEXT Preferences;
+                    PREFERENCES_CONTEXT Pref;

-                    Preferences.MixerWindow = MixerWindow;
-                    Preferences.Mixer = NULL;
+                    Pref.MixerWindow = MixerWindow;
+                    Pref.Mixer = NULL;
+                    Pref.SelectedLine = Preferences.SelectedLine;

                    if (DialogBoxParam(hAppInstance,
                                       MAKEINTRESOURCE(IDD_PREFERENCES),
                                       hwnd,
                                       DlgPreferencesProc,
-                                       (LPARAM)&Preferences) == IDOK)
+                                       (LPARAM)&Pref) == IDOK)
                    {
-                        /* FIXME - update window */
+                        /* update window */
+                        TCHAR szProduct[MAXPNAMELEN];
+
+                        /* get mixer product name */
+                        if (SndMixerGetProductName(MixerWindow->Mixer,
+                                                   szProduct,
+                                                   sizeof(szProduct) / sizeof(szProduct[0])) == -1)
+                        {
+                            /* failed to get name */
+                            szProduct[0] = L'\0';
+                        }
+                        else
+                        {
+                            /* copy product */
+                            wcscpy(Preferences.DeviceName, szProduct);
+                        }
+
+                        /* destroy old status bar */
+                        DestroyWindow(MixerWindow->hStatusBar);
+
+                        /* update details */
+                        Preferences.SelectedLine = Pref.SelectedLine;
+
+                        /* destroy old mixer */
+                        SndMixerDestroy(Preferences.MixerWindow->Mixer);
+
+                        /* use new selected mixer */
+                        Preferences.MixerWindow->Mixer = Pref.Mixer;
+
+                        /* rebuild dialog controls */
+                        RebuildMixerWindowControls(&Preferences);
+
+                        /* create status window */
+                        MixerWindow->hStatusBar = CreateStatusWindow(WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS,
+                                                                     NULL,
+                                                                     hwnd,
+                                                                     0);
+
+                        /* set status bar */
+                        if (MixerWindow->hStatusBar)
+                        {
+                            SendMessage(MixerWindow->hStatusBar,
+                                WM_SETTEXT,
+                                0,
+                                (LPARAM)szProduct);
+                        }
                    }
                    break;
                }
@ -614,6 +856,35 @@ MainWindowProc(HWND hwnd,
                               hAppIcon);
                    break;
                }
+
+                default:
+                {
+                    /* get button id */
+                    CtrlID = LOWORD(wParam);
+
+                    /* check if the message is from the line switch */
+                    if (HIWORD(wParam) == BN_CLICKED && (CtrlID % IDC_LINE_SWITCH == 0))
+                    {
+                         /* compute line offset */
+                         LineOffset = CtrlID / IDC_LINE_SWITCH;
+
+                        /* compute window id of line name static control */
+                        CtrlID = LineOffset * IDC_LINE_NAME;
+
+                       /* get line name */
+                       if (GetDlgItemTextW(hwnd, CtrlID, Context.LineName, MIXER_LONG_NAME_CHARS) != 0)
+                       {
+                           /* setup context */
+                           Context.SliderPos = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0);
+                           Context.bVertical = FALSE;
+                           Context.bSwitch = TRUE;
+
+                           /* set volume */
+                           SndMixerEnumConnections(Preferences.MixerWindow->Mixer, Preferences.SelectedLine, SetVolumeCallback, (LPVOID)&Context);
+                       }
+                    }
+                }
+
            }
            break;
        }
@ -627,9 +898,49 @@ MainWindowProc(HWND hwnd,
        case MM_MIXM_CONTROL_CHANGE:
        {
            DPRINT("MM_MIXM_CONTROL_CHANGE\n");
+
+            /* get mixer window */
+            MixerWindow = GetWindowData(hwnd,
+                                        MIXER_WINDOW);
+
+            /* sanity checks */
+            assert(MixerWindow);
+            assert(MixerWindow->Mixer->hmx == (HMIXER)wParam);
+
+            SndMixerEnumConnections(MixerWindow->Mixer, Preferences.SelectedLine, MixerControlChangeCallback, (PVOID)lParam);
            break;
        }

+        case WM_VSCROLL:
+        {
+            if (LOWORD(wParam) == TB_THUMBTRACK)
+            {
+                /* get dialog item ctrl */
+                CtrlID = GetDlgCtrlID((HWND)lParam);
+
+                /* get line index */
+                LineOffset = CtrlID / IDC_LINE_SLIDER_VERT;
+
+                /* compute window id of line name static control */
+                CtrlID = LineOffset * IDC_LINE_NAME;
+
+                /* get line name */
+                if (GetDlgItemTextW(hwnd, CtrlID, Context.LineName, MIXER_LONG_NAME_CHARS) != 0)
+                {
+                    /* setup context */
+                    Context.SliderPos = HIWORD(wParam);
+                    Context.bVertical = TRUE;
+                    Context.bSwitch = FALSE;
+
+                    /* set volume */
+                    SndMixerEnumConnections(Preferences.MixerWindow->Mixer, Preferences.SelectedLine, SetVolumeCallback, (LPVOID)&Context);
+                }
+            }
+
+            break;
+        }
+
+
        case WM_CREATE:
        {
            MixerWindow = ((LPCREATESTRUCT)lParam)->lpCreateParams;
@ -637,44 +948,56 @@ MainWindowProc(HWND hwnd,
                             GWL_USERDATA,
                             (LONG_PTR)MixerWindow);
            MixerWindow->hWnd = hwnd;
-            MixerWindow->hStatusBar = CreateStatusWindow(WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS,
-                                                         NULL,
-                                                         hwnd,
-                                                         0);
-            if (MixerWindow->hStatusBar != NULL)
+            MixerWindow->Mixer = SndMixerCreate(MixerWindow->hWnd);
+            if (MixerWindow->Mixer != NULL)
            {
-                MixerWindow->Mixer = SndMixerCreate(MixerWindow->hWnd);
-                if (MixerWindow->Mixer != NULL)
+                TCHAR szProduct[MAXPNAMELEN];
+
+                /* get mixer product name */
+                if (SndMixerGetProductName(MixerWindow->Mixer,
+                                           szProduct,
+                                           sizeof(szProduct) / sizeof(szProduct[0])) == -1)
                {
-                    TCHAR szProduct[MAXPNAMELEN];
-
-                    if (SndMixerGetProductName(MixerWindow->Mixer,
-                                               szProduct,
-                                               sizeof(szProduct) / sizeof(szProduct[0])) > 0)
-                    {
-                        SendMessage(MixerWindow->hStatusBar,
-                                    WM_SETTEXT,
-                                    0,
-                                    (LPARAM)szProduct);
-                    }
-
-                    if (!RebuildMixerWindowControls(MixerWindow))
-                    {
-                        DPRINT("Rebuilding mixer window controls failed!\n");
-                        SndMixerDestroy(MixerWindow->Mixer);
-                        MixerWindow->Mixer = NULL;
-                        Result = -1;
-                    }
+                    /* failed to get name */
+                    szProduct[0] = L'\0';
                }
-                else
+
+
+                /* initialize perferences */
+                ZeroMemory(&Preferences, sizeof(Preferences));
+
+                /* store mixer */
+                Preferences.Mixer = MixerWindow->Mixer;
+
+                /* store mixer window */
+                Preferences.MixerWindow = MixerWindow;
+
+                /* first destination line id */
+                Preferences.SelectedLine = 0xFFFF0000;
+
+                /* copy product */
+                wcscpy(Preferences.DeviceName, szProduct);
+
+                if (!RebuildMixerWindowControls(&Preferences))
                {
+                    DPRINT("Rebuilding mixer window controls failed!\n");
+                    SndMixerDestroy(MixerWindow->Mixer);
+                    MixerWindow->Mixer = NULL;
                    Result = -1;
                }
-            }
-            else
-            {
-                DPRINT("Failed to create status window!\n");
-                Result = -1;
+
+                /* create status window */
+                MixerWindow->hStatusBar = CreateStatusWindow(WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS,
+                                                             NULL,
+                                                             hwnd,
+                                                             0);
+                if (MixerWindow->hStatusBar)
+                {
+                    SendMessage(MixerWindow->hStatusBar,
+                                WM_SETTEXT,
+                                0,
+                                (LPARAM)szProduct);
+                }
            }
            break;
        }
@ -746,7 +1069,7 @@ CreateApplicationWindow(VOID)
    HWND hWnd;

    PMIXER_WINDOW MixerWindow = HeapAlloc(hAppHeap,
-                                          0,
+                                          HEAP_ZERO_MEMORY,
                                          sizeof(MIXER_WINDOW));
    if (MixerWindow == NULL)
    {
@ -758,8 +1081,8 @@ CreateApplicationWindow(VOID)
        hWnd = CreateWindowEx(WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT,
                              SZ_APP_CLASS,
                              lpAppTitle,
-                              WS_DLGFRAME | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE,
-                              CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
+                              WS_DLGFRAME | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE, 
+                              0, 0, 300, 315,
                              NULL,
                              LoadMenu(hAppInstance,
                                       MAKEINTRESOURCE(IDM_MAINMENU)),
@ -805,6 +1128,7 @@ _tWinMain(HINSTANCE hInstance,
 {
    MSG Msg;
    int Ret = 1;
+    INITCOMMONCONTROLSEX Controls;

    UNREFERENCED_PARAMETER(hPrevInstance);
 	UNREFERENCED_PARAMETER(lpszCmdLine);
@ -823,7 +1147,10 @@ _tWinMain(HINSTANCE hInstance,
            lpAppTitle = NULL;
        }

-        InitCommonControls();
+        Controls.dwSize = sizeof(INITCOMMONCONTROLSEX);
+        Controls.dwICC = ICC_BAR_CLASSES | ICC_STANDARD_CLASSES;
+
+        InitCommonControlsEx(&Controls);

        if (RegisterApplicationClasses())
        {
--- a/base/applications/sndvol32/sndvol32.h
+++ b/base/applications/sndvol32/sndvol32.h
@ -9,6 +9,7 @@
 #include <tchar.h>
 #include <string.h>
 #include "resources.h"
+#include <assert.h>

 typedef struct _MIXER_WINDOW
 {
@ -16,6 +17,10 @@ typedef struct _MIXER_WINDOW
  HWND hStatusBar;
  struct _SND_MIXER *Mixer;
  UINT SelectedLine;
+  UINT WindowCount;
+  HWND * Window;
+
+
 } MIXER_WINDOW, *PMIXER_WINDOW;

 extern HINSTANCE hAppInstance;
@ -61,6 +66,40 @@ typedef struct _SND_MIXER
  PSND_MIXER_DESTINATION Lines;
 } SND_MIXER, *PSND_MIXER;

+typedef struct _PREFERENCES_CONTEXT
+{
+    PMIXER_WINDOW MixerWindow;
+    PSND_MIXER Mixer;
+    HWND hwndDlg;
+
+    UINT Selected;
+    DWORD SelectedLine;
+    DWORD PlaybackID;
+    DWORD RecordingID;
+    UINT OtherLines;
+    TCHAR DeviceName[128];
+
+    DWORD Count;
+    DWORD tmp;
+} PREFERENCES_CONTEXT, *PPREFERENCES_CONTEXT;
+
+typedef struct
+{
+    WCHAR LineName[MIXER_LONG_NAME_CHARS];
+    UINT SliderPos;
+    BOOL bVertical;
+    BOOL bSwitch;
+
+}SET_VOLUME_CONTEXT, *PSET_VOLUME_CONTEXT;
+
+/* NOTE: do NOT modify SNDVOL_REG_LINESTATE for binary compatibility with XP! */
+typedef struct _SNDVOL_REG_LINESTATE
+{
+    DWORD Flags;
+    WCHAR LineName[MIXER_LONG_NAME_CHARS];
+} SNDVOL_REG_LINESTATE, *PSNDVOL_REG_LINESTATE;
+
+
 typedef BOOL (CALLBACK *PFNSNDMIXENUMLINES)(PSND_MIXER Mixer, LPMIXERLINE Line, UINT DisplayControls, PVOID Context);
 typedef BOOL (CALLBACK *PFNSNDMIXENUMCONNECTIONS)(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Context);
 typedef BOOL (CALLBACK *PFNSNDMIXENUMPRODUCTS)(PSND_MIXER Mixer, UINT Id, LPCTSTR ProductName, PVOID Context);
@ -70,6 +109,8 @@ VOID SndMixerDestroy(PSND_MIXER Mixer);
 VOID SndMixerClose(PSND_MIXER Mixer);
 BOOL SndMixerSelect(PSND_MIXER Mixer, UINT MixerId);
 UINT SndMixerGetSelection(PSND_MIXER Mixer);
+INT SndMixerSetVolumeControlDetails(PSND_MIXER Mixer, DWORD dwControlID, DWORD cbDetails, LPVOID paDetails);
+INT SndMixerGetVolumeControlDetails(PSND_MIXER Mixer, DWORD dwControlID, DWORD cbDetails, LPVOID paDetails);
 INT SndMixerGetProductName(PSND_MIXER Mixer, LPTSTR lpBuffer, UINT uSize);
 INT SndMixerGetLineName(PSND_MIXER Mixer, DWORD LineID, LPTSTR lpBuffer, UINT uSize, BOOL LongName);
 BOOL SndMixerEnumProducts(PSND_MIXER Mixer, PFNSNDMIXENUMPRODUCTS EnumProc, PVOID Context);
@ -77,6 +118,14 @@ INT SndMixerGetDestinationCount(PSND_MIXER Mixer);
 BOOL SndMixerEnumLines(PSND_MIXER Mixer, PFNSNDMIXENUMLINES EnumProc, PVOID Context);
 BOOL SndMixerEnumConnections(PSND_MIXER Mixer, DWORD LineID, PFNSNDMIXENUMCONNECTIONS EnumProc, PVOID Context);
 BOOL SndMixerIsDisplayControl(PSND_MIXER Mixer, LPMIXERCONTROL Control);
+BOOL SndMixerQueryControls(PSND_MIXER Mixer, PUINT DisplayControls, LPMIXERLINE LineInfo, LPMIXERCONTROL *Controls);
+
+/*
+ * dialog.c
+ */
+VOID LoadDialogCtrls(PPREFERENCES_CONTEXT PrefContext);
+VOID UpdateDialogLineSliderControl(PPREFERENCES_CONTEXT PrefContext, LPMIXERLINE Line, DWORD dwControlID, DWORD DialogID, DWORD Position);
+VOID UpdateDialogLineSwitchControl(PPREFERENCES_CONTEXT PrefContext, LPMIXERLINE Line, LONG fValue);

 /*
 * MISC
@ -107,4 +156,10 @@ ReadLineConfig(IN LPTSTR szDeviceName,
               IN LPTSTR szControlName,
               OUT DWORD *Flags);

+BOOL
+WriteLineConfig(IN LPTSTR szDeviceName,
+                IN LPTSTR szLineName,
+                IN PSNDVOL_REG_LINESTATE LineState,
+                IN DWORD cbSize);
+
 #endif /* __SNDVOL32_H */
--- a/base/setup/reactos/lang/cs-CZ.rc
+++ b/base/setup/reactos/lang/cs-CZ.rc
@ -1,119 +1,123 @@
-// Kario was here
+/* FILE:        dll/cpl/console/lang/cs-CZ.rc
+ * TRANSLATOR:  Radek Liska aka Black_Fox (radekliska at gmail dot com)
+ * THANKS TO:   kario for introducing the file
+ * UPDATED:     2011-03-31
+ */

 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT

 IDD_STARTPAGE DIALOGEX DISCARDABLE  0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Instalace ReactOS"
+CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_STARTTITLE, 115, 8, 195, 24
-    LTEXT "ReactOS nelze instalovat pøímo z tohoto CD! Prosím restartujte poèítaè z tohoto CD aby jste nainstalovali ReactOS.", IDC_STATIC, 115, 40, 195, 100
-    LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17
+    LTEXT "Vítejte v průvodci instalace systému ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24
+    LTEXT "Systém ReactOS zatím nelze nainstalovat přímo z tohoto CD! Pro instalaci restartuje počítač z tohoto CD.", IDC_STATIC, 115, 40, 195, 100
+    LTEXT "Klepnutím na Dokončit ukončíte instalaci.", IDC_STATIC, 115, 169, 195, 17
 END

 IDD_LANGSELPAGE DIALOGEX DISCARDABLE  0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Instalace ReactOS"
+CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
+    CONTROL "Jazyk instalace:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
+    CONTROL "Klávesnice či metoda zadávání:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180 ,297, 10
+    LTEXT "Po klepnutí na Další bude možné zvolit typ instalace.", IDC_STATIC, 10, 180 ,297, 10
 END

 IDD_TYPEPAGE DIALOGEX DISCARDABLE  0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Instalace ReactOS"
+CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172
-    CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10
-    LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180 ,297, 10
+    CONTROL "Typ instalace", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172
+    CONTROL "Nainstalovat systém ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
+    CONTROL "Opravit nebo aktualizovat již nainstalovaný systém ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10
+    LTEXT "Po klepnutí na Další bude možné nastavit zařízení.", IDC_STATIC, 10, 180 ,297, 10
 END

 IDD_DEVICEPAGE DIALOGEX DISCARDABLE  0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Instalace ReactOS"
+CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172
-    LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10
+    CONTROL "Nastavení zařízení", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172
+    LTEXT "Počítač:", IDC_STATIC, 20,15, 80, 10
    CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80
-    LTEXT "Display:", IDC_STATIC, 20,35, 80, 10
+    LTEXT "Obrazovka:", IDC_STATIC, 20,35, 80, 10
    CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80
-    LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10
+    LTEXT "Klávesnice:", IDC_STATIC, 20,55, 80, 10
    CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80
-    LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20
+    LTEXT "Po klepnutí na Další bude možné nastavit instalační zařízení.", IDC_STATIC, 10, 180 ,277, 20
 END

 IDD_DRIVEPAGE DIALOGEX DISCARDABLE  0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Instalace ReactOS"
+CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176
+    CONTROL "Oddíl, do kterého bude systém ReactOS nainstalován", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176
    LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15
-    PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED
-    PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15
-    LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180 ,277, 20
+    PUSHBUTTON "&Vytvořit", IDC_PARTCREATE, 20,155,50,15
+    PUSHBUTTON "&Smazat", IDC_PARTDELETE, 76,155,50,15
+    PUSHBUTTON "&Ovladač", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED
+    PUSHBUTTON "&Pokročilé volby...", IDC_PARTMOREOPTS, 218,155,80,15
+    LTEXT "Po klepnutí na Další bude možné zkontrolovat všechna nastavení.", IDC_STATIC, 10, 180 ,277, 20
 END

 IDD_PARTITION DIALOGEX DISCARDABLE  0, 0, 145, 90
 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME
-CAPTION "Create Partition"
+CAPTION "Vytvořit oddíl"
 FONT 8, "MS Shell Dlg"
 BEGIN
    CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13
-    CONTROL "Create and format partition",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57
-    LTEXT "Size:",IDC_STATIC, 13,24,27,9
+    CONTROL "Vytvořit a naformátovat oddíl",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57
+    LTEXT "Velikost:",IDC_STATIC, 13,24,27,9
    EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP
    LTEXT "GB",IDC_UNIT, 117,24,14,9
-    LTEXT "Filesystem:",IDC_STATIC,13,46,35,9
+    LTEXT "Souborový systém:",IDC_STATIC,13,46,35,9
    CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,52,42,79,50
    PUSHBUTTON "&OK",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP
-    PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP
+    PUSHBUTTON "&Storno",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP
 END

 IDD_BOOTOPTIONS DIALOGEX DISCARDABLE  0, 0, 305, 105
 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME
-CAPTION "Advanced Partition Settings"
+CAPTION "Pokročilá nastavení oddílu"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30
+    CONTROL "Instalační složka", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30
    EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE

-    CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41
+    CONTROL "Instalace zavaděče", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41

-    CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11
-    CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11
-    CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11
+    CONTROL "Nainstalovat zavaděč na pevný disk (MBR a VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11
+    CONTROL "Nainstalovat zavaděč na pevný disk (jen VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11
+    CONTROL "Zavaděč neinstalovat", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11
    PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Storno", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE
 END

 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Instalace ReactOS"
+CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172
-    LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20
+    CONTROL "Shrnutí instalace", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172
+    LTEXT "Klepnutím na Další zahájíte instalační proces.", IDC_STATIC, 10, 180 ,277, 20
 END

 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Instalace ReactOS"
+CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172
-    LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10
+    CONTROL "Akce instalace", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172
+    LTEXT "Instalace souborů...", IDC_ACTIVITY, 20, 50, 277, 10
    LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10
    CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32",
            PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@ -121,34 +125,34 @@ END

 IDD_RESTARTPAGE DIALOGEX DISCARDABLE  0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Completing ReactOS Setup"
+CAPTION "Dokončení instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172
-    LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10
+    CONTROL "Dokončení první části instalace systému ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172
+    LTEXT "První část instalace systému ReactOS byla úspěšně dokončena.", IDC_STATIC, 20, 50, 277, 10
 
-    LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10
+    LTEXT "Po klepnutí na Dokončit bude počítač restartován.", IDC_STATIC, 20, 80, 277, 10
    CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
-    LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20
+    LTEXT "Pokud je v mechanice instalační CD, vyjměte jej. Poté kliknutím na Dokončit restartujte počítač.", IDC_STATIC, 10, 180, 297, 20
 END

 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE       "Language Selection"
-    IDS_LANGSUBTITLE    "Choose language for setup and final system."
-    IDS_TYPETITLE       "Welcome to ReactOS Setup"
-    IDS_TYPESUBTITLE    "Choose setup type."
-    IDS_DEVICETITLE     "Setup the basic devices"
-    IDS_DEVICESUBTITLE  "Set the settings of display and keyboard."
-    IDS_DRIVETITLE      "Setup the installation partition and system folder"
-    IDS_DRIVESUBTITLE   "Prepare installation partition, system folder and boot loader."
-    IDS_PROCESSTITLE    "Prepare partition, copy files and setup system"
-    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader"
-    IDS_RESTARTTITLE    "First stage of setup finished"
-    IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage"
-    IDS_SUMMARYTITLE    "Installation Summary"
-    IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device"
-    IDS_ABORTSETUP      "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?"
-    IDS_ABORTSETUP2     "Abort installation?"
+    IDS_LANGTITLE       "Výběr jazyka"
+    IDS_LANGSUBTITLE    "Volba jazyka, který bude použit při instalaci a ve výsledném systému."
+    IDS_TYPETITLE       "Vítejte v průvodci instalace systému ReactOS"
+    IDS_TYPESUBTITLE    "Volba typu instalace."
+    IDS_DEVICETITLE     "Nastavení základních zařízení"
+    IDS_DEVICESUBTITLE  "Volba nastavení obrazovky a klávesnice."
+    IDS_DRIVETITLE      "Nastavení instalačního oddílu a systémové složky"
+    IDS_DRIVESUBTITLE   "Příprava instalačního oddílu, systémové složky a zavaděče."
+    IDS_PROCESSTITLE    "Příprava oddílu, kopírování souborů a nastavení systému"
+    IDS_PROCESSSUBTITLE "Vytvoření a naformátování oddílu, kopírování souborů, instalace a nastavení zavaděče"
+    IDS_RESTARTTITLE    "První část instalace dokončena"
+    IDS_RESTARTSUBTITLE "První část instalace byla dokončena, po restartování počítače se bude pokračovat druhou částí"
+    IDS_SUMMARYTITLE    "Shrnutí instalace"
+    IDS_SUMMARYSUBTITLE "Výpis voleb instalace k ověření před tím, než začne instalace"
+    IDS_ABORTSETUP      "Systém ReactOS není na tomto počítači kompletně nainstalovaný. Pokud nyní ukončíte instalaci, bude ji pro nainstalování systému ReactOS nutné provést znova. Opravdu ukončit?"
+    IDS_ABORTSETUP2     "Přerušit instalaci?"
 END
 /* EOF */
--- a/base/setup/usetup/lang/cs-CZ.h
+++ b/base/setup/usetup/lang/cs-CZ.h
@ -1,7 +1,7 @@
 /* FILE:        setup/usetup/lang/cs-CZ.rc
 * TRANSLATOR:  Radek Liska aka Black_Fox (radekliska at gmail dot com)
- * THANKS TO:   preston
- * UPDATED:     2010-12-12
+ * THANKS TO:   preston for bugfix advice at line 842
+ * UPDATED:     2011-03-31
 */

 #pragma once
@ -43,7 +43,7 @@ static MUI_ENTRY csCZLanguagePageEntries[] =
    {
        8,
        13,
-        "\x07  Tento jazyk bude defaultn¡m jazykem v nainstalovan‚m syst‚mu.",
+        "\x07  Tento jazyk bude vìchoz¡m jazykem v nainstalovan‚m syst‚mu.",
        TEXT_STYLE_NORMAL
    },
    {
--- a/base/shell/explorer-new/lang/pl-PL.rc
+++ b/base/shell/explorer-new/lang/pl-PL.rc
@ -123,7 +123,7 @@ BEGIN
    IDS_PROPERTIES        "W³aœ&ciwoœci"
    IDS_OPEN_ALL_USERS    "&Otwórz - wszyscy u¿ytkownicy"
    IDS_EXPLORE_ALL_USERS "&Eksploruj - wszyscy u¿ytkownicy"
-    IDS_STARTUP_ERROR     "System nie mo¿e uruchomiæ eksploratora poniewa¿ rejestr jest niedostêpny lub uszkodzony."
+    IDS_STARTUP_ERROR     "System nie mo¿e uruchomiæ eksploratora, poniewa¿ rejestr jest niedostêpny lub uszkodzony."
 END

 STRINGTABLE DISCARDABLE
--- a/base/shell/explorer-new/trayntfy.c
+++ b/base/shell/explorer-new/trayntfy.c
@ -19,14 +19,13 @@
 */

 #include <precomp.h>
-#include <string.h>

 /*
 * TrayClockWnd
 */ 

 static const TCHAR szTrayClockWndClass[] = TEXT("TrayClockWClass");
-static LPCTSTR s_szRegistryKey = _T("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced");
+static LPCTSTR s_szRegistryKey = _T("Software\\ReactOS\\Features\\Explorer");
 BOOL blShowSeconds;

 #define ID_TRAYCLOCK_TIMER  0
--- a/base/shell/explorer/explorer-pl.rc
+++ b/base/shell/explorer/explorer-pl.rc
@ -383,7 +383,7 @@ BEGIN
    IDS_TASKBAR             "Pasek zadañ"
    IDS_NAMECOLUMN          "Nazwa"
    IDS_PATHCOLUMN          "Œcie¿ka"
-    IDS_MENUCOLUMN          "Menu path"
+    IDS_MENUCOLUMN          "Œcie¿ka menu"
 END

 #endif    // Polish (PL) resources
--- a/dll/cpl/console/lang/cs-CZ.rc
+++ b/dll/cpl/console/lang/cs-CZ.rc
@ -1,6 +1,6 @@
 /* FILE:        dll/cpl/console/lang/cs-CZ.rc
 * TRANSLATOR:  Radek Liska aka Black_Fox (radekliska at gmail dot com)
- * UPDATED:     2008-07-27
+ * UPDATED:     2011-03-31
 */

 #include <commctrl.h>
@ -34,15 +34,15 @@ END

 IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "Font"
+CAPTION "Písmo"
 FONT 8, "MS Shell Dlg"
 BEGIN
 	LTEXT "Náhled okna:", -1, 10, 10, 94, 10
 	LTEXT "Velikost:", -1, 180, 10, 36, 10
 	CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
 	LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
-	LTEXT "&Font:", -1, 10, 105, 33, 10
-	CHECKBOX "&Tuèné fonty", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
+	LTEXT "&Písmo:", -1, 10, 105, 33, 10
+	CHECKBOX "&Tuèná písma", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
 	LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
 	GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
 	CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
@ -141,5 +141,5 @@ BEGIN
 	IDS_CPLDESCRIPTION "Nastavit vlastnosti konzole."
 	IDS_APPLY_SHORTCUT_ALL "Zmìnit zá&stupce, který spustil toto okno"
 	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
-	IDS_RASTERFONTS "Rastrové fonty"
+	IDS_RASTERFONTS "Rastrová písma"
 END
--- a/dll/cpl/desk/lang/cs-CZ.rc
+++ b/dll/cpl/desk/lang/cs-CZ.rc
@ -1,6 +1,6 @@
 /* FILE:        dll/cpl/desk/lang/cs-CZ.rc
 * TRANSLATOR:  Radek Liska aka Black_Fox (radekliska at gmail dot com)
- * UPDATED:     2008-07-27
+ * UPDATED:     2011-03-31
 * THANKS TO:   potapnik, who translated major part of this file
 */

@ -105,24 +105,24 @@ END
 IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
-CAPTION "Effects"
+CAPTION "Efekty"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button",
+    CONTROL         "Použít následující &efekt přechodu pro nabídky a popisky:",IDC_EFFAPPEARANCE_ANIMATION,"button",
                    BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19
    COMBOBOX        IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button",
+    CONTROL         "Použít následující metodu vyhlazování &hran obrazovkových písem:",IDC_EFFAPPEARANCE_SMOOTHING,"button",
                    BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19
    COMBOBOX        IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
-    CONTROL         "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button",
+    CONTROL         "Použít velké &ikony",IDC_EFFAPPEARANCE_LARGEICONS,"button",
                    BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19
-    CONTROL         "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button",
+    CONTROL         "Zobrazovat &stíny pod nabídkami",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button",
                    BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19
-    CONTROL         "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button",
+    CONTROL         "Zobrazovat &obsah okna během přesouvání",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button",
                    BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 285, 19
-    CONTROL         "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button",
+    CONTROL         "&Nezobrazovat podtržení písmen u klávesových zkratek, dokud nestisknu klávesu Alt",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button",
                    BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19
-    PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14
+    PUSHBUTTON "Storno", IDCANCEL, 226, 165, 50, 14
    DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END

@ -134,7 +134,7 @@ BEGIN
    LTEXT           "Tažením nastavte ikony monitorù, aby odpovídaly fyzickému uspoøádání vašich monitorù.",-1,3,3,240,10
    CONTROL         "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE
    LTEXT           "&Obrazovka:",1820,3,100,38,8
-    LTEXT           "<none>",IDC_SETTINGS_DEVICE,9,109,224,8
+    LTEXT           "<není>",IDC_SETTINGS_DEVICE,9,109,224,8
    GROUPBOX        "&Velikost obrazovky",1818,3,120,115,43
    CONTROL         "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,
                    30,130,58,17
@ -185,19 +185,19 @@ END

 STRINGTABLE  DISCARDABLE
 BEGIN
-    IDS_SLIDEEFFECT "Slide effect"
-    IDS_FADEEFFECT  "Fade effect"
+    IDS_SLIDEEFFECT "Efekt vysunutí"
+    IDS_FADEEFFECT  "Efekt přechodu"
 END

 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_STANDARDEFFECT  "Standard"
+    IDS_STANDARDEFFECT  "Standardní"
    IDS_CLEARTYPEEFFECT "ClearType"
 END

 STRINGTABLE
 BEGIN
-    IDS_MULTIPLEMONITORS "(Nìkolik monitorù)"
+    IDS_MULTIPLEMONITORS "(Více monitorů)"
    IDS_UNKNOWNMONITOR "(Neznámý monitor)"
    IDS_ADVANCEDTITLEFMT "%s a %s"
 END
--- a/dll/cpl/desk/lang/pl-PL.rc
+++ b/dll/cpl/desk/lang/pl-PL.rc
@ -221,7 +221,7 @@ BEGIN
    IDS_COLOR_4BIT "16 kolorów"
    IDS_COLOR_8BIT "256 kolorów"
    IDS_COLOR_16BIT "High Color (16 Bitów)"
-    IDS_COLOR_24BIT "True Color (24 Bitów)"
+    IDS_COLOR_24BIT "True Color (24 Bity)"
    IDS_COLOR_32BIT "True Color (32 Bity)"
    IDS_PIXEL "%lux%lu pikseli"
 END
--- a/dll/ntdll/def/ntdll.spec
+++ b/dll/ntdll/def/ntdll.spec
@ -417,7 +417,7 @@
@ stdcall RtlAcquireSRWLockShared(ptr)
@ stdcall RtlActivateActivationContext(long ptr ptr)
 ;@ stdcall RtlActivateActivationContextEx
-@ stdcall RtlActivateActivationContextUnsafeFast(ptr ptr)
+@ fastcall RtlActivateActivationContextUnsafeFast(ptr ptr)
@ stdcall RtlAddAccessAllowedAce(ptr long long ptr)
@ stdcall RtlAddAccessAllowedAceEx(ptr long long long ptr)
@ stdcall RtlAddAccessAllowedObjectAce(ptr long long long ptr ptr ptr)
@ -530,7 +530,7 @@
@ stdcall RtlCutoverTimeToSystemTime(ptr ptr ptr long)
@ stdcall RtlDeNormalizeProcessParams(ptr)
@ stdcall RtlDeactivateActivationContext(long long)
-@ stdcall RtlDeactivateActivationContextUnsafeFast(ptr)
+@ fastcall RtlDeactivateActivationContextUnsafeFast(ptr)
 ;@ stdcall RtlDebugPrintTimes
@ stdcall RtlDecodePointer(ptr)
@ stdcall RtlDecodeSystemPointer(ptr) RtlEncodeSystemPointer
--- a/dll/ntdll/ldr/ldrinit.c
+++ b/dll/ntdll/ldr/ldrinit.c
@ -616,8 +616,8 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL)

            /* Set up the Act Ctx */
            ActCtx.Size = sizeof(ActCtx);
-            ActCtx.Frame.Flags = ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID;
-            RtlZeroMemory(&ActCtx, sizeof(ActCtx));
+            ActCtx.Format = 1;
+            RtlZeroMemory(&ActCtx.Frame, sizeof(RTL_ACTIVATION_CONTEXT_STACK_FRAME));

            /* Activate the ActCtx */
            RtlActivateActivationContextUnsafeFast(&ActCtx,
@ -682,8 +682,8 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL)
    {
        /* Set up the Act Ctx */
        ActCtx.Size = sizeof(ActCtx);
-        ActCtx.Frame.Flags = ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID;
-        RtlZeroMemory(&ActCtx, sizeof(ActCtx));
+        ActCtx.Format = 1;
+        RtlZeroMemory(&ActCtx.Frame, sizeof(RTL_ACTIVATION_CONTEXT_STACK_FRAME));

        /* Activate the ActCtx */
        RtlActivateActivationContextUnsafeFast(&ActCtx,
--- a/dll/ntdll/ldr/ldrpe.c
+++ b/dll/ntdll/ldr/ldrpe.c
@ -660,8 +660,8 @@ LdrpWalkImportDescriptor(IN LPWSTR DllPath OPTIONAL,
 DPRINT1("LdrpWalkImportDescriptor('%S' %x)\n", DllPath, LdrEntry);
    /* Set up the Act Ctx */
    ActCtx.Size = sizeof(ActCtx);
-    ActCtx.Frame.Flags = ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID;
-    RtlZeroMemory(&ActCtx, sizeof(ActCtx));
+    ActCtx.Frame.Flags = 1;
+    RtlZeroMemory(&ActCtx.Frame, sizeof(RTL_ACTIVATION_CONTEXT_STACK_FRAME));

    /* Check if we have a manifest prober routine */
    if (LdrpManifestProberRoutine)
--- a/dll/win32/advapi32/reg/reg.c
+++ b/dll/win32/advapi32/reg/reg.c
@ -3974,128 +3974,127 @@ RegQueryReflectionKey(IN HKEY hBase,
 }


-/************************************************************************
- *  RegQueryValueExA
+/******************************************************************************
+ * RegQueryValueExA   [ADVAPI32.@]
 *
- * @implemented
+ * Get the type and contents of a specified value under with a key.
+ *
+ * PARAMS
+ *  hkey      [I]   Handle of the key to query
+ *  name      [I]   Name of value under hkey to query
+ *  reserved  [I]   Reserved - must be NULL
+ *  type      [O]   Destination for the value type, or NULL if not required
+ *  data      [O]   Destination for the values contents, or NULL if not required
+ *  count     [I/O] Size of data, updated with the number of bytes returned
+ *
+ * RETURNS
+ *  Success: ERROR_SUCCESS. *count is updated with the number of bytes copied to data.
+ *  Failure: ERROR_INVALID_HANDLE, if hkey is invalid.
+ *           ERROR_INVALID_PARAMETER, if any other parameter is invalid.
+ *           ERROR_MORE_DATA, if on input *count is too small to hold the contents.
+ *                     
+ * NOTES
+ *   MSDN states that if data is too small it is partially filled. In reality 
+ *   it remains untouched.
 */
-LONG WINAPI
-RegQueryValueExA(HKEY hKey,
-                 LPCSTR lpValueName,
-                 LPDWORD lpReserved,
-                 LPDWORD lpType,
-                 LPBYTE  lpData,
-                 LPDWORD lpcbData)
+LONG
+WINAPI
+RegQueryValueExA(HKEY hkeyorg,
+                 LPCSTR name,
+                 LPDWORD reserved,
+                 LPDWORD type,
+                 LPBYTE data,
+                 LPDWORD count)
 {
-    UNICODE_STRING ValueName;
-    LPWSTR lpValueBuffer;
-    LONG ErrorCode;
-    DWORD Length;
-    DWORD Type;
-    NTSTATUS Status;
-    ULONG Index;
+    HANDLE hkey;
+    NTSTATUS status;
+    ANSI_STRING nameA;
+    UNICODE_STRING nameW;
+    DWORD total_size, datalen = 0;
+    char buffer[256], *buf_ptr = buffer;
+    KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer;
+    static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data );

-    TRACE("hKey 0x%X  lpValueName %s  lpData 0x%X  lpcbData %d\n",
-          hKey, lpValueName, lpData, lpcbData ? *lpcbData : 0);
+    TRACE("(%p,%s,%p,%p,%p,%p=%d)\n",
+          hkey, debugstr_a(name), reserved, type, data, count, count ? *count : 0 );

-    if (lpData != NULL && lpcbData == NULL)
+    if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER;
+    status = MapDefaultKey(&hkey, hkeyorg);
+    if (!NT_SUCCESS(status))
    {
-        return ERROR_INVALID_PARAMETER;
+        return RtlNtStatusToDosError(status);
    }

-    Length = (lpcbData == NULL || lpData == NULL) ? 0 : *lpcbData * sizeof(WCHAR);
+    if (count) datalen = *count;
+    if (!data && count) *count = 0;

-    if (lpData)
+    RtlInitAnsiString( &nameA, name );
+    if ((status = RtlAnsiStringToUnicodeString( &nameW, &nameA, TRUE )))
    {
-        lpValueBuffer = RtlAllocateHeap(ProcessHeap,
-                                        0,
-                                        Length + sizeof(WCHAR));
-        if (!lpValueBuffer)
+        return RtlNtStatusToDosError(status);
+        ClosePredefKey(hkey);
+    }
+
+    status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation,
+                              buffer, sizeof(buffer), &total_size );
+    if (status && status != STATUS_BUFFER_OVERFLOW) goto done;
+
+    /* we need to fetch the contents for a string type even if not requested,
+     * because we need to compute the length of the ASCII string. */
+    if (data || is_string(info->Type))
+    {
+        /* retry with a dynamically allocated buffer */
+        while (status == STATUS_BUFFER_OVERFLOW)
        {
-            return ERROR_OUTOFMEMORY;
-        }
-    }
-    else
-    {
-        lpValueBuffer = NULL;
-
-        if (lpcbData)
-            *lpcbData = 0;
-    }
-
-    if(!RtlCreateUnicodeStringFromAsciiz(&ValueName,
-                                         (LPSTR)lpValueName))
-    {
-        ERR("RtlCreateUnicodeStringFromAsciiz failed!\n");
-        ErrorCode = ERROR_OUTOFMEMORY;
-        goto cleanup;
-    }
-
-    ErrorCode = RegQueryValueExW(hKey,
-                                 ValueName.Buffer,
-                                 lpReserved,
-                                 &Type,
-                                 (LPBYTE)lpValueBuffer,
-                                 &Length);
-    TRACE("ErrorCode %lu\n", ErrorCode);
-
-    RtlFreeUnicodeString(&ValueName);
-
-    if (ErrorCode == ERROR_SUCCESS ||
-        ErrorCode == ERROR_MORE_DATA)
-    {
-
-        if (is_string(Type))
-        {
-            if (ErrorCode == ERROR_SUCCESS && lpValueBuffer != NULL)
+            if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr );
+            if (!(buf_ptr = HeapAlloc( GetProcessHeap(), 0, total_size )))
            {
-                Status = RtlUnicodeToMultiByteN((PCHAR)lpData, *lpcbData, &Index, (PWCHAR)lpValueBuffer, Length);
-                if (NT_SUCCESS(Status))
-                {
-                    PCHAR szData = (PCHAR)lpData;
-                    if(&szData[Index] < (PCHAR)(lpData + *lpcbData))
-                    {
-                        szData[Index] = '\0';
-                    }
-                }
+                status = STATUS_NO_MEMORY;
+                goto done;
+            }
+            info = (KEY_VALUE_PARTIAL_INFORMATION *)buf_ptr;
+            status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation,
+                                      buf_ptr, total_size, &total_size );
+        }
+
+        if (status) goto done;
+
+        if (is_string(info->Type))
+        {
+            DWORD len;
+
+            RtlUnicodeToMultiByteSize( &len, (WCHAR *)(buf_ptr + info_size),
+                                       total_size - info_size );
+            if (data && len)
+            {
+                if (len > datalen) status = STATUS_BUFFER_OVERFLOW;
                else
                {
-                    ErrorCode = RtlNtStatusToDosError(Status);
+                    RtlUnicodeToMultiByteN( (char*)data, len, NULL, (WCHAR *)(buf_ptr + info_size),
+                                            total_size - info_size );
+                    /* if the type is REG_SZ and data is not 0-terminated
+                     * and there is enough space in the buffer NT appends a \0 */
+                    if (len < datalen && data[len-1]) data[len] = 0;
                }
            }
-
-            Length = Length / sizeof(WCHAR);
+            total_size = len + info_size;
        }
-        else if (ErrorCode == ERROR_SUCCESS && lpValueBuffer != NULL)
+        else if (data)
        {
-            if (*lpcbData < Length)
-            {
-                ErrorCode = ERROR_MORE_DATA;
-            }
-            else
-            {
-                RtlMoveMemory(lpData, lpValueBuffer, Length);
-            }
-        }
-
-        if (lpcbData != NULL)
-        {
-            *lpcbData = Length;
+            if (total_size - info_size > datalen) status = STATUS_BUFFER_OVERFLOW;
+            else memcpy( data, buf_ptr + info_size, total_size - info_size );
        }
    }
+    else status = STATUS_SUCCESS;

-    if (lpType != NULL)
-    {
-        *lpType = Type;
-    }
+    if (type) *type = info->Type;
+    if (count) *count = total_size - info_size;

-cleanup:
-    if (lpValueBuffer != NULL)
-    {
-        RtlFreeHeap(ProcessHeap, 0, lpValueBuffer);
-    }
-
-    return ErrorCode;
+ done:
+    if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr );
+    RtlFreeUnicodeString( &nameW );
+    ClosePredefKey(hkey);
+    return RtlNtStatusToDosError(status);
 }


--- a/dll/win32/comctl32/comctl32_ros.diff
+++ b/dll/win32/comctl32/comctl32_ros.diff
@ -139,3 +139,41 @@ Index: treeview.c
 
     if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT)
 	infoPtr->cdmode =
+Index: listview.c
+===================================================================
+--- listview.c	(revision 51320)
+++ listview.c	(working copy)
+@@ -1634,8 +1635,19 @@
+ /* used to handle collapse main item column case */
+ static inline BOOL LISTVIEW_DrawFocusRect(const LISTVIEW_INFO *infoPtr, HDC hdc)
+ {
+-    return (infoPtr->rcFocus.left < infoPtr->rcFocus.right) ?
+-            DrawFocusRect(hdc, &infoPtr->rcFocus) : FALSE;
+    BOOL Ret = FALSE;
+
+    if (infoPtr->rcFocus.left < infoPtr->rcFocus.right)
+    {
+        DWORD dwOldBkColor, dwOldTextColor;
+
+        dwOldBkColor = SetBkColor(hdc, RGB(255, 255, 255));
+        dwOldTextColor = SetBkColor(hdc, RGB(0, 0, 0));
+        Ret = DrawFocusRect(hdc, &infoPtr->rcFocus);
+        SetBkColor(hdc, dwOldBkColor);
+        SetBkColor(hdc, dwOldTextColor);
+    }
+    return Ret;
+ }
+ 
+ /* Listview invalidation functions: use _only_ these functions to invalidate */
+@@ -5041,7 +5053,11 @@
+ 
+     /* Draw marquee rectangle if appropriate */
+     if (infoPtr->bMarqueeSelect)
+    {
+        SetBkColor(hdc, RGB(255, 255, 255));
+        SetTextColor(hdc, RGB(0, 0, 0));
+         DrawFocusRect(hdc, &infoPtr->marqueeDrawRect);
+    }
+ 
+     if (cdmode & CDRF_NOTIFYPOSTPAINT)
+ 	notify_postpaint(infoPtr, &nmlvcd);
--- a/dll/win32/comctl32/listview.c
+++ b/dll/win32/comctl32/listview.c
@ -360,7 +360,7 @@ typedef struct tagLISTVIEW_INFO
 #define SB_INTERNAL      -1

 /* maximum size of a label */
-#define DISP_TEXT_SIZE 512
+#define DISP_TEXT_SIZE 260

 /* padding for items in list and small icon display modes */
 #define WIDTH_PADDING 12
@ -543,7 +543,7 @@ static BOOL textsetptrT(LPWSTR *dest, LPCWSTR src, BOOL isW)
 static inline int textcmpWT(LPCWSTR aw, LPCWSTR bt, BOOL isW)
 {
    if (!aw) return bt ? -1 : 0;
-    if (!bt) return aw ? 1 : 0;
+    if (!bt) return 1;
    if (aw == LPSTR_TEXTCALLBACKW)
 	return bt == LPSTR_TEXTCALLBACKW ? 1 : -1;
    if (bt != LPSTR_TEXTCALLBACKW)
@ -865,6 +865,7 @@ static inline void notify_itemactivate(const LISTVIEW_INFO *infoPtr, const LVHIT
      item.mask = LVIF_PARAM|LVIF_STATE;
      item.iItem = htInfo->iItem;
      item.iSubItem = 0;
+      item.stateMask = (UINT)-1;
      if (LISTVIEW_GetItemT(infoPtr, &item, TRUE)) {
 	  nmia.lParam = item.lParam;
 	  nmia.uOldState = item.state;
@ -1634,8 +1635,19 @@ static inline BOOL LISTVIEW_GetItemW(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpL
 /* used to handle collapse main item column case */
 static inline BOOL LISTVIEW_DrawFocusRect(const LISTVIEW_INFO *infoPtr, HDC hdc)
 {
-    return (infoPtr->rcFocus.left < infoPtr->rcFocus.right) ?
-            DrawFocusRect(hdc, &infoPtr->rcFocus) : FALSE;
+    BOOL Ret = FALSE;
+
+    if (infoPtr->rcFocus.left < infoPtr->rcFocus.right)
+    {
+        DWORD dwOldBkColor, dwOldTextColor;
+
+        dwOldBkColor = SetBkColor(hdc, RGB(255, 255, 255));
+        dwOldTextColor = SetBkColor(hdc, RGB(0, 0, 0));
+        Ret = DrawFocusRect(hdc, &infoPtr->rcFocus);
+        SetBkColor(hdc, dwOldBkColor);
+        SetBkColor(hdc, dwOldTextColor);
+    }
+    return Ret;
 }

 /* Listview invalidation functions: use _only_ these functions to invalidate */
@ -5041,7 +5053,11 @@ enddraw:

    /* Draw marquee rectangle if appropriate */
    if (infoPtr->bMarqueeSelect)
+    {
+        SetBkColor(hdc, RGB(255, 255, 255));
+        SetTextColor(hdc, RGB(0, 0, 0));
        DrawFocusRect(hdc, &infoPtr->marqueeDrawRect);
+    }

    if (cdmode & CDRF_NOTIFYPOSTPAINT)
 	notify_postpaint(infoPtr, &nmlvcd);
@ -5878,6 +5894,7 @@ static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, BOOL isW)
               SetWindowLongPtrA(hedit, GWLP_WNDPROC, (DWORD_PTR)EditLblWndProcA) );

    SendMessageW(hedit, WM_SETFONT, (WPARAM)infoPtr->hFont, FALSE);
+    SendMessageW(hedit, EM_SETLIMITTEXT, DISP_TEXT_SIZE-1, 0);

    return hedit;
 }
@ -6743,7 +6760,7 @@ static BOOL LISTVIEW_GetItemExtT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVIte

    pszText = lpLVItem->pszText;
    bResult = LISTVIEW_GetItemT(infoPtr, lpLVItem, isW);
-    if (bResult && lpLVItem->pszText != pszText)
+    if (bResult && (lpLVItem->mask & LVIF_TEXT) && lpLVItem->pszText != pszText)
    {
 	if (lpLVItem->pszText != LPSTR_TEXTCALLBACKW)
 	    textcpynT(pszText, isW, lpLVItem->pszText, isW, lpLVItem->cchTextMax);
--- a/dll/win32/kernel32/include/kernel32.h
+++ b/dll/win32/kernel32/include/kernel32.h
@ -96,6 +96,7 @@ extern RTL_CRITICAL_SECTION BaseDllDirectoryLock;
 extern UNICODE_STRING BaseDllDirectory;
 extern UNICODE_STRING BaseDefaultPath;
 extern UNICODE_STRING BaseDefaultPathAppend;
+extern PLDR_DATA_TABLE_ENTRY BasepExeLdrEntry;

 extern LPTOP_LEVEL_EXCEPTION_FILTER GlobalTopLevelExceptionFilter;

--- a/dll/win32/kernel32/misc/ldr.c
+++ b/dll/win32/kernel32/misc/ldr.c
@ -1,10 +1,9 @@
 /*
 * COPYRIGHT: See COPYING in the top level directory
- * PROJECT  : ReactOS user mode libraries
+ * PROJECT  : ReactOS system libraries
 * MODULE   : kernel32.dll
 * FILE     : reactos/dll/win32/kernel32/misc/ldr.c
 * AUTHOR   : Aleksey Bragin <aleksey@reactos.org>
- *            Ariadne
 */

 #include <k32.h>
@ -15,7 +14,8 @@
 typedef struct tagLOADPARMS32 {
  LPSTR lpEnvAddress;
  LPSTR lpCmdLine;
-  LPSTR lpCmdShow;
+  WORD  wMagicValue;
+  WORD  wCmdShow;
  DWORD dwReserved;
 } LOADPARMS32;

@ -26,6 +26,12 @@ extern WaitForInputIdleType lpfnGlobalRegisterWaitForInputIdle;
 #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS  2
 #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_CONTINUE 3

+VOID
+NTAPI
+BasepLocateExeLdrEntry(IN PLDR_DATA_TABLE_ENTRY Entry,
+                       IN PVOID Context,
+                       OUT BOOLEAN *StopEnumeration);
+
 /* FUNCTIONS ****************************************************************/

 DWORD
@ -101,6 +107,8 @@ GetDllLoadPath(LPCWSTR lpModule)
 	UNICODE_STRING ModuleName;
 	DWORD LastError = GetLastError(); /* GetEnvironmentVariable changes LastError */

+    // FIXME: This function is used only by SearchPathW, and is deprecated and will be deleted ASAP.
+
 	if ((lpModule != NULL) && (wcslen(lpModule) > 2) && (lpModule[1] == ':'))
 	{
 		lpModuleEnd = lpModule + wcslen(lpModule);
@ -167,12 +175,17 @@ DisableThreadLibraryCalls(
 {
    NTSTATUS Status;

+    /* Disable thread library calls */
    Status = LdrDisableThreadCalloutsForDll((PVOID)hLibModule);
+
+    /* If it wasn't success - set last error and return failure */
    if (!NT_SUCCESS(Status))
    {
        BaseSetLastNTError(Status);
        return FALSE;
    }
+
+    /* Return success */
    return TRUE;
 }

@ -182,111 +195,188 @@ DisableThreadLibraryCalls(
 */
 HINSTANCE
 WINAPI
-LoadLibraryA (
-	LPCSTR	lpLibFileName
-	)
+LoadLibraryA(LPCSTR lpLibFileName)
 {
-	return LoadLibraryExA (lpLibFileName, 0, 0);
-}
+    LPSTR PathBuffer;
+    UINT Len;
+    HINSTANCE Result;

+    /* Treat twain_32.dll in a special way (what a surprise...) */
+    if (lpLibFileName && !_strcmpi(lpLibFileName, "twain_32.dll"))
+    {
+        /* Allocate space for the buffer */
+        PathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, MAX_PATH);
+        if (PathBuffer)
+        {
+            /* Get windows dir in this buffer */
+            Len = GetWindowsDirectoryA(PathBuffer, MAX_PATH - 13); /* 13 is sizeof of '\\twain_32.dll' */
+            if (Len && Len < (MAX_PATH - 13))
+            {
+                /* We successfully got windows directory. Concatenate twain_32.dll to it */
+                strncat(PathBuffer, "\\twain_32.dll", 13);
+
+                /* And recursively call ourselves with a new string */
+                Result = LoadLibraryA(PathBuffer);
+
+                /* If it was successful -  free memory and return result */
+                if (Result)
+                {
+                    RtlFreeHeap(RtlGetProcessHeap(), 0, PathBuffer);
+                    return Result;
+                }
+            }
+
+            /* Free allocated buffer */
+            RtlFreeHeap(RtlGetProcessHeap(), 0, PathBuffer);
+        }
+    }
+
+    /* Call the Ex version of the API */
+    return LoadLibraryExA(lpLibFileName, 0, 0);
+}

 /*
 * @implemented
 */
 HINSTANCE
 WINAPI
-LoadLibraryExA(
-    LPCSTR lpLibFileName,
-    HANDLE hFile,
-    DWORD dwFlags)
+LoadLibraryExA(LPCSTR lpLibFileName,
+               HANDLE hFile,
+               DWORD dwFlags)
 {
-   PUNICODE_STRING FileNameW;
+    PUNICODE_STRING FileNameW;

+    /* Convert file name to unicode */
    if (!(FileNameW = Basep8BitStringToStaticUnicodeString(lpLibFileName)))
        return NULL;

+    /* And call W version of the API */
    return LoadLibraryExW(FileNameW->Buffer, hFile, dwFlags);
 }

-
 /*
 * @implemented
 */
 HINSTANCE
 WINAPI
-LoadLibraryW (
-	LPCWSTR	lpLibFileName
-	)
+LoadLibraryW(LPCWSTR lpLibFileName)
 {
-	return LoadLibraryExW (lpLibFileName, 0, 0);
+    /* Call Ex version of the API */
+    return LoadLibraryExW (lpLibFileName, 0, 0);
 }


 static
 NTSTATUS
-LoadLibraryAsDatafile(PWSTR path, LPCWSTR name, HMODULE* hmod)
+BasepLoadLibraryAsDatafile(PWSTR Path, LPCWSTR Name, HMODULE *hModule)
 {
-    static const WCHAR dotDLL[] = {'.','d','l','l',0};
-
-    WCHAR filenameW[MAX_PATH];
+    WCHAR FilenameW[MAX_PATH];
    HANDLE hFile = INVALID_HANDLE_VALUE;
-    HANDLE mapping;
-    HMODULE module;
+    HANDLE hMapping;
+    NTSTATUS Status;
+    PVOID lpBaseAddress = NULL;
+    SIZE_T ViewSize;
+    //PUNICODE_STRING OriginalName;
+    //UNICODE_STRING dotDLL = RTL_CONSTANT_STRING(L".DLL");

-    *hmod = 0;
+    /* Zero out handle value */
+    *hModule = 0;

-    if (!SearchPathW( path, name, dotDLL, sizeof(filenameW) / sizeof(filenameW[0]),
-                     filenameW, NULL ))
+    DPRINT("BasepLoadLibraryAsDatafile(%S %S %p)\n", Path, Name, hModule);
+
+    /*Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE,
+                                                      Name,
+                                                      &dotDLL,
+                                                      RedirName,
+                                                      RedirName2,
+                                                      &OriginalName2,
+                                                      NULL,
+                                                      NULL,
+                                                      NULL);*/
+
+    /* Try to search for it */
+    if (!SearchPathW(Path,
+                     Name,
+                     L".DLL",
+                     sizeof(FilenameW) / sizeof(FilenameW[0]),
+                     FilenameW,
+                     NULL))
    {
+        /* Return last status value directly */
        return NtCurrentTeb()->LastStatusValue;
    }

-    hFile = CreateFileW( filenameW, GENERIC_READ, FILE_SHARE_READ,
-                         NULL, OPEN_EXISTING, 0, 0 );
+    /* Open this file we found */
+    hFile = CreateFileW(FilenameW,
+                        GENERIC_READ,
+                        FILE_SHARE_READ | FILE_SHARE_DELETE,
+                        NULL,
+                        OPEN_EXISTING,
+                        0,
+                        0);

+    /* If opening failed - return last status value */
    if (hFile == INVALID_HANDLE_VALUE) return NtCurrentTeb()->LastStatusValue;

-    mapping = CreateFileMappingW( hFile, NULL, PAGE_READONLY, 0, 0, NULL );
-    CloseHandle( hFile );
-    if (!mapping) return NtCurrentTeb()->LastStatusValue;
+    /* Create file mapping */
+    hMapping = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL);

-    module = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 );
-    CloseHandle( mapping );
-    if (!module) return NtCurrentTeb()->LastStatusValue;
+    /* Close the file handle */
+    CloseHandle(hFile);

-    /* make sure it's a valid PE file */
-    if (!RtlImageNtHeader(module))
+    /* If creating file mapping failed - return last status value */
+    if (!hMapping) return NtCurrentTeb()->LastStatusValue;
+
+    /* Map view of section */
+    Status = NtMapViewOfSection(hMapping,
+                                NtCurrentProcess(),
+                                &lpBaseAddress,
+                                0,
+                                0,
+                                0,
+                                &ViewSize,
+                                ViewShare,
+                                0,
+                                PAGE_READONLY);
+
+    /* Close handle to the section */
+    CloseHandle(hMapping);
+
+    /* If mapping view of section failed - return last status value */
+    if (!NT_SUCCESS(Status)) return NtCurrentTeb()->LastStatusValue;
+
+    /* Make sure it's a valid PE file */
+    if (!RtlImageNtHeader(lpBaseAddress))
    {
-        UnmapViewOfFile( module );
+        /* Unmap the view and return failure status */
+        UnmapViewOfFile(lpBaseAddress);
        return STATUS_INVALID_IMAGE_FORMAT;
    }
-    *hmod = (HMODULE)((char *)module + 1);  /* set low bit of handle to indicate datafile module */
+
+    /* Set low bit of handle to indicate datafile module */
+    *hModule = (HMODULE)((ULONG_PTR)lpBaseAddress | 1);
+
+    /* Load alternate resource module */
+    //LdrLoadAlternateResourceModule(*hModule, FilenameW);
+
    return STATUS_SUCCESS;
 }

-
 /*
 * @implemented
 */
 HINSTANCE
 WINAPI
-LoadLibraryExW (
-	LPCWSTR	lpLibFileName,
-	HANDLE	hFile,
-	DWORD	dwFlags
-	)
+LoadLibraryExW(LPCWSTR lpLibFileName,
+               HANDLE hFile,
+               DWORD dwFlags)
 {
-	UNICODE_STRING DllName;
-	HINSTANCE hInst;
-	NTSTATUS Status;
-	PWSTR SearchPath;
+    UNICODE_STRING DllName;
+    HINSTANCE hInst;
+    NTSTATUS Status;
+    PWSTR SearchPath;
    ULONG DllCharacteristics = 0;
-	BOOL FreeString = FALSE;
-
-        (void)hFile;
-
-	if ( lpLibFileName == NULL )
-		return NULL;
+    BOOL FreeString = FALSE;

    /* Check for any flags LdrLoadDll might be interested in */
    if (dwFlags & DONT_RESOLVE_DLL_REFERENCES)
@ -295,67 +385,101 @@ LoadLibraryExW (
        DllCharacteristics = IMAGE_FILE_EXECUTABLE_IMAGE;
    }

-	dwFlags &=
-	  DONT_RESOLVE_DLL_REFERENCES |
-	  LOAD_LIBRARY_AS_DATAFILE |
-	  LOAD_WITH_ALTERED_SEARCH_PATH;
+    /* Build up a unicode dll name from null-terminated string */
+    RtlInitUnicodeString(&DllName, (LPWSTR)lpLibFileName);

-	SearchPath = GetDllLoadPath(
-	  dwFlags & LOAD_WITH_ALTERED_SEARCH_PATH ? lpLibFileName : NULL);
+    /* Lazy-initialize BasepExeLdrEntry */
+    if (!BasepExeLdrEntry)
+        LdrEnumerateLoadedModules(0, BasepLocateExeLdrEntry, NtCurrentPeb()->ImageBaseAddress);

-	RtlInitUnicodeString(&DllName, (LPWSTR)lpLibFileName);
-
-	if (DllName.Buffer[DllName.Length/sizeof(WCHAR) - 1] == L' ')
-	{
-		RtlCreateUnicodeString(&DllName, (LPWSTR)lpLibFileName);
-		while (DllName.Length > sizeof(WCHAR) &&
-				DllName.Buffer[DllName.Length/sizeof(WCHAR) - 1] == L' ')
-		{
-			DllName.Length -= sizeof(WCHAR);
-		}
-		DllName.Buffer[DllName.Length/sizeof(WCHAR)] = UNICODE_NULL;
-		FreeString = TRUE;
-	}
-
-    if (dwFlags & LOAD_LIBRARY_AS_DATAFILE)
+    /* Check if that module is our exe*/
+    if (BasepExeLdrEntry && !(dwFlags & LOAD_LIBRARY_AS_DATAFILE) &&
+        DllName.Length == BasepExeLdrEntry->FullDllName.Length)
    {
-        Status = LdrGetDllHandle(SearchPath, NULL, &DllName, (PVOID*)&hInst);
-        if (!NT_SUCCESS(Status))
+        /* Lengths match and it's not a datafile, so perform name comparison */
+        if (RtlEqualUnicodeString(&DllName, &BasepExeLdrEntry->FullDllName, TRUE))
        {
-            /* The method in load_library_as_datafile allows searching for the
-             * 'native' libraries only
-             */
-            Status = LoadLibraryAsDatafile(SearchPath, DllName.Buffer, &hInst);
-            goto done;
+            /* That's us! */
+            return BasepExeLdrEntry->DllBase;
        }
    }

-    /* HACK!!! FIXME */
-    if (InWindows)
+    /* Check for trailing spaces and remove them if necessary */
+    if (DllName.Buffer[DllName.Length/sizeof(WCHAR) - 1] == L' ')
    {
-        /* Call the API Properly */
-        Status = LdrLoadDll(SearchPath,
-                            &DllCharacteristics,
-                            &DllName,
-                            (PVOID*)&hInst);
+        RtlCreateUnicodeString(&DllName, (LPWSTR)lpLibFileName);
+        while (DllName.Length > sizeof(WCHAR) &&
+            DllName.Buffer[DllName.Length/sizeof(WCHAR) - 1] == L' ')
+        {
+            DllName.Length -= sizeof(WCHAR);
+        }
+        DllName.Buffer[DllName.Length/sizeof(WCHAR)] = UNICODE_NULL;
+        FreeString = TRUE;
    }
-    else
+
+    /* Compute the load path */
+    SearchPath = BasepGetDllPath((dwFlags & LOAD_WITH_ALTERED_SEARCH_PATH) ? (LPWSTR)lpLibFileName : NULL,
+                                 NULL);
+
+    if (!SearchPath)
    {
-        /* Call the ROS API. NOTE: Don't fix this, I have a patch to merge later. */
-        Status = LdrLoadDll(SearchPath, &dwFlags, &DllName, (PVOID*)&hInst);
+        /* Getting DLL path failed, so set last error, free mem and return */
+        BaseSetLastNTError(STATUS_NO_MEMORY);
+        if (FreeString) RtlFreeUnicodeString(&DllName);
+        return NULL;
    }

+    _SEH2_TRY
+    {
+        if (dwFlags & LOAD_LIBRARY_AS_DATAFILE)
+        {
+            /* If the image is loaded as a datafile, try to get its handle */
+            Status = LdrGetDllHandle(SearchPath, NULL, &DllName, (PVOID*)&hInst);
+            if (!NT_SUCCESS(Status))
+            {
+                /* It's not loaded yet - so load it up */
+                Status = BasepLoadLibraryAsDatafile(SearchPath, DllName.Buffer, &hInst);
+                _SEH2_YIELD(goto done;)
+            }
+        }
+
+        /* HACK!!! FIXME */
+        if (InWindows)
+        {
+            /* Call the API Properly */
+            Status = LdrLoadDll(SearchPath,
+                                &DllCharacteristics,
+                                &DllName,
+                                (PVOID*)&hInst);
+        }
+        else
+        {
+            /* Call the ROS API. NOTE: Don't fix this, I have a patch to merge later. */
+            Status = LdrLoadDll(SearchPath, &dwFlags, &DllName, (PVOID*)&hInst);
+        }
+    }
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+    {
+        Status = _SEH2_GetExceptionCode();
+    } _SEH2_END
+
+
 done:
-	RtlFreeHeap(RtlGetProcessHeap(), 0, SearchPath);
-	if (FreeString)
-		RtlFreeUnicodeString(&DllName);
-	if ( !NT_SUCCESS(Status))
-	{
-		SetLastErrorByStatus (Status);
-		return NULL;
-	}
+    /* Free SearchPath buffer */
+    RtlFreeHeap(RtlGetProcessHeap(), 0, SearchPath);

-	return hInst;
+    /* Free DllName string if it was dynamically allocated */
+    if (FreeString) RtlFreeUnicodeString(&DllName);
+
+    /* Set last error in failure case */
+    if (!NT_SUCCESS(Status))
+    {
+        BaseSetLastNTError(Status);
+        return NULL;
+    }
+
+    /* Return loaded module handle */
+    return hInst;
 }


@ -364,42 +488,56 @@ done:
 */
 FARPROC
 WINAPI
-GetProcAddress( HMODULE hModule, LPCSTR lpProcName )
+GetProcAddress(HMODULE hModule, LPCSTR lpProcName)
 {
-	ANSI_STRING ProcedureName;
-	FARPROC fnExp = NULL;
-	NTSTATUS Status;
+    ANSI_STRING ProcedureName, *ProcNamePtr = NULL;
+    FARPROC fnExp = NULL;
+    NTSTATUS Status;
+    PVOID hMapped;
+    ULONG Ordinal = 0;

-	if (!hModule)
-	{
-		SetLastError(ERROR_PROC_NOT_FOUND);
-		return NULL;
-	}
+    if (HIWORD(lpProcName) != 0)
+    {
+        /* Look up by name */
+        RtlInitAnsiString(&ProcedureName, (LPSTR)lpProcName);
+        ProcNamePtr = &ProcedureName;
+    }
+    else
+    {
+        /* Look up by ordinal */
+        Ordinal = (ULONG)lpProcName;
+    }

-	if (HIWORD(lpProcName) != 0)
-	{
-		RtlInitAnsiString (&ProcedureName,
-		                   (LPSTR)lpProcName);
-		Status = LdrGetProcedureAddress ((PVOID)hModule,
-		                        &ProcedureName,
-		                        0,
-		                        (PVOID*)&fnExp);
-	}
-	else
-	{
-		Status = LdrGetProcedureAddress ((PVOID)hModule,
-		                        NULL,
-		                        (ULONG)lpProcName,
-		                        (PVOID*)&fnExp);
-	}
+    /* Map provided handle */
+    hMapped = BasepMapModuleHandle(hModule, FALSE);

-	if (!NT_SUCCESS(Status))
-	{
-		SetLastErrorByStatus(Status);
-		fnExp = NULL;
-	}
+    /* Get the proc address */
+    Status = LdrGetProcedureAddress(hMapped,
+                                    ProcNamePtr,
+                                    Ordinal,
+                                    (PVOID*)&fnExp);

-	return fnExp;
+    if (!NT_SUCCESS(Status))
+    {
+        BaseSetLastNTError(Status);
+        return NULL;
+    }
+
+    /* Check for a special case when returned pointer is
+       the same as iamge's base address */
+    if (fnExp == hMapped)
+    {
+        /* Set correct error code */
+        if (HIWORD(lpProcName) != 0)
+            BaseSetLastNTError(STATUS_ENTRYPOINT_NOT_FOUND);
+        else
+            BaseSetLastNTError(STATUS_ORDINAL_NOT_FOUND);
+
+        return NULL;
+    }
+
+    /* All good, return procedure pointer */
+    return fnExp;
 }


@ -906,87 +1044,137 @@ GetModuleHandleExA(IN DWORD dwFlags,
 */
 DWORD
 WINAPI
-LoadModule (
-    LPCSTR  lpModuleName,
-    LPVOID  lpParameterBlock
-    )
+LoadModule(LPCSTR lpModuleName,
+           LPVOID lpParameterBlock)
 {
-  STARTUPINFOA StartupInfo;
-  PROCESS_INFORMATION ProcessInformation;
-  LOADPARMS32 *LoadParams;
-  char FileName[MAX_PATH];
-  char *CommandLine, *t;
-  BYTE Length;
+    STARTUPINFOA StartupInfo;
+    PROCESS_INFORMATION ProcessInformation;
+    LOADPARMS32 *LoadParams;
+    char FileName[MAX_PATH];
+    LPSTR CommandLine;
+    DWORD Length, Error;
+    BOOL ProcessStatus;
+    ANSI_STRING AnsiStr;
+    UNICODE_STRING UnicStr;
+    RTL_PATH_TYPE PathType;
+    HANDLE Handle;

-  LoadParams = (LOADPARMS32*)lpParameterBlock;
-  if(!lpModuleName || !LoadParams || (((WORD*)LoadParams->lpCmdShow)[0] != 2))
-  {
-    /* windows doesn't check parameters, we do */
-    SetLastError(ERROR_INVALID_PARAMETER);
-    return 0;
-  }
+    LoadParams = (LOADPARMS32*)lpParameterBlock;

-  if(!SearchPathA(NULL, lpModuleName, ".exe", MAX_PATH, FileName, NULL) &&
-     !SearchPathA(NULL, lpModuleName, NULL, MAX_PATH, FileName, NULL))
-  {
-    return ERROR_FILE_NOT_FOUND;
-  }
-
-  Length = (BYTE)LoadParams->lpCmdLine[0];
-  if(!(CommandLine = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY,
-                               strlen(lpModuleName) + Length + 2)))
-  {
-    SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-    return 0;
-  }
-
-  /* Create command line string */
-  strcpy(CommandLine, lpModuleName);
-  t = CommandLine + strlen(CommandLine);
-  *(t++) = ' ';
-  memcpy(t, LoadParams->lpCmdLine + 1, Length);
-
-  /* Build StartupInfo */
-  RtlZeroMemory(&StartupInfo, sizeof(STARTUPINFOA));
-  StartupInfo.cb = sizeof(STARTUPINFOA);
-  StartupInfo.dwFlags = STARTF_USESHOWWINDOW;
-  StartupInfo.wShowWindow = ((WORD*)LoadParams->lpCmdShow)[1];
-
-  if(!CreateProcessA(FileName, CommandLine, NULL, NULL, FALSE, 0, LoadParams->lpEnvAddress,
-                     NULL, &StartupInfo, &ProcessInformation))
-  {
-    DWORD Error;
-
-    RtlFreeHeap(RtlGetProcessHeap(), 0, CommandLine);
-    /* return the right value */
-    Error = GetLastError();
-    switch(Error)
+    /* Check load parameters */
+    if (LoadParams->dwReserved || LoadParams->wMagicValue != 2)
    {
-      case ERROR_BAD_EXE_FORMAT:
-      {
-        return ERROR_BAD_FORMAT;
-      }
-      case ERROR_FILE_NOT_FOUND:
-      case ERROR_PATH_NOT_FOUND:
-      {
-        return Error;
-      }
+        /* Fail with invalid param error */
+        BaseSetLastNTError(STATUS_INVALID_PARAMETER);
+        return 0;
    }
-    return 0;
-  }

-  RtlFreeHeap(RtlGetProcessHeap(), 0, CommandLine);
+    /* Search path */
+    Length = SearchPathA(NULL, lpModuleName, ".exe", MAX_PATH, FileName, NULL);

-  /* Wait up to 15 seconds for the process to become idle */
-  if (NULL != lpfnGlobalRegisterWaitForInputIdle)
-  {
-    lpfnGlobalRegisterWaitForInputIdle(ProcessInformation.hProcess, 15000);
-  }
+    /* Check if path was found */
+    if (Length && Length < MAX_PATH)
+    {
+        /* Build StartupInfo */
+        RtlZeroMemory(&StartupInfo, sizeof(StartupInfo));

-  NtClose(ProcessInformation.hThread);
-  NtClose(ProcessInformation.hProcess);
+        StartupInfo.cb = sizeof(STARTUPINFOA);
+        StartupInfo.dwFlags = STARTF_USESHOWWINDOW;
+        StartupInfo.wShowWindow = LoadParams->wCmdShow;

-  return 33;
+        /* Allocate command line buffer */
+        CommandLine = RtlAllocateHeap(RtlGetProcessHeap(),
+                                      HEAP_ZERO_MEMORY,
+                                      (ULONG)LoadParams->lpCmdLine[0] + Length + 2);
+
+        /* Put module name there, then a space, and then copy provided command line,
+           and null-terminate it */
+        RtlCopyMemory(CommandLine, FileName, Length);
+        CommandLine[Length] = ' ';
+        RtlCopyMemory(&CommandLine[Length + 1], &LoadParams->lpCmdLine[1], (ULONG)LoadParams->lpCmdLine[0]);
+        CommandLine[Length + 1 + (ULONG)LoadParams->lpCmdLine[0]] = 0;
+
+        /* Create the process */
+        ProcessStatus = CreateProcessA(FileName,
+                                       CommandLine,
+                                       NULL,
+                                       NULL,
+                                       FALSE,
+                                       0,
+                                       LoadParams->lpEnvAddress,
+                                       NULL,
+                                       &StartupInfo,
+                                       &ProcessInformation);
+
+        /* Free the command line buffer */
+        RtlFreeHeap(RtlGetProcessHeap(), 0, CommandLine);
+
+        if (!ProcessStatus)
+        {
+            /* Creating process failed, return right error code */
+            Error = GetLastError();
+            switch(Error)
+            {
+            case ERROR_BAD_EXE_FORMAT:
+               return ERROR_BAD_FORMAT;
+
+            case ERROR_FILE_NOT_FOUND:
+            case ERROR_PATH_NOT_FOUND:
+                return Error;
+            }
+
+            /* Return 0 otherwise */
+            return 0;
+        }
+
+        /* Wait up to 30 seconds for the process to become idle */
+        if (lpfnGlobalRegisterWaitForInputIdle)
+        {
+            lpfnGlobalRegisterWaitForInputIdle(ProcessInformation.hProcess, 30000);
+        }
+
+        /* Close handles */
+        NtClose(ProcessInformation.hThread);
+        NtClose(ProcessInformation.hProcess);
+
+        /* Return magic success value (33) */
+        return 33;
+    }
+
+    /* The path was not found, create an ansi string from
+        the module name and convert it to unicode */
+    RtlInitAnsiString(&AnsiStr, lpModuleName);
+    if (!NT_SUCCESS(RtlAnsiStringToUnicodeString(&UnicStr,&AnsiStr,TRUE)))
+        return ERROR_FILE_NOT_FOUND;
+
+    /* Determine path type */
+    PathType = RtlDetermineDosPathNameType_U(UnicStr.Buffer);
+
+    /* Free the unicode module name */
+    RtlFreeUnicodeString(&UnicStr);
+
+    /* If it's a relative path, return file not found */
+    if (PathType == RtlPathTypeRelative)
+        return ERROR_FILE_NOT_FOUND;
+
+    /* If not, try to open it */
+    Handle = CreateFile(lpModuleName,
+                        GENERIC_READ,
+                        FILE_SHARE_READ | FILE_SHARE_WRITE,
+                        NULL,
+                        OPEN_EXISTING,
+                        FILE_ATTRIBUTE_NORMAL,
+                        NULL);
+
+    if (Handle != INVALID_HANDLE_VALUE)
+    {
+        /* Opening file succeeded for some reason, close the handle and return file not found anyway */
+        CloseHandle(Handle);
+        return ERROR_FILE_NOT_FOUND;
+    }
+
+    /* Return last error which CreateFile set during an attempt to open it */
+    return GetLastError();
 }

 /* EOF */
--- a/dll/win32/netapi32/access.c
+++ b/dll/win32/netapi32/access.c
@ -793,7 +793,7 @@ NET_API_STATUS WINAPI NetUserModalsGet(
            PPOLICY_ACCOUNT_DOMAIN_INFO domainInfo;
            NTSTATUS ntStatus;
            PSID domainIdentifier = NULL;
-            int domainNameLen;
+            int domainNameLen, domainIdLen;

            ZeroMemory(&objectAttributes, sizeof(objectAttributes));
            objectAttributes.Length = sizeof(objectAttributes);
@ -820,11 +820,12 @@ NET_API_STATUS WINAPI NetUserModalsGet(
            }

            domainIdentifier = domainInfo->DomainSid;
+            domainIdLen = (domainIdentifier) ? GetLengthSid(domainIdentifier) : 0;
            domainNameLen = lstrlenW(domainInfo->DomainName.Buffer) + 1;
            LsaClose(policyHandle);

            ntStatus = NetApiBufferAllocate(sizeof(USER_MODALS_INFO_2) +
-                                            GetLengthSid(domainIdentifier) +
+                                            domainIdLen +
                                            domainNameLen * sizeof(WCHAR),
                                            (LPVOID *)pbuffer);

@ -836,15 +837,16 @@ NET_API_STATUS WINAPI NetUserModalsGet(
            }

            umi = (USER_MODALS_INFO_2 *) *pbuffer;
-            umi->usrmod2_domain_id = *pbuffer + sizeof(USER_MODALS_INFO_2);
+            umi->usrmod2_domain_id = (domainIdLen > 0) ? (*pbuffer + sizeof(USER_MODALS_INFO_2)) : NULL;
            umi->usrmod2_domain_name = (LPWSTR)(*pbuffer +
-                sizeof(USER_MODALS_INFO_2) + GetLengthSid(domainIdentifier));
+                sizeof(USER_MODALS_INFO_2) + domainIdLen);

            lstrcpynW(umi->usrmod2_domain_name,
                      domainInfo->DomainName.Buffer,
                      domainNameLen);
-            CopySid(GetLengthSid(domainIdentifier), umi->usrmod2_domain_id,
-                    domainIdentifier);
+            if (domainIdLen > 0)
+                CopySid(GetLengthSid(domainIdentifier), umi->usrmod2_domain_id,
+                        domainIdentifier);

            LsaFreeMemory(domainInfo);

--- a/dll/win32/shell32/desktop.c
+++ b/dll/win32/shell32/desktop.c
@ -586,8 +586,7 @@ ProgmanWindowProc(IN HWND hwnd,
        switch (uMsg)
        {
            case WM_ERASEBKGND:
-                PaintDesktop((HDC)wParam);
-                break;
+                return (LRESULT)PaintDesktop((HDC)wParam);

            case WM_GETISHELLBROWSER:
                Ret = (LRESULT)IShellBrowser_from_impl(This);
--- a/dll/win32/shell32/lang/bg-BG.rc
+++ b/dll/win32/shell32/lang/bg-BG.rc
@ -170,7 +170,7 @@ BEGIN
 	LTEXT "Вид на целта:", 14004, 10, 30, 60, 10
 	LTEXT "", 14005, 70, 30, 150, 10
 	LTEXT "Място на целта:", 14006, 10, 40, 60, 10
-	LTEXT "", 14007, 70, 40, 150, 10
+	EDITTEXT 14007, 70, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Цел:", 14008, 10, 55, 55, 10
 	EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT | ES_AUTOHSCROLL
 	LTEXT "Изпълняване в:",14010, 10, 65, 55, 10
@ -209,13 +209,13 @@ BEGIN
 	LTEXT "Вид на файла:", 14004, 8, 35, 50, 10
 	LTEXT "Папка", 14005, 68, 35, 160, 10
 	LTEXT "Място:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Размер:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Съдържа:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Създадено:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Само за четене", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Скрит", 14022, 126, 150, 50, 10
 END
@ -230,17 +230,17 @@ BEGIN
 	LTEXT "Вид файл:", 14004, 8, 35, 50, 10
 	LTEXT "Файл", 14005, 68, 35, 160, 10
 	LTEXT "Отваряне с:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Местоположение:", 14008, 8, 72, 61, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Размер:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Създаден:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Променен:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Използван:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Принадлежности", 14020, 8, 189, 60, 10
 	CHECKBOX "Само за &четене", 14021, 61, 189, 67, 10
 	CHECKBOX "С&крит", 14022, 129, 189, 50, 10
@ -253,11 +253,11 @@ CAPTION "
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "Издание на файла: ", 14000, 10, 10, 67, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Описание: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Възпроизводствено право: ", 14004, 10, 46, 68, 16
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Други сведения за изданието", 14006, 6, 70, 222, 115
 	LTEXT "Име на предмета: ", 14007, 13, 82, 90, 10
 	LTEXT "Стойност: ", 14008, 112, 82, 45, 10
@ -272,24 +272,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Вид:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Файлова уредба:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Използвано място:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Свободно място:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Обем:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/ca-ES.rc
+++ b/dll/win32/shell32/lang/ca-ES.rc
@ -168,9 +168,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	ICON "", 14000, 10, 4, 30, 30, WS_VISIBLE
 	LTEXT "Target type:", 14004, 8, 38, 64, 10
-	LTEXT "", 14005, 78, 38, 142, 10
+	EDITTEXT 14005, 78, 38, 142, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Target location:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Target:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Start in:", 14010, 8, 96, 57, 10
@ -209,13 +209,13 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
 	LTEXT "Location:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Contains:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
 END
@ -230,17 +230,17 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
 	LTEXT "Opens with:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Location:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modified:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Accessed:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Attributes:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Read-only", 14021, 58, 189, 67, 10
 	CHECKBOX "&Hidden", 14022, 126, 189, 50, 10
@ -253,11 +253,11 @@ CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "File version: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Description: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
 	LTEXT "Item name: ", 14007, 13, 82, 50, 10
 	LTEXT "Value: ", 14008, 112, 82, 45, 10
@ -272,24 +272,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Type:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "File system:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Used space:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Free space:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Capacity:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/cs-CZ.rc
+++ b/dll/win32/shell32/lang/cs-CZ.rc
@ -1,6 +1,6 @@
 /* FILE:        dll/win32/shell32/lang/cs-CZ.rc
 * TRANSLATOR:  Radek Liska aka Black_Fox (radekliska at gmail dot com)
- * UPDATED:     2010-05-25
+ * UPDATED:     2011-03-31
 * THANKS TO:   navaraf, who translated major part of this file
 */

@ -158,7 +158,7 @@ BEGIN
 	LTEXT "Typ cíle:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Umístìní cíle:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "&Cíl:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Spustit v:", 14010, 8, 96, 57, 10
@ -197,13 +197,13 @@ BEGIN
 	LTEXT "Typ souboru:", 14004, 8, 35, 50, 10
 	LTEXT "Složka", 14005, 68, 35, 160, 10
 	LTEXT "Umístìní:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Velikost:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Obsahuje:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Vytvoøeno:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Jen pro ètení", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Skrytý", 14022, 126, 150, 50, 10
 END
@ -218,17 +218,17 @@ BEGIN
 	LTEXT "Typ souboru:", 14004, 8, 35, 50, 10
 	LTEXT "Soubor", 14005, 68, 35, 160, 10
 	LTEXT "Otevírat v:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Umístìní:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Velikost:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Vytvoøeno:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Zmìnìno:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Otevøeno:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Atributy:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Jen pro ètení", 14021, 58, 189, 67, 10
 	CHECKBOX "&Skrytý", 14022, 126, 189, 50, 10
@ -241,11 +241,11 @@ CAPTION "Verze"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "Verze souboru: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Popis: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Další informace o verzi: ", 14006, 6, 70, 222, 115
 	LTEXT "Název položky: ", 14007, 13, 82, 50, 10
 	LTEXT "Hodnota: ", 14008, 112, 82, 45, 10
@ -260,24 +260,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Typ:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Souborový systém:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Využité místo:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Volné místo:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Kapacita:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

@ -539,7 +539,7 @@ BEGIN
 	PUSHBUTTON "&Zavøít", IDCANCEL, 118, 198, 60, 14
 	LTEXT "&Kapacita:", -1, 7, 6, 169, 9
 	COMBOBOX 28673, 7, 17, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
-	LTEXT "&Souborový systém", -1, 7, 35, 170, 9
+	LTEXT "Souborový systé&m", -1, 7, 35, 170, 9
 	COMBOBOX 28677, 7, 46, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP
 	CONTROL "", 28678, "MSCTLS_PROGRESS32", 0, 7, 181, 170, 8
 	LTEXT "&Velikost alokaèní jednotky", -1, 7, 64, 170, 9
@ -597,7 +597,7 @@ BEGIN
 	IDS_SHV_COLUMN13            "Kategorie"
 	IDS_SHV_COLUMN_DELFROM      "Pùvodní umístìní"
 	IDS_SHV_COLUMN_DELDATE      "Odstranìno"
-	IDS_SHV_COLUMN_FONTTYPE     "Fonttype"
+	IDS_SHV_COLUMN_FONTTYPE     "Druh písma" //fonttype
 	IDS_SHV_COLUMN_WORKGROUP    "Pracovní skupina"
 	IDS_SHV_NETWORKLOCATION     "Sí<53>ové umístìní"
 	IDS_SHV_COLUMN_DOCUMENTS    "Dokumenty"
@ -739,8 +739,8 @@ BEGIN

 	IDS_FILE_FOLDER             "%u souborù, %u složek"
 	IDS_PRINTERS                "Tiskárny"
-	IDS_FONTS                   "Fonty"
-	IDS_INSTALLNEWFONT          "Nainstalovat nový font..."
+	IDS_FONTS                   "Písma"
+	IDS_INSTALLNEWFONT          "Nainstalovat nové písmo..."

 	IDS_DEFAULT_CLUSTER_SIZE    "Výchozí alokaèní velikost"
 	IDS_COPY_OF                 "Kopie "
--- a/dll/win32/shell32/lang/da-DK.rc
+++ b/dll/win32/shell32/lang/da-DK.rc
@ -158,7 +158,7 @@ BEGIN
 	LTEXT "Target type:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Target location:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Target:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Start in:", 14010, 8, 96, 57, 10
@ -197,13 +197,13 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
 	LTEXT "Location:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Contains:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
 END
@ -219,17 +219,17 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
 	LTEXT "Opens with:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Location:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modified:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Accessed:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Attributes:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Read-only", 14021, 58, 189, 67, 10
 	CHECKBOX "&Hidden", 14022, 126, 189, 50, 10
@ -242,11 +242,11 @@ CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "File version: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Description: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
 	LTEXT "Item name: ", 14007, 13, 82, 50, 10
 	LTEXT "Value: ", 14008, 112, 82, 45, 10
@ -261,24 +261,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Type:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "File system:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Used space:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Free space:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Capacity:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/de-DE.rc
+++ b/dll/win32/shell32/lang/de-DE.rc
@ -170,9 +170,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	ICON "", 14000, 10, 4, 30, 30, WS_VISIBLE
 	LTEXT "Zieltyp:", 14004, 8, 38, 64, 10
-	LTEXT "", 14005, 78, 38, 142, 10
+	LTEXT "", 14005, 78, 38, 142, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Zielpfad:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Ziel:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Starten in:", 14010, 8, 96, 57, 10
@ -211,13 +211,13 @@ BEGIN
 	LTEXT "Typ:", 14004, 8, 35, 50, 10
 	LTEXT "Dateiordner", 14005, 68, 35, 160, 10
 	LTEXT "Ort:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Größe:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Inhalt:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Erstellt:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Schreibgeschützt", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Versteckt", 14022, 126, 150, 50, 10
 END
@ -233,17 +233,17 @@ BEGIN
 	LTEXT "Dateityp:", 14004, 8, 35, 50, 10
 	LTEXT "Datei", 14005, 68, 35, 160, 10
 	LTEXT "Öffnen mit:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Pfad:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Größe:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Erstellt:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Geändert:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Zugegriffen:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Attribute:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Schreibgeschützt", 14021, 45, 189, 67, 10
 	CHECKBOX "&Versteckt", 14022, 126, 189, 50, 10
@ -256,11 +256,11 @@ CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "Dateiversion: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Beschreibung: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Weitere Versionsinformationen: ", 14006, 6, 70, 222, 115
 	LTEXT "Elementname: ", 14007, 13, 82, 50, 10
 	LTEXT "Wert: ", 14008, 112, 82, 45, 10
@ -275,24 +275,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Typ:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Dateisystem:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Belegter Speicher:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Freier Speicher:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Speicherkapazität:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/el-GR.rc
+++ b/dll/win32/shell32/lang/el-GR.rc
@ -170,7 +170,7 @@ BEGIN
 	LTEXT "Τύπος προορισμού:", 14004, 10, 25, 50, 15
 	LTEXT "", 14005, 70, 30, 150, 10
 	LTEXT "Θέση προορισμού:", 14006, 10, 40, 70, 10
-	LTEXT "", 14007, 70, 40, 150, 10
+	EDITTEXT 14007, 70, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Προορισμός:", 14008, 10, 55, 45, 10
 	EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT | ES_AUTOHSCROLL
 	LTEXT "&Εκκίνηση στο:",14010, 10, 65, 57, 10
@ -209,13 +209,13 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
 	LTEXT "Location:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Contains:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
 END
@ -230,17 +230,17 @@ BEGIN
 	LTEXT "Τύπος αρχείου:", 14004, 10, 30, 50, 10
 	LTEXT "Αρχείο", 14005, 70, 30, 150, 10
 	LTEXT "Ανοίγει με:", 14006, 10, 40, 50, 10
-	LTEXT "", 14007, 70, 40, 150, 10
+	EDITTEXT 14007, 70, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Θέση:", 14008, 10, 55, 45, 10
-	LTEXT "", 14009, 70, 55, 200, 10
+	EDITTEXT 14009, 70, 55, 200, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Μέγεθος:",14010, 10, 65, 45, 10
-	LTEXT "", 14011, 70, 65, 150, 10
+	EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Δημιουργήθηκε:", 14014, 10, 80, 65, 10
-	LTEXT "", 14015, 70, 80, 150, 10
+	EDITTEXT 14015, 70, 80, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Τροποποιήθηκε:", 14016, 10, 90, 65, 10
-	LTEXT "", 14017, 70, 90, 150, 10
+	EDITTEXT 14017, 70, 90, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Προσπελάστηκε:", 14018, 10, 100, 65, 10
-	LTEXT "", 14019, 70, 100, 150, 10
+	EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Χαρακτηριστικά:", 14020, 10, 115, 70, 10
 	CHECKBOX "&Μόνο για ανάγνωση", 14021, 70, 115, 75, 10
 	CHECKBOX "&Κρυφό", 14022, 150, 115, 50, 10
@ -253,11 +253,11 @@ CAPTION "
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "Έκδοση αρχείου: ", 14000, 10, 10, 60, 10
-	LTEXT "", 14001, 80, 10, 160, 10
+	EDITTEXT 14001, 80, 10, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Περιγραφή: ", 14002, 10, 20, 60, 10
-	LTEXT "", 14003, 80, 20, 160, 10
+	EDITTEXT 14003, 80, 20, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Πνευματικά δικαιώματα: ", 14004, 10, 30, 70, 10
-	LTEXT "", 14005, 80, 30, 160, 10
+	EDITTEXT 14005, 80, 30, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "’λλες πληροφορίες: ", 14006, 10, 45, 220, 90
 	LTEXT "Όνομα στοιχείου: ", 14007, 20, 55, 60, 10
 	LTEXT "Τιμή: ", 14008, 130, 55, 45, 10
@ -272,24 +272,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Τύπος:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Σύστημα αρχείων:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Δεσμευμένος χώρος:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Ελεύθερος χώρος:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Χωρητικότητα:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/en-GB.rc
+++ b/dll/win32/shell32/lang/en-GB.rc
@ -170,7 +170,7 @@ BEGIN
 	LTEXT "Target type:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Target location:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Target:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Start in:", 14010, 8, 96, 57, 10
@ -209,13 +209,13 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
 	LTEXT "Location:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Contains:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
 END
@ -230,17 +230,17 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
 	LTEXT "Opens with:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Location:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modified:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Accessed:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Attributes:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Read-only", 14021, 58, 189, 67, 10
 	CHECKBOX "&Hidden", 14022, 126, 189, 50, 10
@ -253,11 +253,11 @@ CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "File version: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Description: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
 	LTEXT "Item name: ", 14007, 13, 82, 50, 10
 	LTEXT "Value: ", 14008, 112, 82, 45, 10
@ -272,24 +272,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Type:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "File system:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Used space:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Free space:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Capacity:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/en-US.rc
+++ b/dll/win32/shell32/lang/en-US.rc
@ -170,7 +170,7 @@ BEGIN
 	LTEXT "Target type:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Target location:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Target:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Start in:", 14010, 8, 96, 57, 10
@ -209,13 +209,13 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
 	LTEXT "Location:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Contains:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
 END
@ -230,17 +230,17 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
 	LTEXT "Opens with:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Location:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modified:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Accessed:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Attributes:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Read-only", 14021, 58, 189, 67, 10
 	CHECKBOX "&Hidden", 14022, 126, 189, 50, 10
@ -253,11 +253,11 @@ CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "File version: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Description: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
 	LTEXT "Item name: ", 14007, 13, 82, 50, 10
 	LTEXT "Value: ", 14008, 112, 82, 45, 10
@ -272,24 +272,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Type:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "File system:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Used space:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Free space:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Capacity:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/es-ES.rc
+++ b/dll/win32/shell32/lang/es-ES.rc
@ -173,7 +173,7 @@ BEGIN
 	LTEXT "Tipo de destino:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Ubicación de destino:", 14006, 8, 54, 64, 14
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "&Destino:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "I&niciar en:", 14010, 8, 96, 57, 10
@ -212,13 +212,13 @@ BEGIN
 	LTEXT "Tipo:", 14004, 8, 35, 50, 10
 	LTEXT "Carpeta de archivos", 14005, 68, 35, 160, 10
 	LTEXT "Ubicación:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Tamaño:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Contiene:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Creado:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Sólo lectura", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Oculto", 14022, 126, 150, 50, 10
 END
@ -233,17 +233,17 @@ BEGIN
 	LTEXT "Tipo de archivo:", 14004, 8, 35, 55, 10
 	LTEXT "Archivo", 14005, 68, 35, 160, 10
 	LTEXT "Se abre con:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Ubicación:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Tamaño:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Creado:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modificado:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Último acceso:", 14018, 8, 160, 55, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Atributos:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Sólo lectura", 14021, 58, 189, 67, 10
 	CHECKBOX "&Oculto", 14022, 126, 189, 50, 10
@ -256,11 +256,11 @@ CAPTION "Versi
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "Versión del archivo: ", 14000, 10, 10, 62, 14
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Descripción: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Más información de la versión: ", 14006, 6, 70, 222, 115
 	LTEXT "Nombre del elemento:", 14007, 13, 82, 65, 10
 	LTEXT "Valor: ", 14008, 112, 82, 45, 10
@ -275,24 +275,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Tipo:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Sistema de archivos:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Espacio ocupado:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Espacio libre:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Capacidad:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/fi-FI.rc
+++ b/dll/win32/shell32/lang/fi-FI.rc
@ -170,7 +170,7 @@ BEGIN
 	LTEXT "Target type:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Target location:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Target:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Start in:", 14010, 8, 96, 57, 10
@ -209,13 +209,13 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
 	LTEXT "Location:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Contains:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
 END
@ -230,17 +230,17 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
 	LTEXT "Opens with:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Location:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modified:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Accessed:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Attributes:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Read-only", 14021, 58, 189, 67, 10
 	CHECKBOX "&Hidden", 14022, 126, 189, 50, 10
@ -253,11 +253,11 @@ CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "File version: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Description: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
 	LTEXT "Item name: ", 14007, 13, 82, 50, 10
 	LTEXT "Value: ", 14008, 112, 82, 45, 10
@ -272,24 +272,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Type:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "File system:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Used space:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Free space:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Capacity:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/fr-FR.rc
+++ b/dll/win32/shell32/lang/fr-FR.rc
@ -174,7 +174,7 @@ BEGIN
 	LTEXT "Type de la cible :", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Localisation de la cible :", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Cible :", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "Démarrer dans :", 14010, 8, 96, 57, 10
@ -213,13 +213,13 @@ BEGIN
 	LTEXT "Type de fichier :", 14004, 8, 35, 50, 10
 	LTEXT "Dossier", 14005, 68, 35, 160, 10
 	LTEXT "Localisation :", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Taille :", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Contient :", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Créé :", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10
 	AUTOCHECKBOX "Lectu&re-seule", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "Cac&hé", 14022, 126, 150, 50, 10
 END
@ -234,17 +234,17 @@ BEGIN
 	LTEXT "Type de fichier :", 14004, 8, 35, 50, 10
 	LTEXT "Fichier", 14005, 68, 35, 160, 10
 	LTEXT "Ouvrir avec :", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Localisation :", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Taille :", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Créé :", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modifié :", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Accédé :", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Attributs :", 14020, 8, 189, 45, 10
 	CHECKBOX "Lectu&re-seule", 14021, 58, 189, 67, 10
 	CHECKBOX "Cac&hé", 14022, 126, 189, 50, 10
@ -257,11 +257,11 @@ CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "Version du fichier : ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Description : ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright : ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Autres informations de version : ", 14006, 6, 70, 222, 115
 	LTEXT "Nom de l'élément : ", 14007, 13, 82, 50, 10
 	LTEXT "Valeur : ", 14008, 112, 82, 45, 10
@ -276,24 +276,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Type :", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Système de fichiers :", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Espace utilisé :", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Espace libre :", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Capacité :", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/hu-HU.rc
+++ b/dll/win32/shell32/lang/hu-HU.rc
@ -173,7 +173,7 @@ BEGIN
 	LTEXT "Target type:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Target location:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Target:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Start in:", 14010, 8, 96, 57, 10
@ -212,13 +212,13 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
 	LTEXT "Location:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Contains:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
 END
@ -233,17 +233,17 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
 	LTEXT "Opens with:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Location:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modified:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Accessed:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Attributes:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Read-only", 14021, 58, 189, 67, 10
 	CHECKBOX "&Hidden", 14022, 126, 189, 50, 10
@ -256,11 +256,11 @@ CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "File version: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Description: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
 	LTEXT "Item name: ", 14007, 13, 82, 50, 10
 	LTEXT "Value: ", 14008, 112, 82, 45, 10
@ -275,24 +275,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Type:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "File system:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Used space:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Free space:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Capacity:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/it-IT.rc
+++ b/dll/win32/shell32/lang/it-IT.rc
@ -171,7 +171,7 @@ BEGIN
 	LTEXT "Tipo:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Posizione:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Nome:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Eseguito in:", 14010, 8, 96, 57, 10
@ -210,13 +210,13 @@ BEGIN
 	LTEXT "Tipo del file:", 14004, 8, 35, 50, 10
 	LTEXT "Cartella", 14005, 68, 35, 160, 10
 	LTEXT "Posizione:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Dimensione:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Contenente:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Creato:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Sola lettura", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Nascosto", 14022, 126, 150, 50, 10
 END
@ -231,17 +231,17 @@ BEGIN
 	LTEXT "Tipo del file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
 	LTEXT "Si apre con:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Posizione:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Dimensione:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Creato:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modificato:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Letto:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Attributi:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Sola lettura", 14021, 58, 189, 67, 10
 	CHECKBOX "&Nascosto", 14022, 126, 189, 50, 10
@ -254,11 +254,11 @@ CAPTION "Versione"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "Versione: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Descrizione: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Altre informazioni sulla versione: ", 14006, 6, 70, 222, 115
 	LTEXT "Nome dell'elemento: ", 14007, 13, 82, 50, 10
 	LTEXT "Valore: ", 14008, 112, 82, 45, 10
@ -273,24 +273,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Tipo:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "File system:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Spazio usato:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Spazio libero:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Capacità:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/ja-JP.rc
+++ b/dll/win32/shell32/lang/ja-JP.rc
@ -170,7 +170,7 @@ BEGIN
 	LTEXT "対象の種類:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "対象の場所:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "対象:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "実行元(&S):", 14010, 8, 96, 57, 10
@ -209,13 +209,13 @@ BEGIN
 	LTEXT "ファイルの種類:", 14004, 8, 35, 50, 10
 	LTEXT "フォルダ", 14005, 68, 35, 160, 10
 	LTEXT "場所:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "サイズ:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "収容サイズ:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "作成日時:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "読み取り専用(&R)", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "隠しファイル(&H)", 14022, 126, 150, 50, 10
 END
@ -230,17 +230,17 @@ BEGIN
 	LTEXT "ファイルの種類:", 14004, 8, 35, 50, 10
 	LTEXT "ファイル", 14005, 68, 35, 160, 10
 	LTEXT "実行プログラム:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "場所:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "サイズ:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "作成日時:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "変更日時:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "アクセス日時:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "属性:", 14020, 8, 189, 45, 10
 	CHECKBOX "読み取り専用(&R)", 14021, 58, 189, 67, 10
 	CHECKBOX "隠しファイル(&H)", 14022, 126, 189, 50, 10
@ -253,11 +253,11 @@ CAPTION "
 FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN
 	LTEXT "ファイルバージョン: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "説明: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "著作権: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "その他のバージョン情報: ", 14006, 6, 70, 222, 115
 	LTEXT "項目名: ", 14007, 13, 82, 50, 10
 	LTEXT "値: ", 14008, 112, 82, 45, 10
@ -272,24 +272,24 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "種類:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "ファイルシステム:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "使用領域:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "空き領域:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "容量:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/ko-KR.rc
+++ b/dll/win32/shell32/lang/ko-KR.rc
@ -170,7 +170,7 @@ BEGIN
 	LTEXT "Target type:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Target location:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Target:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Start in:", 14010, 8, 96, 57, 10
@ -209,13 +209,13 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
 	LTEXT "Location:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Contains:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
 END
@ -230,17 +230,17 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
 	LTEXT "Opens with:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Location:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modified:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Accessed:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Attributes:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Read-only", 14021, 58, 189, 67, 10
 	CHECKBOX "&Hidden", 14022, 126, 189, 50, 10
@ -253,11 +253,11 @@ CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "File version: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Description: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
 	LTEXT "Item name: ", 14007, 13, 82, 50, 10
 	LTEXT "Value: ", 14008, 112, 82, 45, 10
@ -272,24 +272,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Type:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "File system:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Used space:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Free space:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Capacity:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/nl-NL.rc
+++ b/dll/win32/shell32/lang/nl-NL.rc
@ -170,7 +170,7 @@ BEGIN
 	LTEXT "Target type:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Target location:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Target:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Start in:", 14010, 8, 96, 57, 10
@ -209,13 +209,13 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
 	LTEXT "Location:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Contains:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
 END
@ -230,17 +230,17 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
 	LTEXT "Opens with:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Location:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modified:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Accessed:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Attributes:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Read-only", 14021, 58, 189, 67, 10
 	CHECKBOX "&Hidden", 14022, 126, 189, 50, 10
@ -253,11 +253,11 @@ CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "File version: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Description: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
 	LTEXT "Item name: ", 14007, 13, 82, 50, 10
 	LTEXT "Value: ", 14008, 112, 82, 45, 10
@ -272,24 +272,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Type:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "File system:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Used space:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Free space:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Capacity:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/no-NO.rc
+++ b/dll/win32/shell32/lang/no-NO.rc
@ -170,7 +170,7 @@ BEGIN
 	LTEXT "Plasseringstype:", 14004, 10, 30, 50, 10
 	LTEXT "", 14005, 70, 30, 150, 10
 	LTEXT "Plasseringssted:", 14006, 10, 40, 70, 10
-	LTEXT "", 14007, 70, 40, 150, 10
+	EDITTEXT 14007, 70, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Plassering:", 14008, 10, 55, 45, 10
 	EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT | ES_AUTOHSCROLL
 	LTEXT "&Start i:",14010, 10, 65, 57, 10
@ -209,13 +209,13 @@ BEGIN
 	LTEXT "Filtype:", 14004, 8, 35, 50, 10
 	LTEXT "Mappe", 14005, 68, 35, 160, 10
 	LTEXT "Lokalisjon:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Størrelse:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Inneholder:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Opprettet:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Bare-lesbar", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Skjult", 14022, 126, 150, 50, 10
 END
@ -231,17 +231,17 @@ BEGIN
 	LTEXT "Filtype:", 14004, 8, 35, 50, 10
 	LTEXT "Fil", 14005, 68, 35, 160, 10
 	LTEXT "Åpne med:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Lokalisjon:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Størrelse:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Opprettet:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modifisert:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Åpnet:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Rettigheter:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Bare-lesbar", 14021, 58, 189, 67, 10
 	CHECKBOX "&Skjult", 14022, 126, 189, 50, 10
@ -254,11 +254,11 @@ CAPTION "Versjon"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "Filversjon: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Beskrivelse: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Enerett: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Annet versjon informasjon: ", 14006, 6, 70, 222, 115
 	LTEXT "Enhetsnavn: ", 14007, 13, 82, 50, 10
 	LTEXT "Verdi: ", 14008, 112, 82, 45, 10
@ -273,24 +273,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Type:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Filsystem:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Brukt plass:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Ledig plass:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Kapasitet:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/pl-PL.rc
+++ b/dll/win32/shell32/lang/pl-PL.rc
@ -21,6 +21,7 @@
 * Use ReactOS forum PM or IRC to contact me
 * http://www.reactos.org
 * IRC: irc.freenode.net #reactos-pl;
+ * updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (Apr, 2011)
 */

 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
@ -177,7 +178,7 @@ BEGIN
 	LTEXT "Typ docelowy:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Lokalizacja:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Element docelowy:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Uruchom w:", 14010, 8, 96, 57, 10
@ -216,13 +217,13 @@ BEGIN
 	LTEXT "Rozszerzenie:", 14004, 8, 35, 50, 10
 	LTEXT "Katalog", 14005, 68, 35, 160, 10
 	LTEXT "Lokalizacja:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Rozmiar:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Zawiera:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Utworzony:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Tylko do odczytu", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Ukryty", 14022, 126, 150, 50, 10
 END
@ -237,17 +238,17 @@ BEGIN
 	LTEXT "Typ pliku:", 14004, 8, 35, 50, 10
 	LTEXT "Plik", 14005, 68, 35, 160, 10
 	LTEXT "Otwierany za pomocą:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Lokalizacja:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Rozmiar:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Utworzony:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Zmodyfikowany:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Ostatnio użyty:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Atrybuty:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Tylko do odczytu", 14021, 58, 189, 67, 10
 	CHECKBOX "&Ukryty", 14022, 126, 189, 50, 10
@ -260,11 +261,11 @@ CAPTION "Wersja"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "Wersja pliku: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Opis: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Prawa autorskie: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Pozostałe informacje o wersji: ", 14006, 6, 70, 222, 115
 	LTEXT "Nazwa: ", 14007, 13, 82, 50, 10
 	LTEXT "Wartość: ", 14008, 112, 82, 45, 10
@ -279,24 +280,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Typ:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "System plików:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Zajęte miejsce:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Wolne miejsce:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Pojemność:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

@ -445,10 +446,10 @@ BEGIN
 	PUSHBUTTON "&Nie", IDNO, 150, 122, 60, 14
 	PUSHBUTTON "Anuluj", IDCANCEL, 215, 122, 60, 14
 	ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL
-	LTEXT "Ten katalog już zawiera plik o nazwie '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX
-	LTEXT "Ten katalog już zawiera plik tylko do odczytu, o nazwie '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX
-	LTEXT "Ten katalog już zawiera plik systemowy o nazwie '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX
-	LTEXT "Czy chciałbyś zastąpić istniejący plik?", -1, 44, 35, 228, 10, SS_NOPREFIX
+	LTEXT "Ten katalog zawiera ju¿ plik o nazwie '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX
+	LTEXT "Ten katalog zawiera ju¿ plik tylko do odczytu, o nazwie '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX
+	LTEXT "Ten katalog zawiera ju¿ plik systemowy o nazwie '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX
+	LTEXT "Czy chcesz zast¹piæ istniej¹cy plik?", -1, 44, 35, 228, 10, SS_NOPREFIX
 	LTEXT "(data i rozmiar nieznane)", 12302, 79, 51, 198, 20, SS_NOPREFIX
 	ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL
 	LTEXT "nowym plikiem?", -1, 44, 75, 228, 10, SS_NOPREFIX
@ -541,9 +542,9 @@ CAPTION "Zamknij ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
 	ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP
-	LTEXT "Co chcesz by komputer zrobił?", -1, 39, 7, 167, 10
+	LTEXT "Co chcesz, aby zrobi³ komputer?", -1, 39, 7, 167, 10
 	COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL
-	LTEXT "Zachowuje sesje, utrzymując komputer w ruchu na małym stopniu zasilania, z danymi wciąż w pamięci. Komputer wróci do normalnego trybu pracy przy poruszeniu myszki albo naciśnięciu klawisza.", 8225, 39, 40, 167, 37
+	LTEXT "Zachowuje sesjê, podtrzymuje komputer na niskim poziomie poboru energii. Komputer wróci do normalnego trybu po poruszeniu myszk¹ lub naciœniêciu klawisza. Dane znajduj¹ce siê w pamiêci zostan¹ zachowane.", 8225, 39, 40, 167, 37
 	DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP
 	PUSHBUTTON "Anuluj", IDCANCEL, 75, 82, 60, 14
 	PUSHBUTTON "&Pomoc", IDHELP, 144, 82, 60, 14
@ -660,9 +661,9 @@ BEGIN
 	IDS_TRASHFOLDER_TEXT        "Czy jesteś pewien, że chcesz umieścić folder '%1' i całą jego zawartość w koszu"
 	IDS_TRASHMULTIPLE_TEXT      "Elementów: %1 - czy na pewno chcesz je umieścić w Koszu?"
 	IDS_CANTTRASH_TEXT          "Nie mogę przenieść elementu '%1' do Kosza. Czy chcesz go zamiast tego usunąć?"
-	IDS_OVERWRITEFILE_TEXT      "Ten folder już zawiera plik o nazwie '%1'.\n\nCzy chcesz go zastąpić?"
+	IDS_OVERWRITEFILE_TEXT      "Ten folder zawiera ju¿ plik o nazwie '%1'.\n\nCzy chcesz go zast¹piæ?"
 	IDS_OVERWRITEFILE_CAPTION   "Potwierdź zastąpienie pliku"
-	IDS_OVERWRITEFOLDER_TEXT    "Ten folder już zawiera folder o nazwie '%1'.\n\n"\
+	IDS_OVERWRITEFOLDER_TEXT    "Ten folder zawiera ju¿ katalog o nazwie '%1'.\n\n"\
 		"Jeżeli w docelowym folderze wystąpią pliki o takich samych nazwach jak\n"\
 		"w wybranym folderze, to zostaną one zastąpione. Czy chcesz mimo to przenieść\n"\
 		"lub skopiować folder?"
@ -765,5 +766,5 @@ BEGIN
 	IDS_DEFAULT_CLUSTER_SIZE    "Domyślny rozmiar jednostki alokacji"
 	IDS_COPY_OF                 "Kopia"

-	IDS_SHLEXEC_NOASSOC         "Żaden program nie jest skonfigurowane by otwierać pliki tego typu."
+	IDS_SHLEXEC_NOASSOC         "¯aden program nie jest skonfigurowany, by otwieraæ pliki tego typu."
 END
--- a/dll/win32/shell32/lang/pt-BR.rc
+++ b/dll/win32/shell32/lang/pt-BR.rc
@ -172,7 +172,7 @@ BEGIN
 	LTEXT "Target type:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Target location:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Target:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Start in:", 14010, 8, 96, 57, 10
@ -211,13 +211,13 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
 	LTEXT "Location:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Contains:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
 END
@ -232,17 +232,17 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
 	LTEXT "Opens with:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Location:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modified:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Accessed:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Attributes:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Read-only", 14021, 58, 189, 67, 10
 	CHECKBOX "&Hidden", 14022, 126, 189, 50, 10
@ -255,11 +255,11 @@ CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "File version: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Description: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
 	LTEXT "Item name: ", 14007, 13, 82, 50, 10
 	LTEXT "Value: ", 14008, 112, 82, 45, 10
@ -274,24 +274,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Type:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "File system:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Used space:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Free space:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Capacity:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/pt-PT.rc
+++ b/dll/win32/shell32/lang/pt-PT.rc
@ -173,7 +173,7 @@ BEGIN
 	LTEXT "Tipo de destino:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Localização do destino:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Destino:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Iniciar em:", 14010, 8, 96, 57, 10
@ -212,13 +212,13 @@ BEGIN
 	LTEXT "Tipo de ficheiro:", 14004, 8, 35, 50, 10
 	LTEXT "Pasta", 14005, 68, 35, 160, 10
 	LTEXT "Localização:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Tamanho:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Contém:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Criado:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Sómente de Leitura", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Escondido", 14022, 126, 150, 50, 10
 END
@ -233,17 +233,17 @@ BEGIN
 	LTEXT "Tipo de Ficheiro:", 14004, 8, 35, 50, 10
 	LTEXT "Ficheiro", 14005, 68, 35, 160, 10
 	LTEXT "Abre com::", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Localização:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Tamanho:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Criado:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modificado:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Acedido:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "propriedades:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Somente de Leitura", 14021, 58, 189, 67, 10
 	CHECKBOX "&Oculto", 14022, 126, 189, 50, 10
@ -256,11 +256,11 @@ CAPTION "Vers
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "Versão do Ficheiro: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Descrição: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Outras informações da versão: ", 14006, 6, 70, 222, 115
 	LTEXT "Nome do Item: ", 14007, 13, 82, 50, 10
 	LTEXT "Valor: ", 14008, 112, 82, 45, 10
@ -275,24 +275,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Tipo:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Sistema de Ficheiros:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Espaço utilizado:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Espaço livre:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Capacidade:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/ro-RO.rc
+++ b/dll/win32/shell32/lang/ro-RO.rc
@ -172,7 +172,7 @@ BEGIN
 	LTEXT "Tip țintă:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Locație țintă:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Țintă:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Pornire în:", 14010, 8, 96, 57, 10
@ -211,13 +211,13 @@ BEGIN
 	LTEXT "Tip fișier:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
 	LTEXT "Locație:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Mărime:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Conține:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Creat:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Doar-în-citire", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Ascuns", 14022, 126, 150, 50, 10
 END
@ -233,17 +233,17 @@ BEGIN
 	LTEXT "Tip fișier:", 14004, 8, 35, 50, 10
 	LTEXT "Fișier", 14005, 68, 35, 160, 10
 	LTEXT "Se deschide cu:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Locație:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Mărime:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Creat:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modificat:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Accesat:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Atribute:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Doar-în-citire", 14021, 58, 189, 67, 10
 	CHECKBOX "&Ascuns", 14022, 126, 189, 50, 10
@ -256,11 +256,11 @@ CAPTION "Versiune"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "Versiune fișier: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Descriere: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Drept de autor: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Alte informații versiune", 14006, 6, 70, 222, 115
 	LTEXT "Nume element: ", 14007, 13, 82, 50, 10
 	LTEXT "Valoare: ", 14008, 112, 82, 45, 10
@ -275,24 +275,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Tip:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Sistem de fișiere:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Spațiu folosit:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Spațiu liber:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Capacitate:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/ru-RU.rc
+++ b/dll/win32/shell32/lang/ru-RU.rc
@ -171,7 +171,7 @@ BEGIN
 	LTEXT "Тип объекта:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Размещение:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Объект:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Рабочая папка:", 14010, 8, 96, 57, 10
@ -210,13 +210,13 @@ BEGIN
 	LTEXT "Тип файла:", 14004, 8, 35, 50, 10
 	LTEXT "Папка", 14005, 68, 35, 160, 10
 	LTEXT "Расположение:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Размер:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Содержит:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Создано:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Только чтение", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Скрыто", 14022, 126, 150, 50, 10
 END
@ -231,17 +231,17 @@ BEGIN
 	LTEXT "Тип файла:", 14004, 8, 35, 50, 10
 	LTEXT "файл", 14005, 68, 35, 160, 10
 	LTEXT "Приложение:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Размещение:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Размер:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Создан:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Изменен:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Открыт:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Атрибуты:", 14020, 8, 189, 45, 10
 	CHECKBOX "Только &чтение", 14021, 58, 189, 67, 10
 	CHECKBOX "Скр&ытый", 14022, 126, 189, 50, 10
@ -254,11 +254,11 @@ CAPTION "
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "Версия файла: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Описание: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Авторские права: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Дополнительные сведения: ", 14006, 6, 70, 222, 115
 	LTEXT "Имя элемента: ", 14007, 13, 82, 63, 10
 	LTEXT "Значение: ", 14008, 112, 82, 45, 10
@ -273,24 +273,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Тип:", -1, 15, 49, 40, 10
-	LTEXT "", 14001, 110, 49, 100, 10
+	EDITTEXT 14001, 110, 49, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Файловая система:", -1, 15, 68, 86, 10
-	LTEXT "", 14002, 110, 68, 100, 10
+	EDITTEXT 14002, 110, 68, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "STATIC", SS_OWNERDRAW | SS_NOTIFY | SS_SUNKEN, 5, 90, 10, 10
 	LTEXT "Занято:", -1, 25, 90, 78, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "STATIC", SS_OWNERDRAW | SS_NOTIFY | SS_SUNKEN, 5, 105, 10, 10
 	LTEXT "Свободно:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Емкость:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "STATIC", SS_OWNERDRAW | SS_NOTIFY | SS_SUNKEN, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/sk-SK.rc
+++ b/dll/win32/shell32/lang/sk-SK.rc
@ -176,7 +176,7 @@ BEGIN
 	LTEXT "Typ cie¾a:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Umiestnenie cie¾a:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "&Cie¾:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "Z&aèa<C3A8> v prieèinku:", 14010, 8, 96, 57, 10
@ -215,13 +215,13 @@ BEGIN
 	LTEXT "Typ:", 14004, 8, 35, 50, 10
 	LTEXT "Prieèinok", 14005, 68, 35, 160, 10
 	LTEXT "Umiestnenie:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Ve¾kos<6F>:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Obsahuje:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Vytvorený:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Iba na èítanie", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Skrytý", 14022, 126, 150, 50, 10
 END
@ -236,17 +236,17 @@ BEGIN
 	LTEXT "Typ súboru:", 14004, 8, 35, 50, 10
 	LTEXT "Súbor", 14005, 68, 35, 160, 10
 	LTEXT "Otvori<72> programom:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Umiestnenie:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Ve¾kos<6F>:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Vytvorený:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Zmenený:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Otvorený:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Atribúty:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Iba na èítanie", 14021, 58, 189, 67, 10
 	CHECKBOX "&Skrytý", 14022, 126, 189, 50, 10
@ -259,11 +259,11 @@ CAPTION "Verzia"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "Verzia súboru: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Popis: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Autorské práva: ", 14004, 10, 46, 66, 10 //Copyright
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Iné informácie o verzii: ", 14006, 6, 70, 222, 115
 	LTEXT "Názov položky: ", 14007, 13, 82, 50, 10
 	LTEXT "Hodnota: ", 14008, 112, 82, 45, 10
@ -278,24 +278,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Typ:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Systém súborov:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Využité miesto:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Vo¾né miesto:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Kapacita:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/sl-SI.rc
+++ b/dll/win32/shell32/lang/sl-SI.rc
@ -170,7 +170,7 @@ BEGIN
 	LTEXT "Target type:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Target location:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Target:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Start in:", 14010, 8, 96, 57, 10
@ -209,13 +209,13 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
 	LTEXT "Location:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Contains:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
 END
@ -230,17 +230,17 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
 	LTEXT "Opens with:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Location:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modified:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Accessed:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Attributes:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Read-only", 14021, 58, 189, 67, 10
 	CHECKBOX "&Hidden", 14022, 126, 189, 50, 10
@ -253,11 +253,11 @@ CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "File version: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Description: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
 	LTEXT "Item name: ", 14007, 13, 82, 50, 10
 	LTEXT "Value: ", 14008, 112, 82, 45, 10
@ -272,24 +272,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Type:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "File system:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Used space:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Free space:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Capacity:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/dll/win32/shell32/lang/sv-SE.rc
+++ b/dll/win32/shell32/lang/sv-SE.rc
@ -170,7 +170,7 @@ BEGIN
 	LTEXT "Target type:", 14004, 8, 38, 64, 10
 	LTEXT "", 14005, 78, 38, 142, 10
 	LTEXT "Target location:", 14006, 8, 58, 64, 10
-	LTEXT "", 14007, 79, 58, 141, 10
+	EDITTEXT 14007, 79, 58, 141, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Target:", 14008, 8, 77, 45, 10
 	EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL
 	LTEXT "&Start in:", 14010, 8, 96, 57, 10
@ -209,13 +209,13 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "Folder", 14005, 68, 35, 160, 10
 	LTEXT "Location:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 315, 10
+	EDITTEXT 14007, 68, 53, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Contains:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10
 	AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10
 END
@ -230,17 +230,17 @@ BEGIN
 	LTEXT "Type of file:", 14004, 8, 35, 50, 10
 	LTEXT "File", 14005, 68, 35, 160, 10
 	LTEXT "Opens with:", 14006, 8, 53, 50, 10
-	LTEXT "", 14007, 68, 53, 160, 10
+	EDITTEXT 14007, 68, 53, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Location:", 14008, 8, 72, 45, 10
-	LTEXT "", 14009, 68, 72, 315, 10
+	EDITTEXT 14009, 68, 72, 315, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Size:", 14010, 8, 93, 45, 10
-	LTEXT "", 14011, 68, 93, 160, 10
+	EDITTEXT 14011, 68, 93, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Created:", 14014, 8, 118, 45, 10
-	LTEXT "", 14015, 68, 118, 160, 10
+	EDITTEXT 14015, 68, 118, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Modified:", 14016, 8, 140, 45, 10
-	LTEXT "", 14017, 68, 140, 160, 10
+	EDITTEXT 14017, 68, 140, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Accessed:", 14018, 8, 160, 45, 10
-	LTEXT "", 14019, 68, 160, 160, 10
+	EDITTEXT 14019, 68, 160, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Attributes:", 14020, 8, 189, 45, 10
 	CHECKBOX "&Read-only", 14021, 58, 189, 67, 10
 	CHECKBOX "&Hidden", 14022, 126, 189, 50, 10
@ -253,11 +253,11 @@ CAPTION "Version"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	LTEXT "File version: ", 14000, 10, 10, 55, 10
-	LTEXT "", 14001, 77, 10, 152, 10
+	EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Description: ", 14002, 10, 27, 45, 10
-	LTEXT "", 14003, 77, 27, 152, 10
+	EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	LTEXT "Copyright: ", 14004, 10, 46, 66, 10
-	LTEXT "", 14005, 77, 46, 152, 10
+	EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
 	GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115
 	LTEXT "Item name: ", 14007, 13, 82, 50, 10
 	LTEXT "Value: ", 14008, 112, 82, 45, 10
@ -272,24 +272,24 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	EDITTEXT 14000, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP
 	LTEXT "Type:", -1, 15, 55, 40, 10
-	LTEXT "", 14001, 110, 55, 100, 10
+	EDITTEXT 14001, 110, 55, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "File system:", -1, 15, 70, 100, 10
-	LTEXT "", 14002, 110, 70, 100, 10
+	EDITTEXT 14002, 110, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10
 	LTEXT "Used space:", -1, 25, 90, 120, 10
-	LTEXT "", 14003, 110, 90, 120, 10
-	LTEXT "", 14004, 200, 90, 40, 10
+	EDITTEXT 14003, 110, 90, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14004, 200, 90, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10
 	LTEXT "Free space:", -1, 25, 105, 70, 10
-	LTEXT "", 14005, 110, 105, 120, 10
-	LTEXT "", 14006, 200, 105, 40, 10
+	EDITTEXT 14005, 110, 105, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14006, 200, 105, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	LTEXT "Capacity:", -1, 25, 125, 80, 10
-	LTEXT "", 14007, 110, 125, 120, 10
-	LTEXT "", 14008, 200, 125, 40, 10
+	EDITTEXT 14007, 110, 125, 85, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER
+	EDITTEXT 14008, 200, 125, 40, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER

 	CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20

--- a/Show more
+++ b/Show more