[ros-diffs] [dreimer] 33291: Sync WineFile to Code frozen Wine. Bug 3215: some updates and slovak translations by Mario Kacmar ([e-mail])

Author: dreimer
Date: Mon May  5 08:05:42 2008
New Revision: 33291

URL: http://svn.reactos.org/svn/reactos?rev=33291&view=rev
Log:
Sync WineFile to Code frozen Wine.
Bug 3215: some updates and slovak translations by Mario Kacmar (kario(a)szm.sk)

Added:
    trunk/rosapps/magnify/lang/sk-SK.rc   (with props)
Modified:
    trunk/rosapps/magnify/rsrc.rc
    trunk/rosapps/packmgr/lib/lang/cs-CZ.rc
    trunk/rosapps/winefile/Makefile.in
    trunk/rosapps/winefile/lang/fr-FR.rc
    trunk/rosapps/winefile/lang/ko-KO.rc
    trunk/rosapps/winefile/lang/pl-PL.rc
    trunk/rosapps/winefile/lang/sl-SI.rc
    trunk/rosapps/winefile/winefile.c

Added: trunk/rosapps/magnify/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/sk-SK.rc?rev=…
==============================================================================
--- trunk/rosapps/magnify/lang/sk-SK.rc (added)
+++ trunk/rosapps/magnify/lang/sk-SK.rc [iso-8859-1] Mon May  5 08:05:42 2008
@@ -1,0 +1,64 @@
+LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+
+IDC_MAGNIFIER MENU
+BEGIN
+    POPUP "&Súbor"
+    BEGIN
+        MENUITEM "S&konèi",                       IDM_EXIT
+        MENUITEM "&Možnosti",                    IDM_OPTIONS
+        MENUITEM SEPARATOR
+        MENUITEM "È&o je ...",                  IDM_ABOUT
+    END
+END
+
+IDC_MAGNIFIER ACCELERATORS
+BEGIN
+    "?",            IDM_ABOUT,              ASCII,  ALT
+    "/",            IDM_ABOUT,              ASCII,  ALT
+END
+
+IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU
+CAPTION "Èo je Lupa"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    ICON            IDI_ICON,IDC_MYICON,14,9,20,20
+    LTEXT           "Lupa (Magnifier) verzia
1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX
+    LTEXT           "Copyright (C) 2007 Marc Piulachs
(marc.piulachs(a)codexchange.net)",IDC_STATIC,48,24,125,22
+    PUSHBUTTON      "OK",IDOK,162,48,50,14
+END
+
+IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION |
WS_SYSMENU
+CAPTION "Nastavenia Lupy"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "Koniec",IDOK,96,161,50,14
+    PUSHBUTTON      "Pomocník",IDOK,38,161,50,14
+    LTEXT           "Úroveò zväèšenia:",IDC_STATIC,6,8,68,8
+    COMBOBOX        IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL |
WS_TABSTOP
+    GROUPBOX        "Tracking",IDC_STATIC,7,25,139,59
+    GROUPBOX        "Presentation",IDC_STATIC,7,87,139,57
+    CONTROL         "Follow mouse
cursor",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,18,42,114,10
+    CONTROL         "Follow keyboard
focus",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,18,54,114,10
+    CONTROL         "Follow text
editing",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,18,66,114,10
+    CONTROL         "Invertova
farby",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,18,102,114,10
+    CONTROL         "Zaèa
minimalizovane",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,18,114,114,10
+    CONTROL         "Zobrazi
Lupu",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,18,126,114,10
+END
+
+IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+CAPTION "Lupa systému ReactOS"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,193,76,50,14
+    ICON            IDI_ICON,IDC_STATIC,7,17,20,20
+    LTEXT           "Magnifier is intended to provide a minimum level of
functionality for users with slight visual impairments. Most users with visual impairments
will need a magnification utility with higher funcionality for daily
use.",IDC_STATIC,36,7,207,33
+    CONTROL         "Do not show this message again",IDC_SHOWWARNINGCHECK,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10
+END
+
+STRINGTABLE
+BEGIN
+    IDS_APP_TITLE           "Lupa"
+END

Propchange: trunk/rosapps/magnify/lang/sk-SK.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/rosapps/magnify/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/rsrc.rc?rev=33291&…
==============================================================================
--- trunk/rosapps/magnify/rsrc.rc [iso-8859-1] (original)
+++ trunk/rosapps/magnify/rsrc.rc [iso-8859-1] Mon May  5 08:05:42 2008
@@ -8,4 +8,5 @@
 #include "lang/fr-FR.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"
+#include "lang/sk-SK.rc"
 #include "lang/uk-UA.rc"

Modified: trunk/rosapps/packmgr/lib/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/lang/cs-CZ.rc?…
==============================================================================
--- trunk/rosapps/packmgr/lib/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/rosapps/packmgr/lib/lang/cs-CZ.rc [iso-8859-1] Mon May  5 08:05:42 2008
@@ -11,7 +11,7 @@
   ERR_DOWNL	   "Vyžadovaný soubor nemohl být stažen!\nProsím podívejte se do logu
pro detaily."
   ERR_FILE	   "Nastala chyba bìhem vykonávání skriptu.\nSoubor nelze otevøít."
 
-  ERR_SYNATX       "Nastala chyba bìhem vykonávání skriptu.\nChybná synatxe."
+  ERR_SYNATX       "Nastala chyba bìhem vykonávání skriptu.\nChybná syntaxe."
   ERR_CALL         "Nastala chyba bìhem vykonávání skriptu.\nNelze najít
funkci."
   ERR_PARAMETER    "Nastala chyba bìhem vykonávání skriptu.\nNesprávný
parametr(y)."
 

Modified: trunk/rosapps/winefile/Makefile.in
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/Makefile.in?rev=3…
==============================================================================
--- trunk/rosapps/winefile/Makefile.in [iso-8859-1] (original)
+++ trunk/rosapps/winefile/Makefile.in [iso-8859-1] Mon May  5 08:05:42 2008
@@ -5,8 +5,7 @@
 VPATH     = @srcdir@
 MODULE    = winefile.exe
 APPMODE   = -mwindows
-IMPORTS   = shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi32 kernel32
-EXTRALIBS = -luuid
+IMPORTS   = uuid shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi32
kernel32
 
 C_SRCS = \
 	splitpath.c \

Modified: trunk/rosapps/winefile/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/fr-FR.rc?rev…
==============================================================================
--- trunk/rosapps/winefile/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/rosapps/winefile/lang/fr-FR.rc [iso-8859-1] Mon May  5 08:05:42 2008
@@ -6,7 +6,7 @@
  * Copyright 2002 Steven Edwards
  * Copyright 2002 Alexandre Julliard
  * Copyright 2003 Sylvain Petreolle
- * Copyright 2005-2006 Jonathan Ernst
+ * Copyright 2005-2008 Jonathan Ernst
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -33,8 +33,8 @@
         MENUITEM "&Ouvrir\tEntrée",             ID_ACTIVATE
         MENUITEM "&Déplacer...\tF7",            ID_FILE_MOVE
         MENUITEM "&Copier...\tF8",              ID_FILE_COPY
-        MENUITEM "P&resse-Papiers...\tF9",      118
-        MENUITEM "&Effacer\tDel",               ID_FILE_DELETE
+        MENUITEM "P&resse-papiers...\tF9",      118
+        MENUITEM "&Effacer\tSuppr",               ID_FILE_DELETE
         MENUITEM "Re&nommer...",                109
         MENUITEM "&Propriétés...\tAlt+Entree", ID_EDIT_PROPERTIES
         MENUITEM SEPARATOR
@@ -62,7 +62,7 @@
         MENUITEM SEPARATOR
         MENUITEM "&Formater Disque...",         ID_FORMAT_DISK
 #ifdef _WIN95
-        MENUITEM "Créer un disque *système...", -1  /*TODO*/
+        MENUITEM "Créer un disque &système...", -1  /*TODO*/
 #endif
         MENUITEM SEPARATOR
         MENUITEM "Connecter un lecteur &réseau",ID_CONNECT_NETWORK_DRIVE
@@ -167,7 +167,7 @@
 FONT 8, "MS Shell Dlg"
 {
     CONTROL         "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6,
162, 10
-    CONTROL         "&Dossier :", -1, "Static",
SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10
+    CONTROL         "&Chemin :", -1, "Static",
SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10
     EDITTEXT        201, 3, 29, 134, 12, ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK", 1, 158, 6, 47, 14
     PUSHBUTTON      "Annuler", 2, 158, 23, 47, 14
@@ -179,7 +179,7 @@
 CAPTION "Par type de fichier"
 FONT 8, "MS Sans Serif"
 BEGIN
-    LTEXT           "&Name:",-1,7,8,22,10
+    LTEXT           "&Nom :",-1,7,8,22,10
     EDITTEXT        IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL
     GROUPBOX        "Type de fichier",-1,7,23,87,56
     CONTROL        
"&Répertoires",IDC_VIEW_TYPE_DIRECTORIES,"Button",
@@ -211,7 +211,7 @@
     EDITTEXT        IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
     LTEXT           "Version :",-1,7,40,59,9
     EDITTEXT        IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
-    LTEXT           "Cop&yright:",-1,7,51,59,9
+    LTEXT           "Cop&yright :",-1,7,51,59,9
     EDITTEXT        IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
     LTEXT           "Taille :",-1,7,62,59,9
     EDITTEXT        IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER |
WS_TABSTOP

Modified: trunk/rosapps/winefile/lang/ko-KO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/ko-KO.rc?rev…
==============================================================================
--- trunk/rosapps/winefile/lang/ko-KO.rc [iso-8859-1] (original)
+++ trunk/rosapps/winefile/lang/ko-KO.rc [iso-8859-1] Mon May  5 08:05:42 2008
@@ -176,7 +176,7 @@
 IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "ÆÄÀÏ Å¸ÀÔÀ¸·Î"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Sans Serif"
 BEGIN
     LTEXT           "À̸§(&N):",-1,7,8,22,10
     EDITTEXT        IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL
@@ -190,7 +190,7 @@
     CONTROL         "´Ù¸¥
ÆÄÀÏ(&O)",IDC_VIEW_TYPE_OTHERS,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10
     CONTROL         "¼û±è/½Ã½ºÅÛ ÆÄÀÏ º¸¿©ÁÖ±â(&S)",IDC_VIEW_TYPE_HIDDEN,
-                    "¹öÆ°",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9
     DEFPUSHBUTTON   "È®ÀÎ",IDOK,104,7,50,14
     PUSHBUTTON      "Ãë¼Ò",IDCANCEL,104,24,50,14
 END
@@ -198,11 +198,12 @@
 IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE  0, 0, 248, 215
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "%s ¼Ó¼º"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "È®ÀÎ",IDOK,191,7,50,14
     PUSHBUTTON      "Ãë¼Ò",IDCANCEL,191,29,50,14
     LTEXT           "ÆÄÀÏ À̸§(&F):",-1,7,7,59,9
+
     EDITTEXT        IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
     LTEXT           "¿ÏÀüÇÑ °æ·Î(&P):",-1,7,18,59,9
     EDITTEXT        IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
@@ -241,7 +242,7 @@
     IDS_DESKTOP             "µ¥½ºÅ©Å¾"
     IDS_SHELL               "¼¿"
     IDS_TITLEFMT            "%s - %s"
-    IDS_NO_IMPL             "¹Ì±¸Çö"
+    IDS_NO_IMPL             "¾ÆÁ÷ ±¸Çö¾ÈµÊ"
     IDS_WINE_FILE           "Wine ÆÄÀÏ"
 }
 

Modified: trunk/rosapps/winefile/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/pl-PL.rc?rev…
==============================================================================
--- trunk/rosapps/winefile/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/rosapps/winefile/lang/pl-PL.rc [iso-8859-1] Mon May  5 08:05:42 2008
@@ -133,7 +133,7 @@
         MENUITEM "RozmieϾ automatycznie",      ID_WINDOW_AUTOSORT
 #endif
         MENUITEM "RozmieϾ &symbole",           ID_WINDOW_ARRANGE
-        MENUITEM "&Odœwierz\tF5",               ID_REFRESH
+        MENUITEM "&Odœwie¿\tF5",               ID_REFRESH
     }
 
     POPUP "&?"  {
@@ -201,7 +201,7 @@
 FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,191,7,50,14
-    PUSHBUTTON      "Anulujl",IDCANCEL,191,29,50,14
+    PUSHBUTTON      "Anuluj",IDCANCEL,191,29,50,14
     LTEXT           "&Nazwa pliku:",-1,7,7,59,9
     EDITTEXT        IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
     LTEXT           "&Pe³na œcie¿ka:",-1,7,18,59,9

Modified: trunk/rosapps/winefile/lang/sl-SI.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/sl-SI.rc?rev…
==============================================================================
--- trunk/rosapps/winefile/lang/sl-SI.rc [iso-8859-1] (original)
+++ trunk/rosapps/winefile/lang/sl-SI.rc [iso-8859-1] Mon May  5 08:05:42 2008
@@ -2,7 +2,7 @@
  * WineFile
  * Slovenian Language Support
  *
- * Copyright 2003 Rok Mandeljc <rok.mandeljc(a)gimb.org>
+ * Copyright 2003, 2008 Rok Mandeljc
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,140 +19,244 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 
 /* Menu */
 
 IDM_WINEFILE MENU FIXED IMPURE
 {
-    POPUP "&File"  {
-        MENUITEM "&Open\tEnter",                ID_ACTIVATE
-        MENUITEM "&Move...\tF7",                ID_FILE_MOVE
-        MENUITEM "&Copy...\tF8",                ID_FILE_COPY
-        MENUITEM "&In Clipboard...\tF9",        118
-        MENUITEM "&Delete\tDel",                ID_FILE_DELETE
-        MENUITEM "Re&name...",                  109
-        MENUITEM "Propert&ies...\tAlt+Enter",   ID_EDIT_PROPERTIES
-        MENUITEM SEPARATOR
-        MENUITEM "C&ompress...",                119
-        MENUITEM "Dec&ompress...",              120
-        MENUITEM SEPARATOR
-        MENUITEM "&Run...",                     ID_EXECUTE
-        MENUITEM "&Print...",                   102
-        MENUITEM "Associate...",                103
-        MENUITEM SEPARATOR
-        MENUITEM "Cr&eate Directory...",        111
-        MENUITEM "Searc&h...",                  104
-        MENUITEM "&Select Files...",            116
+    POPUP "&Datoteka"  {
+        MENUITEM "&Odpri\tEnter",                ID_ACTIVATE
+        MENUITEM "&Premakni ...\tF7",                ID_FILE_MOVE
+        MENUITEM "&Kopiraj ...\tF8",                ID_FILE_COPY
+        MENUITEM "&Na odložišče ...\tF9",        118
+        MENUITEM "&Izbriši\tDel",                ID_FILE_DELETE
+        MENUITEM "P&reimenuj ...",                  109
+        MENUITEM "&Lastnosti ...\tAlt+Enter",   ID_EDIT_PROPERTIES
+        MENUITEM SEPARATOR
+        MENUITEM "&Stisni ...",                119
+        MENUITEM "Ra&zširi ...",              120
+        MENUITEM SEPARATOR
+        MENUITEM "Zaž&eni ...",                     ID_EXECUTE
+        MENUITEM "&Tiskaj ...",                   102
+        MENUITEM "Poveži s programom ...",                103
+        MENUITEM SEPARATOR
+        MENUITEM "Ustvari &mapo...",        111
+        MENUITEM "&Išči ...",                  104
+        MENUITEM "Iz&beri datoteke ...",            116
         MENUITEM SEPARATOR
 #ifndef _NO_EXTENSIONS
-        MENUITEM "E&xit\tAlt+X",                ID_FILE_EXIT
+        MENUITEM "Iz&hod\tAlt+X",                ID_FILE_EXIT
 #else
-        MENUITEM "E&xit",                       ID_FILE_EXIT
-#endif
-    }
-
-    POPUP "&Disk"  {
-        MENUITEM "&Copy Disk...",               201
-        MENUITEM "&Label Disk...",              202
-        MENUITEM SEPARATOR
-        MENUITEM "&Format Disk...",             ID_FORMAT_DISK
+        MENUITEM "Iz&hod",                       ID_FILE_EXIT
+#endif
+    }
+
+    POPUP "Po&goni"  {
+        MENUITEM "&Kopiraj disk ...",               201
+        MENUITEM "&Označi disk ...",              202
+        MENUITEM SEPARATOR
+        MENUITEM "&Formatiraj disk ...",             ID_FORMAT_DISK
 #ifdef _WIN95
-        MENUITEM "&Make System Disk...", -1 /*TODO*/
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "Connect &Network Drive",      ID_CONNECT_NETWORK_DRIVE
-        MENUITEM "&Disconnect Network Drive",  
ID_DISCONNECT_NETWORK_DRIVE
-        MENUITEM SEPARATOR
-        MENUITEM "Share as...",                 254
-        MENUITEM "&Remove Share...",            255
-        MENUITEM SEPARATOR
-        MENUITEM "&Select Drive...",            251
-    }
-
-    POPUP "&Directories"  {
-        MENUITEM "&Next Level\t+",              301
-        MENUITEM "Expand &Tree\t*",             302
-        MENUITEM "Expand &all\tStrg+*",         303
-        MENUITEM "Collapse &Tree\t-",           304
-        MENUITEM SEPARATOR
-        MENUITEM "&Mark Childs",                505
-    }
-
-    POPUP "&View"  {
-        MENUITEM "T&ree and Directory",         413
-        MENUITEM "Tr&ee Only",                  411
-        MENUITEM "Directory &Only",             412
-        MENUITEM SEPARATOR
-        MENUITEM "Sp&lit",                      ID_VIEW_SPLIT
-        MENUITEM SEPARATOR
-        MENUITEM "&Name",                       ID_VIEW_NAME
-        MENUITEM "&All File Details",           ID_VIEW_ALL_ATTRIBUTES,
CHECKED
-        MENUITEM "&Partial Details...",        
ID_VIEW_SELECTED_ATTRIBUTES
-        MENUITEM SEPARATOR
-        MENUITEM "&Sort by Name",               ID_VIEW_SORT_NAME
-        MENUITEM "Sort &by Type",               ID_VIEW_SORT_TYPE
-        MENUITEM "Sort by Si&ze",               ID_VIEW_SORT_SIZE
-        MENUITEM "Sort by &Date",               ID_VIEW_SORT_DATE
-        MENUITEM SEPARATOR
-        MENUITEM "Filter by &...",              ID_VIEW_FILTER
-    }
-
-    POPUP "&Options"  {
-        MENUITEM "&Confirmation...",            501
-        MENUITEM "&Font...",                    ID_SELECT_FONT
-        MENUITEM "Customize Tool&bar...",       512
-        MENUITEM SEPARATOR
-        MENUITEM "&Toolbar",                    ID_VIEW_TOOL_BAR, CHECKED
-        MENUITEM "&Drivebar",                   ID_VIEW_DRIVE_BAR, CHECKED
-        MENUITEM "&Status Bar",                 ID_VIEW_STATUSBAR, CHECKED
+        MENUITEM "Ustvari &sistemsko disketo ...", -1 /*TODO*/
+#endif
+        MENUITEM SEPARATOR
+        MENUITEM "Poveži se z o&mrežnim pogonom",     
ID_CONNECT_NETWORK_DRIVE
+        MENUITEM "O&dklopi omrežni pogon",   ID_DISCONNECT_NETWORK_DRIVE
+        MENUITEM SEPARATOR
+        MENUITEM "V skupno rabo kot ...",                 254
+        MENUITEM "Odst&rani iz skupne rabe ...",            255
+        MENUITEM SEPARATOR
+        MENUITEM "Iz&beri pogon ...",            251
+    }
+
+    POPUP "&Mape"  {
+        MENUITEM "&Naslednji nivo\t+",              301
+        MENUITEM "Razširi &drevo\t*",             302
+        MENUITEM "Razširi &vse\tStrg+*",         303
+        MENUITEM "Skrči d&revo\t-",           304
+        MENUITEM SEPARATOR
+        MENUITEM "&Označi vsebino",              505
+    }
+
+    POPUP "Pog&led"  {
+        MENUITEM "&Drevo in mape",         413
+        MENUITEM "Samo d&revo",                  411
+        MENUITEM "Samo &mape",             412
+        MENUITEM SEPARATOR
+        MENUITEM "&Ločeno",                      ID_VIEW_SPLIT
+        MENUITEM SEPARATOR
+        MENUITEM "&Ime",                       ID_VIEW_NAME
+        MENUITEM "Vse &podrobnosti datoteke",          
ID_VIEW_ALL_ATTRIBUTES, CHECKED
+        MENUITEM "&Delne podrobnosti ...",        
ID_VIEW_SELECTED_ATTRIBUTES
+        MENUITEM SEPARATOR
+        MENUITEM "Razvrsti po &imenu",               ID_VIEW_SORT_NAME
+        MENUITEM "Razvrsti po &vrsti",               ID_VIEW_SORT_TYPE
+        MENUITEM "Razvrsti po ve&likosti",               ID_VIEW_SORT_SIZE
+        MENUITEM "Razvrsti po datu&mu",               ID_VIEW_SORT_DATE
+        MENUITEM SEPARATOR
+        MENUITEM "Filter &...",              ID_VIEW_FILTER
+    }
+
+    POPUP "M&ožnosti"  {
+        MENUITEM "Potr&ditev ...",            501
+        MENUITEM "&Pisava ...",                    ID_SELECT_FONT
+        MENUITEM "Uredi &orodno vrstico ...",       512
+        MENUITEM SEPARATOR
+        MENUITEM "&Orodna vrstica",                    ID_VIEW_TOOL_BAR,
CHECKED
+        MENUITEM "Vrstica po&gonov",                   ID_VIEW_DRIVE_BAR,
CHECKED
+        MENUITEM "&Statusna vrstica",                 ID_VIEW_STATUSBAR,
CHECKED
 #ifndef _NO_EXTENSIONS
-        MENUITEM "F&ull Screen\tCtrl+Shift+S",  ID_VIEW_FULLSCREEN
-#endif
-        MENUITEM SEPARATOR
-        MENUITEM "&Minize on run",              504
-        MENUITEM "&Save settings on exit",      511
-    }
-
-
-    POPUP "&Security"  {
-        MENUITEM "&Access...",                  605
-        MENUITEM "&Logging...",                 606
-        MENUITEM "&Owner...",                   607
-    }
-
-    POPUP "&Window"  {
-        MENUITEM "New &Window",                 ID_WINDOW_NEW
-        MENUITEM "Cascading\tCtrl+F5",          ID_WINDOW_CASCADE
-        MENUITEM "Tile &Horizontally",          ID_WINDOW_TILE_HORZ
-        MENUITEM "Tile &Vertically\tCtrl+F4",   ID_WINDOW_TILE_VERT
+        MENUITEM "&Cel zaslon\tCtrl+Shift+S",  ID_VIEW_FULLSCREEN
+#endif
+        MENUITEM SEPARATOR
+        MENUITEM "Poman&jšaj ob zagonu",            504
+        MENUITEM "S&hrani nastavitve ob izhodu",      ID_VIEW_SAVESETTINGS
+    }
+
+
+    POPUP "&Varnost"  {
+        MENUITEM "&Dostop ...",                  605
+        MENUITEM "&Beleženje ...",                 606
+        MENUITEM "&Lastnik ...",                   607
+    }
+
+    POPUP "O&kno"  {
+        MENUITEM "Novo &okno",                 ID_WINDOW_NEW
+        MENUITEM "V kaskado\tCtrl+F5",          ID_WINDOW_CASCADE
+        MENUITEM "&Horizontalna razporeditev",         
ID_WINDOW_TILE_HORZ
+        MENUITEM "&Vertikalna razporeditev\tCtrl+F4",  
ID_WINDOW_TILE_VERT
 #ifndef _NO_EXTENSIONS
-        MENUITEM "Arrange Automatically",       ID_WINDOW_AUTOSORT
-#endif
-        MENUITEM "Arrange &Symbols",            ID_WINDOW_ARRANGE
-        MENUITEM "&Refresh\tF5",                ID_REFRESH
-    }
-
-    POPUP "&?"  {
-        MENUITEM "&Help Topics\tF1",            ID_HELP
-        MENUITEM "Help &Search...\tF1",         ID_HELP
-        MENUITEM "&Using Help\tF1",             ID_HELP_USING
-        MENUITEM SEPARATOR
-        MENUITEM "&Info about Winefile...",     ID_ABOUT
+        MENUITEM "Samodejna razporeditev",       ID_WINDOW_AUTOSORT
+#endif
+        MENUITEM "Razporedi &simbole",            ID_WINDOW_ARRANGE
+        MENUITEM "O&sveži\tF5",                ID_REFRESH
+    }
+
+    POPUP "&Pomoč"  {
+        MENUITEM "&Teme pomoči\tF1",            ID_HELP
+        MENUITEM "&Iskanje po pomoči ...\tF1",         ID_HELP
+        MENUITEM "&Uporaba pomoči\tF1",             ID_HELP_USING
+        MENUITEM SEPARATOR
+        MENUITEM "&O Winefile ...",     ID_ABOUT
     }
 }
 
 
 IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Execute"
+CAPTION "Zagon"
 FONT 8, "MS Shell Dlg"
 {
     CONTROL         "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6,
162, 10
-    CONTROL         "&Command:", -1, "Static",
SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10
+    CONTROL         "&Ukaz:", -1, "Static",
SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10
     EDITTEXT        201, 3, 29, 134, 12, ES_AUTOHSCROLL
-    CONTROL         "As &Symbol", 214, "Button",
BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12
-    DEFPUSHBUTTON   "OK", 1, 158, 6, 47, 14
-    PUSHBUTTON      "Cancel", 2, 158, 23, 47, 14
-    PUSHBUTTON      "&Help", 254, 158, 43, 47, 14
-}
+    CONTROL         "Kot &simbol", 214, "Button",
BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12
+    DEFPUSHBUTTON   "V redu", 1, 158, 6, 47, 14
+    PUSHBUTTON      "Prekliči", 2, 158, 23, 47, 14
+    PUSHBUTTON      "&Pomoč", 254, 158, 43, 47, 14
+}
+
+IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Izbira ciljne poti"
+FONT 8, "MS Shell Dlg"
+{
+    CONTROL         "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6,
162, 10
+    CONTROL         "&Pot:", -1, "Static",
SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10
+    EDITTEXT        201, 3, 29, 134, 12, ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "V redu", 1, 158, 6, 47, 14
+    PUSHBUTTON      "Prekliči", 2, 158, 23, 47, 14
+    PUSHBUTTON      "&Brskaj", 254, 158, 43, 47, 14
+}
+
+IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Glede na vrsto datoteke"
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "&Ime:",-1,7,8,22,10
+    EDITTEXT        IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL
+    GROUPBOX        "Vrsta datoteke",-1,7,23,87,56
+    CONTROL         "&Mape",IDC_VIEW_TYPE_DIRECTORIES,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10
+    CONTROL         "&Programi",IDC_VIEW_TYPE_PROGRAMS,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10
+    CONTROL        
"&Dokumenti",IDC_VIEW_TYPE_DOCUMENTS,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10
+    CONTROL         "&Ostalo",IDC_VIEW_TYPE_OTHERS,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10
+    CONTROL         "Pokaži skrite/&sistemske
datoteke",IDC_VIEW_TYPE_HIDDEN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9
+    DEFPUSHBUTTON   "V redu",IDOK,104,7,50,14
+    PUSHBUTTON      "Prekliči",IDCANCEL,104,24,50,14
+END
+
+IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE  0, 0, 248, 215
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Lastnosti %s"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "V redu",IDOK,191,7,50,14
+    PUSHBUTTON      "Prekliči",IDCANCEL,191,29,50,14
+    LTEXT           "&Ime datoteke:",-1,7,7,59,9
+    EDITTEXT        IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
+    LTEXT           "Polna &pot:",-1,7,18,59,9
+    EDITTEXT        IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
+    LTEXT           "Nazadnje spremenjeno:",-1,7,29,59,9
+    EDITTEXT        IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
+    LTEXT           "Različica:",-1,7,40,59,9
+    EDITTEXT        IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
+    LTEXT           "&Avtorske pravice:",-1,7,51,59,9
+    EDITTEXT        IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
+    LTEXT           "Velikost:",-1,7,62,59,9
+    EDITTEXT        IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER |
WS_TABSTOP
+    GROUPBOX        "Attributi",-1,7,79,158,46
+    CONTROL         "Samo za
&branje",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,17,91,68,9
+    CONTROL        
"S&krito",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,92,91,68,9
+    CONTROL        
"&Arhiv",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,17,101,68,9
+    CONTROL        
"&Sistemsko",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,92,101,68,9
+    CONTROL         "S&tisnjeno",IDC_CHECK_COMPRESSED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9
+    GROUPBOX        "Informacije o &različici",-1,7,129,234,79
+    LISTBOX         IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT |
LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE |
ES_READONLY | WS_VSCROLL
+END
+
+
+STRINGTABLE
+{
+    IDS_FONT_SEL_DLG_NAME   "Uveljavljam nastavitve pisave"
+    IDS_FONT_SEL_ERROR      "Napaka pri izbiranju nove pisave."
+}
+
+STRINGTABLE
+{
+    IDS_WINEFILE            "Winefile"
+    IDS_ERROR               "Napaka"
+    IDS_ROOT_FS             "root fs"
+    IDS_UNIXFS              "unixfs"
+    IDS_DESKTOP             "Namizje"
+    IDS_SHELL               "Shell"
+    IDS_TITLEFMT            "%s - %s"
+    IDS_NO_IMPL             "Ni (Å¡e) na voljo"
+    IDS_WINE_FILE           "Wine File"
+}
+
+STRINGTABLE
+{
+    IDS_COL_NAME            "Ime"
+    IDS_COL_SIZE            "Velikost"
+    IDS_COL_CDATE           "CDate"
+    IDS_COL_ADATE           "ADate"
+    IDS_COL_MDATE           "MDate"
+    IDS_COL_IDX             "Indeks/Inoda"
+    IDS_COL_LINKS           "Povezave"
+    IDS_COL_ATTR            "Attributi"
+    IDS_COL_SEC             "Varnost"
+
+    IDS_FREE_SPACE_FMT      "Prosto: %s od %s"
+}
+
+#pragma code_page(default)

Modified: trunk/rosapps/winefile/winefile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.c?rev=33…
==============================================================================
--- trunk/rosapps/winefile/winefile.c [iso-8859-1] (original)
+++ trunk/rosapps/winefile/winefile.c [iso-8859-1] Mon May  5 08:05:42 2008
@@ -2406,7 +2406,7 @@
 					if (DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_EXECUTE), hwnd,
ExecuteDialogDlgProc, (LPARAM)&dlg) == IDOK) {
 						HINSTANCE hinst = ShellExecute(hwnd, NULL/*operation*/, dlg.cmd/*file*/,
NULL/*parameters*/, NULL/*dir*/, dlg.cmdshow);
 
-						if ((int)hinst <= 32)
+						if (PtrToUlong(hinst) <= 32)
 							display_error(hwnd, GetLastError());
 					}
 					break;}
@@ -2598,13 +2598,13 @@
 
 #ifndef _NO_EXTENSIONS
 
-static HWND create_header(HWND parent, Pane* pane, int id)
+static HWND create_header(HWND parent, Pane* pane, UINT id)
 {
 	HD_ITEM hdi;
 	int idx;
 
 	HWND hwnd = CreateWindow(WC_HEADER, 0, WS_CHILD|WS_VISIBLE|HDS_HORZ|HDS_FULLDRAG/*TODO:
|HDS_BUTTONS + sort orders*/,
-								0, 0, 0, 0, parent, (HMENU)id, Globals.hInstance, 0);
+                                 0, 0, 0, 0, parent, (HMENU)ULongToHandle(id),
Globals.hInstance, 0);
 	if (!hwnd)
 		return 0;
 
@@ -2952,7 +2952,7 @@
 
 static WNDPROC g_orgTreeWndProc;
 
-static void create_tree_window(HWND parent, Pane* pane, int id, int id_header, LPCTSTR
pattern, int filter_flags)
+static void create_tree_window(HWND parent, Pane* pane, UINT id, UINT id_header, LPCTSTR
pattern, int filter_flags)
 {
 	static const TCHAR sListBox[] =
{'L','i','s','t','B','o','x','\0'};
 
@@ -2960,8 +2960,8 @@
 	Entry* entry = pane->root;
 
 	pane->hwnd = CreateWindow(sListBox, sEmpty,
WS_CHILD|WS_VISIBLE|WS_HSCROLL|WS_VSCROLL|
-								LBS_DISABLENOSCROLL|LBS_NOINTEGRALHEIGHT|LBS_OWNERDRAWFIXED|LBS_NOTIFY,
-								0, 0, 0, 0, parent, (HMENU)id, Globals.hInstance, 0);
+                                 
LBS_DISABLENOSCROLL|LBS_NOINTEGRALHEIGHT|LBS_OWNERDRAWFIXED|LBS_NOTIFY,
+                                  0, 0, 0, 0, parent, (HMENU)ULongToHandle(id),
Globals.hInstance, 0);
 
 	SetWindowLongPtr(pane->hwnd, GWLP_USERDATA, (LPARAM)pane);
 	g_orgTreeWndProc = (WNDPROC) SetWindowLongPtr(pane->hwnd, GWLP_WNDPROC,
(LPARAM)TreeWndProc);
@@ -3936,7 +3936,7 @@
 {
 	HINSTANCE hinst = ShellExecute(hwnd, NULL/*operation*/, cmd, NULL/*parameters*/,
NULL/*dir*/, nCmdShow);
 
-	if ((int)hinst <= 32) {
+	if (PtrToUlong(hinst) <= 32) {
 		display_error(hwnd, GetLastError());
 		return FALSE;
 	}
@@ -4780,7 +4780,7 @@
 
 
 	/* create main window */
-	Globals.hMainWnd = CreateWindowEx(0, (LPCTSTR)(int)Globals.hframeClass,
RS(b1,IDS_WINE_FILE), WS_OVERLAPPEDWINDOW,
+	Globals.hMainWnd = CreateWindowEx(0, MAKEINTRESOURCE(Globals.hframeClass),
RS(b1,IDS_WINE_FILE), WS_OVERLAPPEDWINDOW,
 					opts.start_x, opts.start_y, opts.width, opts.height,
 					hwndParent, Globals.hMenuFrame, Globals.hInstance, 0/*lpParam*/);