25 May
2011
25 May
'11
9:13 p.m.
Author: gedmurphy
Date: Wed May 25 21:13:50 2011
New Revision: 51913
URL: http://svn.reactos.org/svn/reactos?rev=51913&view=rev
Log:
[SHELL32_NEW]
Merge 51133, 51199, 51206, 51285, 51294
Modified:
branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc
branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc
branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc
branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc
branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp
Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s…
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Wed May 25
21:13:50 2011
@@ -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
*/
@@ -539,7 +539,7 @@
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 @@
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íové umístìní"
IDS_SHV_COLUMN_DOCUMENTS "Dokumenty"
@@ -739,8 +739,8 @@
IDS_FILE_FOLDER "%u souborù, %u sloek"
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 "
Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s…
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Wed May 25
21:13:50 2011
@@ -113,8 +113,8 @@
CAPTION "Mensaje"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "&Si", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Si &a todo", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP |
WS_TABSTOP
+ DEFPUSHBUTTON "&Sí", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Sí &a todo", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP |
WS_TABSTOP
PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Cancelar", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP
ICON "", IDD_ICON, 10, 10, 16, 16
@@ -156,7 +156,7 @@
FONT 8, "MS Shell Dlg"
BEGIN
ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE
- LTEXT "Introduzca el nombre de un programa, carpeta, documento o recurso de
Internet, y ReactOS lo abrirá para usted.", 12289, 36, 11, 182, 24
+ LTEXT "Introduzca el nombre de un programa, carpeta, documento o recurso de
Internet y ReactOS lo abrirá para usted.", 12289, 36, 11, 182, 24
LTEXT "&Abrir:", 12305, 7, 39, 24, 10
CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL |
WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
DEFPUSHBUTTON "Aceptar", IDOK, 62, 63, 50, 14, WS_TABSTOP
@@ -682,10 +682,10 @@
IDS_LOGOFF_PROMPT "¿Desea cerrar la sesión?"
/* Run File dialog */
- IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal
error)"
- IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal
error)"
- IDS_RUNDLG_BROWSE_CAPTION "Browse"
- IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files
(*.*)\0*.*\0"
+ IDS_RUNDLG_ERROR "Imposible mostrar el diálogo Ejecutar (error
interno)"
+ IDS_RUNDLG_BROWSE_ERROR "Imposible mostrar el diálogo Examinar (error
interno)"
+ IDS_RUNDLG_BROWSE_CAPTION "Examinar"
+ IDS_RUNDLG_BROWSE_FILTER "Archivos ejecutables (*.exe)\0*.exe\0Todos los
archivos (*.*)\0*.*\0"
/* shell folder path default values */
IDS_PROGRAMS "Menú Inicio\\Programas"
Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s…
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Wed May 25
21:13:50 2011
@@ -111,8 +111,8 @@
CAPTION "Messaggi"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "&Si", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Si a &tutti", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP |
WS_TABSTOP
+ DEFPUSHBUTTON "&Sì", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Sì a &tutti", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP |
WS_TABSTOP
PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Annulla", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP
ICON "", IDD_ICON, 10, 10, 16, 16
@@ -154,7 +154,7 @@
FONT 8, "MS Shell Dlg"
BEGIN
ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE
- LTEXT "Digitare il nome del programma, della cartella, del documento o della
risorsa internet, e ReactOS la aprirà.", 12289, 36, 11, 182, 18
+ LTEXT "Digitare il nome del programma, della cartella, del documento o della
risorsa Internet, e ReactOS la aprirà.", 12289, 36, 11, 182, 18
LTEXT "&Apri:", 12305, 7, 39, 24, 10
CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL |
WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP
@@ -297,7 +297,7 @@
LTEXT "Disco %s", 14009, 100, 170, 40, 10
PUSHBUTTON "Pulitura disco", 14010, 180, 175, 50, 15, WS_TABSTOP
CHECKBOX "Comprimere il disco per recuperare dello spazio", 14011, 15, 205,
180, 10, WS_DISABLED
- CHECKBOX "Permettere di indicizzare questo disco al servizio di indicizzazione per
avere ricerche dei file più rapide", 14012, 15, 220, 200, 10, WS_DISABLED
+ CHECKBOX "Indicizza il disco per ricerche più rapide dei file", 14012, 15,
220, 200, 10, WS_DISABLED
END
DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230
@@ -445,7 +445,7 @@
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "&Sì", IDYES, 20, 122, 60, 14
- PUSHBUTTON "Sì &tutti", 12807, 85, 122, 60, 14
+ PUSHBUTTON "Sì a &tutti", 12807, 85, 122, 60, 14
PUSHBUTTON "&No", IDNO, 150, 122, 60, 14
PUSHBUTTON "Annulla", IDCANCEL, 215, 122, 60, 14
ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL
@@ -466,7 +466,7 @@
FONT 8, "MS Shell Dlg"
BEGIN
ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL
- LTEXT "Siete sicuro di voler Chiudere la sessione?", -1, 43, 11, 140, 22
+ LTEXT "Siete sicuro di voler chiudere la sessione?", -1, 43, 11, 140, 22
DEFPUSHBUTTON "&Chiudi sessione", IDOK, 57, 40, 60, 14
PUSHBUTTON "Annulla", IDCANCEL, 122, 40, 60, 14
END
@@ -583,7 +583,7 @@
GROUPBOX "Opzioni per la verifica del disco", -1, 7, 6, 179, 50
PUSHBUTTON "Annulla", IDCANCEL, 118, 100, 60, 14
AUTOCHECKBOX "Correggi automaticamente gli errori", 14000, 16, 15, 155, 10
- AUTOCHECKBOX "&Ricerca dei settori difettosi e tentativo di correzione",
14001, 16, 30, 165, 10
+ AUTOCHECKBOX "&Cerca i settori difettosi e tenta di correggerli", 14001,
16, 30, 165, 10
CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8
LTEXT "", 14003, 60, 80, 170, 10
END
@@ -680,10 +680,10 @@
IDS_LOGOFF_PROMPT "Volete disconnettervi?"
/* Run File dialog */
- IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal
error)"
- IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal
error)"
- IDS_RUNDLG_BROWSE_CAPTION "Browse"
- IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files
(*.*)\0*.*\0"
+ IDS_RUNDLG_ERROR "Impossibile mostrare il dialogo Eseguire (errore
interno)"
+ IDS_RUNDLG_BROWSE_ERROR "Impossibile mostrare il dialogo sfoglia (errore
interno)"
+ IDS_RUNDLG_BROWSE_CAPTION "Sfoglia"
+ IDS_RUNDLG_BROWSE_FILTER "File Eseguibili (*.exe)\0*.exe\0Tutti i file
(*.*)\0*.*\0"
/* shell folder path default values */
IDS_PROGRAMS "Menu Avvio\\Programmi"
@@ -733,22 +733,22 @@
IDS_RECYCLEBIN_LOCATION "Posizione del Cestino"
IDS_RECYCLEBIN_DISKSPACE "Spazio disponibile"
IDS_EMPTY_BITBUCKET "Svuota cestino"
- IDS_PICK_ICON_TITLE "Scegliere un icona"
- IDS_PICK_ICON_FILTER "Icone (*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0"
- IDS_OPEN_WITH_FILTER "File eseguibili (*.exe)\0*.exe\0All Files
(*.*)\0*.*\0"
+ IDS_PICK_ICON_TITLE "Scegliere un'icona"
+ IDS_PICK_ICON_FILTER "Icone (*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0Tutti i file (*.*)\0*.*\0"
+ IDS_OPEN_WITH_FILTER "File eseguibili (*.exe)\0*.exe\0Tutti i file
(*.*)\0*.*\0"
IDS_DIRECTORY "Cartella"
- IDS_VIRTUAL_DRIVER "Virtual Device Driver"
- IDS_BAT_FILE "ReactOS Batch File"
- IDS_CMD_FILE "ReactOS Command Script"
- IDS_COM_FILE "Applicazione Dos"
+ IDS_VIRTUAL_DRIVER "Driver di Periferica Virtuale"
+ IDS_BAT_FILE "File Batch ReactOS"
+ IDS_CMD_FILE "Script di comandi ReactOS"
+ IDS_COM_FILE "Applicazione DOS"
IDS_CPL_FILE "Elemento del pannello di controllo"
IDS_CUR_FILE "Cursore"
IDS_DLL_FILE "Estensione di applicazione"
- IDS_DRV_FILE "Device Driver"
+ IDS_DRV_FILE "Driver di periferica"
IDS_EXE_FILE "Applicazione"
IDS_FON_FILE "Font"
IDS_TTF_FILE "TrueType Font"
- IDS_HLP_FILE "Help File"
+ IDS_HLP_FILE "File della guida"
IDS_INI_FILE "Impostazioni di configurazione"
IDS_LNK_FILE "Collegamento"
IDS_SYS_FILE "File di sistema"
Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s…
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Wed May 25
21:13:50 2011
@@ -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(a)gmail.com) (Apr, 2011)
*/
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
@@ -223,7 +224,7 @@
LTEXT "", 14011, 68, 93, 160, 10
LTEXT "Utworzony:", 14014, 8, 118, 45, 10
LTEXT "", 14015, 68, 118, 160, 10
- AUTOCHECKBOX "&Tylko-do-odczytu", 14021, 45, 150, 67, 10
+ AUTOCHECKBOX "&Tylko do odczytu", 14021, 45, 150, 67, 10
AUTOCHECKBOX "&Ukryty", 14022, 126, 150, 50, 10
END
@@ -445,10 +446,10 @@
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 @@
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 naciniê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 naciniê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 @@
IDS_TRASHFOLDER_TEXT "Czy jeste pewien, ¿e chcesz umieciæ folder
'%1' i ca³¹ jego zawartoæ w koszu"
IDS_TRASHMULTIPLE_TEXT "Elementów: %1 - czy na pewno chcesz je umieciæ 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 @@
IDS_DEFAULT_CLUSTER_SIZE "Domylny rozmiar jednostki alokacji"
IDS_COPY_OF "Kopia"
- IDS_SHLEXEC_NOASSOC "¯aden program nie jest skonfigurowane by otwieraæ
pliki tego typu."
-END
+ IDS_SHLEXEC_NOASSOC "¯aden program nie jest skonfigurowany, by otwieraæ
pliki tego typu."
+END
Modified: branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s…
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Wed May 25
21:13:50 2011
@@ -593,7 +593,7 @@
/* get current file */
from = &Context->from->feFiles[Context->Index];
- if (Context->op->req->fFlags != FO_DELETE)
+ if (Context->op->req->wFunc != FO_DELETE)
to = &Context->to->feFiles[Context->Index];
/* update status */
4922
days inactive
4922
days old
0 comments
1 participants
participants (1)
-
gedmurphy＠svn.reactos.org