Merge trunk HEAD (r46369)

(part 6/6)

svn path=/branches/ros-amd64-bringup/; revision=46380

reactos/Makefile

@@ -169,11 +169,7 @@ else
 endif
 
 ifeq ($(ROS_AUTOMAKE),)
-  ifeq ($(ARCH),i386)
+  ROS_AUTOMAKE=makefile-$(ARCH).auto
-    ROS_AUTOMAKE=makefile.auto
-  else
-    ROS_AUTOMAKE=makefile-$(ARCH).auto
-  endif
 endif
 
 all: $(ROS_AUTOMAKE)

reactos/ReactOS-generic.rbuild

@@ -88,6 +88,7 @@
 
 	<group compilerset="gcc">
 		<compilerflag>-Wall</compilerflag>
+		<compilerflag>-Wno-char-subscripts</compilerflag>
 		<compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag>
 	</group>
 
@@ -117,10 +118,9 @@
 		</if>
 
 		<compilerflag>-fno-strict-aliasing</compilerflag>
-		<compilerflag>-Wno-strict-aliasing</compilerflag>
 		<compilerflag>-Wpointer-arith</compilerflag>
 		<compilerflag>-Wno-multichar</compilerflag>
-
+		<compilerflag>-Wno-error=uninitialized</compilerflag>
 		<!-- compilerflag>-H</compilerflag>    enable this for header traces -->
 	</group>
 

reactos/ReactOS-i386.rbuild

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+<project name="ReactOS" makefile="makefile-i386.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<xi:include href="config.rbuild">
 		<xi:fallback>
 			<xi:include href="config.template.rbuild" />
@@ -24,6 +24,7 @@
 			<compilerflag>-ftracer</compilerflag>
 			<compilerflag>-momit-leaf-frame-pointer</compilerflag>
 		</if>
+		<compilerflag>-fms-extensions</compilerflag>
 		<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
 		<compilerflag compiler="midl">-m32 --win32</compilerflag>
 		<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>

reactos/base/applications/applications.rbuild

@@ -22,6 +22,9 @@
 	<directory name="dxdiag">
 		<xi:include href="dxdiag/dxdiag.rbuild" />
 	</directory>
+	<directory name="extrac32">
+		<xi:include href="extrac32/extrac32.rbuild" />
+	</directory>
 	<directory name="fontview">
 		<xi:include href="fontview/fontview.rbuild" />
 	</directory>

reactos/base/applications/cacls/resource.h

@@ -1,5 +1,4 @@
-#ifndef _CACLS_RESOURCE_H
+#pragma once
-#define _CACLS_RESOURCE_H
 
 #define IDS_HELP                        101
 #define IDS_ABBR_CI                     102
@@ -40,5 +39,3 @@
 #define IDS_READ_CONTROL                137
 #define IDS_DELETE                      138
 #define IDS_STANDARD_RIGHTS_ALL         139
-
-#endif /* _CACLS_RESOURCE_H */

reactos/base/applications/calc/calc.h

@@ -1,5 +1,4 @@
-#ifndef __CALC_H__
+#pragma once
-#define __CALC_H__
 
 #include <windows.h>
 #include <tchar.h>
@@ -236,5 +235,3 @@ INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
 void ConvExecute(HWND hWnd);
 void ConvAdjust(HWND hWnd, int n_cat);
 void ConvInit(HWND hWnd);
-
-#endif

reactos/base/applications/calc/lang/de-DE.rc

@@ -324,7 +324,7 @@ END
 
 IDD_DIALOG_STAT DIALOGEX DISCARDABLE  0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Statistik Box"
+CAPTION "Statistikbox"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LISTBOX         IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | 
@@ -465,11 +465,11 @@ END
 // FLÄCHENTYPEN
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_AREA_ACRES                  "Acres"
+    IDS_AREA_ACRES                  "Acre"
-    IDS_AREA_ACRES_BRAZIL           "Acres (Brasilien)"
+    IDS_AREA_ACRES_BRAZIL           "Acre (Brasilien)"
-    IDS_AREA_ACRES_FRANCE           "Acres (Frankreich)"
+    IDS_AREA_ACRES_FRANCE           "Acre (Frankreich)"
-    IDS_AREA_ACRES_SCOTS            "Acres (Schottland)"
+    IDS_AREA_ACRES_SCOTS            "Acre (Schottland)"
-    IDS_AREA_ACRES_US               "Acres (USA)"
+    IDS_AREA_ACRES_US               "Acre (USA)"
     IDS_AREA_ARES                   "Ar"
     IDS_AREA_CHOU                   "Chou"
     IDS_AREA_DANBO                  "Danbo"
@@ -482,21 +482,21 @@ BEGIN
     IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
     IDS_AREA_RAI                    "Rai"
     IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CHR             "Qaudratchr"
+    IDS_AREA_SQUARE_CHR             "Quadratchr"
-    IDS_AREA_SQUARE_FATHOMS         "Qaudratfathom"
+    IDS_AREA_SQUARE_FATHOMS         "Quadratfathom"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Qaudratfathom (Ungarn)"
+    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Quadratfathom (Ungarn)"
-    IDS_AREA_SQUARE_FEET            "Qaudratfuß"
+    IDS_AREA_SQUARE_FEET            "Quadratfuß"
-    IDS_AREA_SQUARE_KILOMETERS      "Qaudratkilometer"
+    IDS_AREA_SQUARE_KILOMETERS      "Quadratkilometer"
-    IDS_AREA_SQUARE_LAR             "Qaudratlar"
+    IDS_AREA_SQUARE_LAR             "Quadratlar"
-    IDS_AREA_SQUARE_METER           "Qaudratmeter"
+    IDS_AREA_SQUARE_METER           "Quadratmeter"
-    IDS_AREA_SQUARE_MILES           "Qaudratmeilen"
+    IDS_AREA_SQUARE_MILES           "Quadratmeilen"
-    IDS_AREA_SQUARE_MILLIMETERS     "Qaudratmillimeter"
+    IDS_AREA_SQUARE_MILLIMETERS     "Quadratmillimeter"
-    IDS_AREA_SQUARE_SHAKU           "Qaudratshaku"
+    IDS_AREA_SQUARE_SHAKU           "Quadratshaku"
-    IDS_AREA_SQUARE_TSUEN           "Qaudrattsuen"
+    IDS_AREA_SQUARE_TSUEN           "Quadrattsuen"
-    IDS_AREA_SQUARE_VA              "Qaudratva"
+    IDS_AREA_SQUARE_VA              "Quadratva"
-    IDS_AREA_SQUARE_YARD            "Qaudratyard"
+    IDS_AREA_SQUARE_YARD            "Quadratyard"
     IDS_AREA_SQUARE_CENTIMETERS     "Quadratzentimeter"
-    IDS_AREA_SQUARE_INCHES          "Qaudratzoll"
+    IDS_AREA_SQUARE_INCHES          "Quadratzoll"
     IDS_AREA_TAN                    "Tan"
     IDS_AREA_TSUBO                  "Tsubo"
 END
@@ -517,7 +517,7 @@ BEGIN
     IDS_CURRENCY_DEUTSCHE_MARK      "Deutsche Mark"
     IDS_CURRENCY_EURO               "Euro"
     IDS_CURRENCY_FINNISH_MARKKA     "Finnische Mark"
-    IDS_CURRENCY_FRENCH_FRANC       "Französchishe Franc"
+    IDS_CURRENCY_FRENCH_FRANC       "Französchische Franc"
     IDS_CURRENCY_GREEK_DRACHMA      "Griechische Drachme"
     IDS_CURRENCY_IRISH_POUND        "Irische Pfund"
     IDS_CURRENCY_ITALIAN_LIRA       "Italienische Lire"

reactos/base/applications/cmdutils/doskey/doskey.rc

@@ -7,5 +7,6 @@
 #include "doskey.h"
 
 #include "lang/bg-BG.rc"
+#include "lang/de-DE.rc"
 #include "lang/en-US.rc"
 #include "lang/uk-UA.rc"

reactos/base/applications/cmdutils/doskey/lang/de-DE.rc

@@ -0,0 +1,28 @@
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+BEGIN
+
+IDS_HELP, "Verwaltet Einstellungen, Verlauf und Makros der Kommandozeile.\n\
+\n\
+DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=size]\n\
+       [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=file] [macroname=[text]]\n\
+\n\
+  /INSERT             Aktiviert den Einfügemodus.\n\
+  /OVERSTRIKE         Deaktiviert den Einfügemodus.\n\
+  /EXENAME=exename    Legt den Namen der Anwendung, auf die die Einstel-\n\
+                      lungen angewendet werden sollen, fest. Der Standard-\n\
+                      wert ist cmd.exe.\n\
+  /HISTORY            Zeigt den Befehlsverlauf an.\n\
+  /LISTSIZE=size      Legt die Anzahl der Befehle per Verlaufspuffer fest.\n\
+  /REINSTALL          Leert den Befehlsverlauf.\n\
+  /MACROS             Zeigt Makrodefinitionen an.\n\
+  /MACROS:exename     Zeigt Makrodefinitionen für eine Anwendung an.\n\
+  /MACROS:ALL         Zeigt Makrodefinitionen für alle Anwendungen an.\n\
+  /MACROFILE=file     Lädt Makrodefinitionen aus einer Datei.\n\
+  macroname           Legt den Namen eines zu erstellenden Makros fest.\n\
+  text                Legt den ersetzenden Text des Makros fest.\n"
+
+IDS_INVALID_MACRO_DEF, "Ungültige Makrodefinition: %s\n"
+
+END

reactos/base/applications/cmdutils/doskey/lang/en-US.rc

@@ -18,7 +18,7 @@ DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=size]\n\
   /MACROS             Displays macro definitions.\n\
   /MACROS:exename     Displays macro definitions for a specific program.\n\
   /MACROS:ALL         Displays macro definitions for all programs.\n\
-  /MACROFILE=filename Loads macro definitions from a file.\n\
+  /MACROFILE=file     Loads macro definitions from a file.\n\
   macroname           Specifies the name of a macro to create.\n\
   text                Specifies the replacement text for the macro.\n"
 

reactos/base/applications/cmdutils/hostname/hostname.rbuild

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="hostname" type="win32cui" installbase="system32" installname="hostname.exe">
 	<file>hostname.c</file>
 	<file>hostname.rc</file>

reactos/base/applications/cmdutils/more/resource.h

@@ -1,20 +1,5 @@
-#ifndef RESOURCE_H__ /* resource.h */
+#pragma once
-#define RESOURCE_H__
 
 #define IDS_USAGE           100
 #define IDS_CONTINUE        101
 #define IDS_FILE_ACCESS     102
-
-
-
-
-
-
-
-
-
-
-
-
-
-#endif /* EOF of resource.h */

reactos/base/applications/cmdutils/reg/It.rc

@@ -0,0 +1,40 @@
+/*
+ * REG.EXE - Wine-compatible reg program.
+ * Italian language support
+ *
+ * Copyright 2010 Luca Bennati
+ *
+ * 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
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "reg.h"
+
+/*UTF-8*/
+#pragma code_page(65001)
+
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    STRING_USAGE, "La sintassi di questo comando è:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n"
+    STRING_ADD_USAGE, "REG ADD nome_della_chiave [/v nome_del_valore | /ve] [/t tipo] [/s separatore] [/d dati] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE nome_della_chiave [/v nome_del_valore | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY nome_della_chiave [/v nome_del_valore | /ve] [/s]\n"
+    STRING_SUCCESS, "Operazione completata con successo\n"
+    STRING_INVALID_KEY, "Errore: nome della chiave non valido\n"
+    STRING_INVALID_CMDLINE, "Errore: parametri della linea di comando non validi\n"
+    STRING_NO_REMOTE, "Errore: Impossibile aggiungere chiavi alla macchina remota\n"
+    STRING_CANNOT_FIND, "Errore: Il sistema non è riuscito a trovare la chiave di registro o il valore specificati\n"
+}

reactos/base/applications/cmdutils/reg/Uk.rc

@@ -0,0 +1,43 @@
+/*
+ * REG.EXE - Wine-compatible reg program.
+ *
+ * Copyright 2008 Andrew Riedi
+ *
+ * Ukrainian language support
+ *
+ * Copyright 2010 Igor Paliychuk
+ *
+ * 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
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "reg.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    STRING_USAGE, "Синтаксис цієї команди наступний:\n\nREG [ ADD | DELETE | QUERY ]\nREG command /?\n"
+    STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n"
+    STRING_SUCCESS, "Операція успішно завершена\n"
+    STRING_INVALID_KEY, "Помилка: неправильне ім'я ключа\n"
+    STRING_INVALID_CMDLINE, "Помилка: неправильні параметри командного рядка\n"
+    STRING_NO_REMOTE, "Помилка: неможливо додати ключі на віддаленій машині\n"
+    STRING_CANNOT_FIND, "Помилка: не вдалось знайти вказаний ключ реєстру чи значення\n"
+}

reactos/base/applications/cmdutils/reg/reg.c

@@ -124,6 +124,21 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r
             lstrcpyW((LPWSTR)out_data,data);
             break;
         }
+        case REG_DWORD:
+        {
+            LPWSTR rest;
+            DWORD val;
+            val = strtolW(data, &rest, 0);
+            if (rest == data) {
+                static const WCHAR nonnumber[] = {'E','r','r','o','r',':',' ','/','d',' ','r','e','q','u','i','r','e','s',' ','n','u','m','b','e','r','.','\n',0};
+                reg_printfW(nonnumber);
+                break;
+            }
+            *reg_count = sizeof(DWORD);
+            out_data = HeapAlloc(GetProcessHeap(),0,*reg_count);
+            ((LPDWORD)out_data)[0] = val;
+            break;
+        }
         default:
         {
             static const WCHAR unhandled[] = {'U','n','h','a','n','d','l','e','d',' ','T','y','p','e',' ','0','x','%','x',' ',' ','d','a','t','a',' ','%','s','\n',0};

reactos/base/applications/cmdutils/reg/rsrc.rc

@@ -1,13 +1,17 @@
 #include "Da.rc"
-#include "De.rc"
 #include "En.rc"
-#include "Fr.rc"
+#include "Ko.rc"
-#include "Ja.rc"
-//#include "Ko.rc"
-#include "Lt.rc"
 #include "Nl.rc"
+#include "Pl.rc"
+
+/* UTF-8 */
+#include "De.rc"
+#include "Fr.rc"
+#include "It.rc"
+#include "Ja.rc"
+#include "Lt.rc"
 #include "No.rc"
-//#include "Pl.rc"
 #include "Pt.rc"
 #include "Ru.rc"
 #include "Si.rc"
+#include "Uk.rc"

reactos/base/applications/cmdutils/xcopy/De.rc

@@ -80,4 +80,3 @@ Mit:\n\
 \t\tQuelldateien kopiert, die neuer sind als die Zieldatei\n\n"
 
 }
-#pragma code_page(default)

reactos/base/applications/cmdutils/xcopy/Fr.rc

@@ -81,4 +81,3 @@ où :\n\
 \t\tque le fichier source\n\n"
 
 }
-#pragma code_page(default)

reactos/base/applications/cmdutils/xcopy/It.rc

@@ -0,0 +1,83 @@
+/*
+ * XCOPY - Wine-compatible xcopy program
+ * Italian language support
+ *
+ * Copyright (C) 2010 Luca Bennati
+ *
+ * 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
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "xcopy.h"
+
+/*UTF-8*/
+#pragma code_page(65001)
+
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    STRING_INVPARMS, "Numero non valido di parametri - Digita xcopy /? per l'aiuto\n"
+    STRING_INVPARM,  "Parametro '%s' non valido -  Digita xcopy /? per l'aiuto\n"
+    STRING_PAUSE,    "Premi Invio per iniziare a copiare\n"
+    STRING_SIMCOPY,  "%d file(s) sarebbero copiati\n"
+    STRING_COPY,     "%d file(s) copiati\n"
+    STRING_QISDIR,   "'%s' è il nome di un file o una cartella\n" \
+                     "sull'obiettivo?\n" \
+                     "(F - File, C - Cartella)\n"
+    STRING_SRCPROMPT,"%s? (Sì|No)\n"
+    STRING_OVERWRITE,"Sovrascrivere %s? (Sì|No|Tutti)\n"
+    STRING_COPYFAIL, "La copia di '%s' in '%s' è fallita con r/c %d\n"
+    STRING_OPENFAIL, "Impossibile aprire '%s'\n"
+    STRING_READFAIL, "Errore durante la lettura di '%s'\n"
+    STRING_YES_CHAR, "S"
+    STRING_NO_CHAR,  "N"
+    STRING_ALL_CHAR, "T"
+    STRING_FILE_CHAR,"F"
+    STRING_DIR_CHAR, "C"
+
+    STRING_HELP,
+"XCOPY - Copia file(s) e alberi di cartelle sorgenti in una destinazione\n\
+\n\
+Sintassi:\n\
+XCOPY sorgente [destinazione] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
+\t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
+\n\
+Dove:\n\
+\n\
+[/I]  Assumi una cartella se la destinazione non esiste e sono copiati 2 o\n\
+\tpiù files\n\
+[/S]  Copia le cartelle e le sottocartelle\n\
+[/E]  Copia le cartelle e le sottocartelle, includendo quelle vuote\n\
+[/Q]  Non mostrare i nomi durante la copia, modalità silenziosa.\n\
+[/F]  Mostra i nomi completi della sorgente e della destinazione durante la copia\n\
+[/L]  Simula l'operazione, mostrando i nome che sarebbero copiati\n\
+[/W]  Prompts before beginning the copy operation\n\
+[/T]  Crea la struttura di cartelle vuote ma non copia i files\n\
+[/Y]  Disabilita le conferme quando sono sovrascritti files\n\
+[/-Y] Abilita le conferme quando sono sovrascritti files\n\
+[/P]  Chiede conferma per ogni file sorgente prima di copiare\n\
+[/N]  Copia usando gli short names\n\
+[/U]  Copia solo files che sono già presenti nella destinazione\n\
+[/R]  Sovrascrivi ogni file che abbia l'attributo Sola Lettura\n\
+[/H]  Includi files nascosti e di sistema nella copia\n\
+[/C]  Continua anche se accade un errore durante la copia\n\
+[/A]  Copia solo files che abbiano l'attributo Archivio\n\
+[/M]  Copia solo files che abbiano l'attributo Archivio, rimuovendo\n\
+\tl'attributo\n\
+[/D | /D:m-g-a] Copia i nuovi files o quelli modificati dopo la data fornita.\n\
+\t\tSe nessuna data è stata fornita, copia solo se la destinazione è più vecchia\n\
+\t\tdella sorgente\n\n"
+
+}

reactos/base/applications/cmdutils/xcopy/Ja.rc

@@ -81,4 +81,3 @@ XCOPY 送り元 [送り先] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t\tコピー先がコピー元より古いファイルだけコピーします。\n\n"
 
 }
-#pragma code_page(default)

reactos/base/applications/cmdutils/xcopy/Lt.rc

@@ -81,4 +81,3 @@ Kur:\n\
 \t\tsenesnis už šaltinio failą\n\n"
 
 }
-#pragma code_page(default)

reactos/base/applications/cmdutils/xcopy/Nl.rc

@@ -79,4 +79,3 @@ Parameters:\n\
 \t\tdatum. Als geen detum wordt gegeven, copiëer alleen als bron nieuwer is.\n\n"
 
 }
-#pragma code_page(default)

reactos/base/applications/cmdutils/xcopy/Ru.rc

@@ -84,4 +84,3 @@ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
                 после указанной даты. Если дата не указана, копирует только\n\
                 те файлы, которые новее в исходной папке.\n"
 }
-#pragma code_page(default)

reactos/base/applications/cmdutils/xcopy/Si.rc

@@ -80,4 +80,3 @@ Where:\n\
 \t\tod izvora\n\n"
 
 }
-#pragma code_page(default)

reactos/base/applications/cmdutils/xcopy/Uk.rc

@@ -0,0 +1,84 @@
+/*
+ * XCOPY - Wine-compatible xcopy program
+ * Ukrainian language support
+ *
+ * Copyright (C) 2007 J. Edmeades
+ * Copyright (C) 2010 I. Paliychuk
+ *
+ * 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
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "xcopy.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    STRING_INVPARMS, "Невірна кількість параметрів - Введіть xcopy /? для довідки\n"
+    STRING_INVPARM,  "Невірний параметр '%s' -  Введіть xcopy /? для довідки\n"
+    STRING_PAUSE,    "Натисніть <enter> щоб почати копіювання\n"
+    STRING_SIMCOPY,  "%d файл(ів) буде скопійовано\n"
+    STRING_COPY,     "%d файл(ів) скопійовано\n"
+    STRING_QISDIR,   "'%s' є файлом чи директорією\n" \
+                     "on the target?\n" \
+                     "(F - Файл, D - Директорія)\n"
+    STRING_SRCPROMPT,"%s? (Yes|No)\n"
+    STRING_OVERWRITE,"Переписати %s? (Yes|No|All)\n"
+    STRING_COPYFAIL, "Під час копіювання '%s' в '%s' сталась помилка r/c %d\n"
+    STRING_OPENFAIL, "Не вдалось відкрити '%s'\n"
+    STRING_READFAIL, "Помилка читання '%s'\n"
+    STRING_YES_CHAR, "Y"
+    STRING_NO_CHAR,  "N"
+    STRING_ALL_CHAR, "A"
+    STRING_FILE_CHAR,"F"
+    STRING_DIR_CHAR, "D"
+
+    STRING_HELP,
+"XCOPY - Копіює файли та дерева директорій за призначенням\n\
+\n\
+Syntax:\n\
+XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
+\t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
+\n\
+Where:\n\
+\n\
+[/I]  Assume directory if destination does not exist and copying 2 or\n\
+\tmore files\n\
+[/S]  Копіює директорії та піддиректорії\n\
+[/E]  Копіює директорії та піддиректорії, включно з порожніми\n\
+[/Q]  Do not list names during copy, ie quiet.\n\
+[/F]  Під час копіювання відображає повні імена початкових і кінцевих файлів\n\
+[/L]  Simulate operation, showing names which would be copied\n\
+[/W]  Питає підтвердження перед початком копіювання\n\
+[/T]  Створює структуру каталогів але не копіює файли\n\
+[/Y]  Suppress prompting when overwriting files\n\
+[/-Y] Питає підтвердження на перезапис файлів\n\
+[/P]  Prompts on each source file before copying\n\
+[/N]  Копіює, використовуючи короткі імена\n\
+[/U]  Copy only files which already exist in destination\n\
+[/R]  Перезаписує файли, доступні лише для читання\n\
+[/H]  Include hidden and system files in the copy\n\
+[/C]  Продовжує роботу, навіть якщо при копіюванні виникла помилка\n\
+[/A]  Копіює лише файли з властивістю АРХІВНИЙ\n\
+[/M]  Копіює лише файли з властивістю АРХІВНИЙ, видаляє\n\
+\властивість АРХІВНИЙ\n\
+[/D | /D:m-d-y] Копіює лише нові файли або ті, які були змінені після вказаної дати.\n\
+\t\tЯкщо дата не вказана, only copy if destination is older\n\
+\t\tthan source\n\n"
+
+}

reactos/base/applications/cmdutils/xcopy/rsrc.rc

@@ -27,15 +27,19 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include <reactos/version.rc>
 
 #include "Da.rc"
-#include "De.rc"
 #include "En.rc"
-#include "Fr.rc"
-#include "Ja.rc"
 #include "Ko.rc"
-#include "Lt.rc"
-#include "Nl.rc"
 #include "No.rc"
 #include "Pl.rc"
 #include "Pt.rc"
+
+/* UTF-8 */
+#include "De.rc"
+#include "Fr.rc"
+#include "It.rc"
+#include "Ja.rc"
+#include "Lt.rc"
+#include "Nl.rc"
 #include "Ru.rc"
 #include "Si.rc"
+#include "Uk.rc"

reactos/base/applications/cmdutils/xcopy/xcopy.rbuild

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="xcopy" type="win32cui" installbase="system32" installname="xcopy.exe" unicode="true">
 	<include base="xcopy">.</include>
 	<library>wine</library>

reactos/base/applications/downloader/lang/de-DE.rc

@@ -15,11 +15,11 @@ STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU
 CAPTION "Einstellungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Download Ordner:", -1, 6, 10, 140, 8
+    LTEXT "Downloadordner:", -1, 6, 10, 140, 8
     EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "W&ähle...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14
     AUTOCHECKBOX "&Installationsdateien nach dem Setup löschen", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP
-    LTEXT "Update Server:", -1, 6, 55, 140, 8
+    LTEXT "Updateserver:", -1, 6, 55, 140, 8
     EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP
     DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15
     PUSHBUTTON "&Abbrechen", IDCANCEL, 207, 90, 54, 15
@@ -31,7 +31,7 @@ BEGIN
     IDS_WELCOME_TITLE        "Willkommen im ReactOS Downloader"
     IDS_WELCOME              "Bitte wählen Sie links eine Kategorie. Dies ist Version 1.1."
     IDS_NO_APP_TITLE         "Keine Anwendung ausgewählt"
-    IDS_NO_APP               "Bitte wählen Sie eine Anwendung, bevor Sie die Download-Schaltfläche betätigen. Wenn Sie Hilfe benötigen, drücken Sie die Hilfe-Schaltfläche in der oberen rechten Ecke."
+    IDS_NO_APP               "Bitte wählen Sie eine Anwendung aus, bevor Sie die Download-Schaltfläche betätigen. Wenn Sie Hilfe benötigen, drücken Sie die Hilfe-Schaltfläche in der oberen rechten Ecke."
     IDS_UPDATE_TITLE         "Update"
     IDS_UPDATE               "Diese Funktion wurde noch nicht implementiert."
     IDS_HELP_TITLE           "Hilfe"
@@ -41,20 +41,20 @@ BEGIN
     IDS_CHOOSE_SUB           "Bitte wählen Sie eine Unterkategorie."
     IDS_CHOOSE_CATEGORY      "Bitte wählen Sie eine Kategorie."
     IDS_CHOOSE_BOTH          "Bitte wählen Sie eine Unterkategorie oder eine Anwendung."
-    IDS_XMLERROR_1           "XML Datei nicht gefunden!"
+    IDS_XMLERROR_1           "XML-Datei nicht gefunden!"
-    IDS_XMLERROR_2           "XML Datei kann nicht verarbeitet werden!"
+    IDS_XMLERROR_2           "XML-Datei kann nicht verarbeitet werden!"
     IDS_DOWNLOAD_ERROR       "Die Datei konnte nicht heruntergeladen werden.\nBitte prüfen sie, ob eine Verbindung zum Internet besteht."
     IDS_VERSION              "Version: "
     IDS_LICENCE              "Lizenz: "
     IDS_MAINTAINER           "Maintainer: "
     IDS_APPS_TITLE           "Anwendungen"
     IDS_CATS_TITLE           "Kategorien"
-    IDS_CHOOSE_FOLDER        "Bitte wählen Sie den Ordner..."
+    IDS_CHOOSE_FOLDER        "Bitte wählen Sie den Ordner aus..."
     IDS_NOTCREATE_REGKEY     "Registryschlüssel könnte nicht erstellt werden."
     IDS_DOWNLOAD_FOLDER      "Downloader"
     IDS_UNABLECREATE_FOLDER  "Es konnte kein Ordner mit diesem Namen erstellt werden!"
     IDS_UPDATE_URL           "http://svn.reactos.org"
-    IDS_INSTALL_DEP          "%s wird benötigt um %s ausführen zu können. Soll %s jetzt installiert werden?"
+    IDS_INSTALL_DEP          "%s wird benötigt, um %s ausführen zu können. Soll %s jetzt installiert werden?"
     TTT_HELPBUTTON           "Hilfe über den Downloader"
     TTT_UPDATEBUTTON         "Noch nicht vorhanden"
     TTT_PROFBUTTON           "Konfiguriert den Downloader"

reactos/base/applications/dxdiag/dxdiag.c

@@ -126,7 +126,6 @@ InitializeTabCtrl(HWND hwndDlg, PDXDIAG_CONTEXT pContext)
     pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), hTabCtrlWnd, HelpPageWndProc, (LPARAM)pContext);
 
     /* insert tab ctrl items */
-
     InsertTabCtrlItem(hTabCtrlWnd, 0, MAKEINTRESOURCEW(IDS_SYSTEM_DIALOG));
     InitializeDisplayAdapters(pContext);
     InitializeDirectSoundPage(pContext);
@@ -188,8 +187,19 @@ DxDiagWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
 
             if (LOWORD(wParam) == IDC_BUTTON_NEXT)
             {
-               //TODO
+               INT CurSel;
-               /* handle next button */
+
+               /* retrieve current page */
+               CurSel = TabCtrl_GetCurSel(hTabCtrlWnd);
+               CurSel++;
+
+               /* enable/disable next button */
+               EnableWindow(GetDlgItem(hwndDlg, IDC_BUTTON_NEXT), 
+                            (CurSel != TabCtrl_GetItemCount(hTabCtrlWnd) - 1));
+               
+               /* switch to next page */
+               SendMessageW(hTabCtrlWnd, TCM_SETCURSEL, CurSel, 0L);
+                
                return TRUE;
             }
 
@@ -210,6 +220,12 @@ DxDiagWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
             pnmh = (LPNMHDR)lParam;
             if ((pnmh->hwndFrom == hTabCtrlWnd) && (pnmh->idFrom == IDC_TAB_CONTROL) && (pnmh->code == TCN_SELCHANGE))
             {
+               INT CurSel = TabCtrl_GetCurSel(hTabCtrlWnd);
+
+               /* enable/disable next button */
+               EnableWindow(GetDlgItem(hwndDlg, IDC_BUTTON_NEXT), 
+                            (CurSel != TabCtrl_GetItemCount(hTabCtrlWnd) - 1));
+
                 TabCtrl_OnSelChange(pContext);
             }
             break;

reactos/base/applications/dxdiag/lang/de-DE.rc

@@ -148,9 +148,9 @@ IDD_INPUT_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "DirectInput Geräte", -1, 10, 10, 452, 80
+    GROUPBOX "DirectInput-Geräte", -1, 10, 10, 452, 80
     CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Eingabebezogene Geräte", -1, 10, 100, 452, 60
+    GROUPBOX "Eingabegeräte", -1, 10, 100, 452, 60
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
     GROUPBOX "Hinweis", -1, 10, 170, 452, 50
     EDITTEXT  IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
@@ -172,7 +172,7 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-	IDS_MAIN_DIALOG "ReactX Diagnoseprogramm"
+	IDS_MAIN_DIALOG "ReactX-Diagnoseprogramm"
 	IDS_SYSTEM_DIALOG "System"
 	IDS_DISPLAY_DIALOG "Anzeige"
 	IDS_SOUND_DIALOG "Sound"
@@ -193,7 +193,7 @@ BEGIN
 	IDS_DEVICE_CONTROLLER "Controllererkennung"
 	IDS_DEVICE_MANUFACTURER "Herstellererkennung"
 	IDS_DEVICE_PRODUCT "Produkterkennung"
-	IDS_DEVICE_FORCEFEEDBACK "Force Feedback-Treiber"
+	IDS_DEVICE_FORCEFEEDBACK "Force-Feedback-Treiber"
 	IDS_NOT_APPLICABLE "Nicht zutreffend"
 	IDS_OPTION_YES "Ja"
 	IDS_DIRECTPLAY_COL_NAME1 "Name"
@@ -204,20 +204,20 @@ BEGIN
 	IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 serieller Dienstanbieter"
 	IDS_DIRECTPLAY8_IPXSP "DirectPlay8-IPX-Dienstanbieter"
 	IDS_DIRECTPLAY8_TCPSP "DirectPlay8-TCP/IP-Dienstanbieter"
-	IDS_DIRECTPLAY_TCPCONN "TCP/IP Verbindung für DirectPlay"
+	IDS_DIRECTPLAY_TCPCONN "TCP/IP-Verbindung für DirectPlay"
-	IDS_DIRECTPLAY_IPXCONN "IPX Verbindung für DirectPlay"
+	IDS_DIRECTPLAY_IPXCONN "IPX-Verbindung für DirectPlay"
 	IDS_DIRECTPLAY_MODEMCONN "Modemverbindung für DirectPlay"
 	IDS_DIRECTPLAY_SERIALCONN "Serielle Verbindung für DirectPlay"
 	IDS_REG_SUCCESS "OK"
 	IDS_REG_FAIL "Fehler"
-	IDS_DDTEST_ERROR "Test failed!"
+	IDS_DDTEST_ERROR "Test fehlgeschlagen!"
-	IDS_DDTEST_DESCRIPTION "This will start DirecDraw interface test. Continue?"
+	IDS_DDTEST_DESCRIPTION "Dies wird den DirectDraw-Interfacetest starten. Fortfahren?"
-	IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary surface. Black and white rectangles should be drawn. Continue?"
+	IDS_DDPRIMARY_DESCRIPTION "Dieser Test wird DirectDraw benutzen, um auf Ihrem primären Bildschirm etwas darzustellen. Schwarze und weiße Rechtecke sollten zu sehen sein. Fortfahren?"
-	IDS_DDPRIMARY_RESULT "Did you see black and white rectangles?"
+	IDS_DDPRIMARY_RESULT "Haben Sie schwarze und weiße Rechtecke gesehen?"
-	IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen buffer. Moving white rectangle should be drawn. Continue?"
+	IDS_DDOFFSCREEN_DESCRIPTION "Dieser Test wird DirectDraw benutzen, um im Offscreen-Buffer zu zeichnen. Ein bewegtes weißes Rechteck sollte zu sehen sein. Fortfahren?"
-	IDS_DDOFFSCREEN_RESULT "Did you see white moving reactangle?"
+	IDS_DDOFFSCREEN_RESULT "Haben Sie das bewegte weiße Rechteck gesehen?"
-	IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. Continue?"
+	IDS_DDFULLSCREEN_DESCRIPTION "Dieser Test wird DirectDraw benutzen, um im Vollbildmodus zu zeichnen. Ein bewegtes weißes Rechteck sollte zu sehen sein. Fortfahren?"
-	IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen mode?"
+	IDS_DDFULLSCREEN_RESULT "Haben Sie das bewegte weiße Rechteck im Vollbildmodus gesehen?"
 	IDS_FORMAT_ADAPTER_MEM "%u MB"
 	IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)"
 	IDS_OPTION_NO "Nein"

reactos/base/applications/dxdiag/resource.h

@@ -1,5 +1,4 @@
-#ifndef RESOURCE_H__
+#pragma once
-#define RESOURCE_H__
 
 /* dialog constants */
 #define IDD_MAIN_DIALOG	  100
@@ -142,6 +141,3 @@
 
 /* icon resource constants */
 #define IDI_APPICON        20000
-
-
-#endif

reactos/base/applications/dxdiag/system.c

@@ -17,7 +17,6 @@ GetRegValue(HKEY hBaseKey, LPWSTR SubKey, LPWSTR ValueName, DWORD Type, LPWSTR R
     DWORD dwType;
     DWORD dwSize;
 
-
     if (RegOpenKeyExW(hBaseKey, SubKey, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS)
         return FALSE;
 
@@ -25,10 +24,10 @@ GetRegValue(HKEY hBaseKey, LPWSTR SubKey, LPWSTR ValueName, DWORD Type, LPWSTR R
     res = RegQueryValueExW(hKey, ValueName, NULL, &dwType, (LPBYTE)Result, &dwSize);
     RegCloseKey(hKey);
 
-    if (dwType != Type)
+    if (res != ERROR_SUCCESS)
         return FALSE;
 
-    if (res != ERROR_SUCCESS)
+	if (dwType != Type)
         return FALSE;
 
     if (Size == sizeof(DWORD))

reactos/base/applications/extrac32/extrac32.c

@@ -0,0 +1,179 @@
+/*
+ * Extract - Wine-compatible program for extract *.cab files.
+ *
+ * Copyright 2007 Etersoft (Lyutin Anatoly)
+ * Copyright 2009 Ilya Shpigor
+ *
+ * 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
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <windows.h>
+#include <shellapi.h>
+#include <setupapi.h>
+#include <shlwapi.h>
+
+#include "wine/unicode.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(extrac32);
+
+static BOOL force_mode;
+
+static UINT WINAPI ExtCabCallback(PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2)
+{
+    FILE_IN_CABINET_INFO_W *pInfo;
+    FILEPATHS_W *pFilePaths;
+
+    switch(Notification)
+    {
+        case SPFILENOTIFY_FILEINCABINET:
+            pInfo = (FILE_IN_CABINET_INFO_W*)Param1;
+            lstrcpyW(pInfo->FullTargetName, (LPCWSTR)Context);
+            lstrcatW(pInfo->FullTargetName, pInfo->NameInCabinet);
+            return FILEOP_DOIT;
+        case SPFILENOTIFY_FILEEXTRACTED:
+            pFilePaths = (FILEPATHS_W*)Param1;
+            WINE_TRACE("Extracted %s\n", wine_dbgstr_w(pFilePaths->Target));
+            return NO_ERROR;
+    }
+    return NO_ERROR;
+}
+
+static void extract(LPCWSTR cabfile, LPWSTR destdir)
+{
+    if (!SetupIterateCabinetW(cabfile, 0, ExtCabCallback, destdir))
+        WINE_ERR("Could not extract cab file %s\n", wine_dbgstr_w(cabfile));
+}
+
+static void copy_file(LPCWSTR source, LPCWSTR destination)
+{
+    WCHAR destfile[MAX_PATH];
+
+    /* append source filename if destination is a directory */
+    if (PathIsDirectoryW(destination))
+    {
+        PathCombineW(destfile, destination, PathFindFileNameW(source));
+        destination = destfile;
+    }
+
+    if (PathFileExistsW(destination) && !force_mode)
+    {
+        static const WCHAR overwriteMsg[] = {'O','v','e','r','w','r','i','t','e',' ','"','%','s','"','?',0};
+        static const WCHAR titleMsg[] = {'E','x','t','r','a','c','t',0};
+        WCHAR msg[MAX_PATH+100];
+        snprintfW(msg, sizeof(msg)/sizeof(msg[0]), overwriteMsg, destination);
+        if (MessageBoxW(NULL, msg, titleMsg, MB_YESNO | MB_ICONWARNING) != IDYES)
+            return;
+    }
+
+    WINE_TRACE("copying %s to %s\n", wine_dbgstr_w(source), wine_dbgstr_w(destination));
+    CopyFileW(source, destination, FALSE);
+}
+
+int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int show)
+{
+    LPWSTR *argv;
+    int argc;
+    int i;
+    WCHAR check, cmd = 0;
+    WCHAR path[MAX_PATH];
+    WCHAR backslash[] = {'\\',0};
+    LPCWSTR cabfile = NULL;
+
+    path[0] = 0;
+    argv = CommandLineToArgvW(cmdline, &argc);
+
+    if(!argv)
+    {
+        WINE_ERR("Bad command line arguments\n");
+        return 0;
+    }
+
+    /* Parse arguments */
+    for(i = 0; i < argc; i++)
+    {
+        /* Get cabfile */
+        if (argv[i][0] != '/')
+        {
+            if (!cabfile)
+            {
+                cabfile = argv[i];
+                continue;
+            } else
+                break;
+        }
+        /* Get parameters for commands */
+        check = toupperW( argv[i][1] );
+        switch(check)
+        {
+            case 'A':
+                WINE_FIXME("/A not implemented\n");
+                break;
+            case 'Y':
+                force_mode = TRUE;
+                break;
+            case 'L':
+                if ((i + 1) >= argc) return 0;
+                if (!GetFullPathNameW(argv[++i], MAX_PATH, path, NULL))
+                    return 0;
+                break;
+            case 'C':
+                if (cmd) return 0;
+                cmd = check;
+                break;
+            case 'E':
+            case 'D':
+                if (cmd) return 0;
+                cmd = check;
+                break;
+            default:
+                return 0;
+        }
+    }
+
+    if (!cabfile)
+        return 0;
+
+    if (cmd == 'C')
+    {
+        if ((i + 1) != argc) return 0;
+        if (!GetFullPathNameW(argv[i], MAX_PATH, path, NULL))
+            return 0;
+    }
+
+    if (!path[0])
+        GetCurrentDirectoryW(MAX_PATH, path);
+
+    lstrcatW(path, backslash);
+
+    /* Execute the specified command */
+    switch(cmd)
+    {
+        case 'C':
+            /* Copy file */
+            copy_file(cabfile, path);
+            break;
+        case 'E':
+            /* Extract CAB archive */
+            extract(cabfile, path);
+            break;
+        case 0:
+        case 'D':
+            /* Display CAB archive */
+            WINE_FIXME("/D not implemented\n");
+            break;
+    }
+    return 0;
+}

reactos/base/applications/extrac32/extrac32.rbuild

@@ -0,0 +1,9 @@
+<module name="extrac32" type="win32gui" installbase="system32" installname="extrac32.exe" unicode="yes">
+	<include base="extrac32">.</include>
+	<library>wine</library>
+	<library>shell32</library>
+	<library>setupapi</library>
+	<library>shlwapi</library>
+	<library>user32</library>
+	<file>extrac32.c</file>
+</module>

reactos/base/applications/fontview/display.h

@@ -1,5 +1,4 @@
-#ifndef _DISPLAY_H
+#pragma once
-#define _DISPLAY_H
 
 /* Messages for the display class */
 #define FVM_SETTYPEFACE WM_USER
@@ -14,5 +13,3 @@ extern const WCHAR g_szFontDisplayClassName[];
 
 /* Public function */
 BOOL Display_InitClass(HINSTANCE hInstance);
-
-#endif // _DISPLAY_H

reactos/base/applications/fontview/lang/de-DE.rc

@@ -8,7 +8,7 @@ BEGIN
 	IDS_ERROR, "Fehler"
 	IDS_ERROR_NOMEM, "Es steht nicht genügend Speicher zur Verfügung."
 	IDS_ERROR_NOFONT, "Die angegebene Datei %1 ist keine gültige Schriftartendatei."
-	IDS_ERROR_NOCLASS, "Fehler beim initialisieren der Fensterklasse."
+	IDS_ERROR_NOCLASS, "Fehler beim Initialisieren der Fensterklasse."
 	IDS_ERROR_BADCMD, "Keine Schriftartendatei angegeben.\nSyntax:\n  fontview.exe <Schriftdatei>"
 END
 

reactos/base/applications/games/solitaire/lang/de-DE.rc

@@ -57,7 +57,7 @@ BEGIN
     IDS_SOL_NAME    "Solitär"
     IDS_SOL_ABOUT   "Solitär von J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Laufendes Spiel beenden?"
-    IDS_SOL_WIN     "Glückwunsch, Sie haben Gewonnen!"
+    IDS_SOL_WIN     "Glückwunsch, Sie haben gewonnen!"
     IDS_SOL_DEAL    "Neu geben?"
 END
 

reactos/base/applications/games/solitaire/solitaire.h

@@ -1,5 +1,4 @@
-#ifndef SOLITAIRE_INCLUDED
+#pragma once
-#define SOLITAIRE_INCLUDED
 
 extern CardWindow SolWnd;
 extern TCHAR szAppName[];
@@ -54,5 +53,3 @@ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked);
 void CARDLIBPROC PileDblClickProc(CardRegion &stackobj, int iNumClicked);
 
 void CARDLIBPROC PileRemoveProc(CardRegion &stackobj, int iRemoved);
-
-#endif

reactos/base/applications/games/spider/lang/de-DE.rc

@@ -54,7 +54,7 @@ BEGIN
     IDS_SPI_NAME    "Spider"
     IDS_SPI_ABOUT   "Spider Solitaire von Gregor Schneider\n\nCardLib Version 1.0"
     IDS_SPI_QUIT    "Laufendes Spiel beenden?"
-    IDS_SPI_WIN     "Gratulation, Sie haben gewonnen!"
+    IDS_SPI_WIN     "Glückwunsch, Sie haben gewonnen!"
     IDS_SPI_DEAL    "Neu geben?"
 END
 

reactos/base/applications/games/spider/spider.h

@@ -1,5 +1,4 @@
-#ifndef SOLITAIRE_INCLUDED
+#pragma once
-#define SOLITAIRE_INCLUDED
 
 #define DIFFICULTY_ONE_COLOR     1
 #define DIFFICULTY_TWO_COLORS    2
@@ -38,5 +37,3 @@ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked);
 void CARDLIBPROC PileDblClickProc(CardRegion &stackobj, int iNumClicked);
 
 void CARDLIBPROC PileRemoveProc(CardRegion &stackobj, int iRemoved);
-
-#endif

reactos/base/applications/games/winemine/lang/de-DE.rc

@@ -56,7 +56,7 @@ STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL
 CAPTION "Glückwunsch!"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT           "Bitte geben Sie ihren Namen ein", IDIGNORE,      25,  10, 150,  10
+	LTEXT           "Bitte geben Sie Ihren Namen ein", IDIGNORE,      25,  10, 150,  10
 	EDITTEXT                                           IDC_EDITNAME,  25,  20, 110,  12
 	DEFPUSHBUTTON   "OK",                              IDOK,          60,  40,  40,  15
 END

reactos/base/applications/magnify/magnify.rbuild

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<!DOCTYPE project SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="magnify" type="win32gui" installbase="system32" installname="magnify.exe">
 	<include base="magnify">.</include>
 	<library>user32</library>

reactos/base/applications/mmc/precomp.h

@@ -1,5 +1,4 @@
-#ifndef __PRECOMP_H
+#pragma once
-#define __PRECOMP_H
 
 #include <windows.h>
 #include <commctrl.h>
@@ -34,5 +33,3 @@ LoadAndFormatString(IN HINSTANCE hInstance,
 
 extern HINSTANCE hAppInstance;
 extern HANDLE hAppHeap;
-
-#endif /* __PRECOMP_H */

reactos/base/applications/mmc/resource.h

@@ -1,5 +1,4 @@
-#ifndef __RESOURCE_H
+#pragma once
-#define __RESOURCE_H
 
 #define IDS_APPTITLE    101
 #define IDS_CONSOLETITLE    102
@@ -10,5 +9,3 @@
 
 #define ID_FILE_EXIT    1001
 #define ID_HELP_ABOUT   9001
-
-#endif /* __RESOURCE_H */

reactos/base/applications/mplay32/lang/de-DE.rc

@@ -17,8 +17,8 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-	IDS_ALL_TYPES_FILTER "Alle Unterstützten (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
+	IDS_ALL_TYPES_FILTER "Alle unterstützten (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
-	IDS_TOOLTIP_PLAY "wiedergabe"
+	IDS_TOOLTIP_PLAY "Wiedergabe"
 	IDS_TOOLTIP_STOP "Stopp"
 	IDS_TOOLTIP_EJECT "Auswerfen"
 	IDS_TOOLTIP_BACKWARD "Zurück"

reactos/base/applications/mplay32/resource.h

@@ -1,5 +1,4 @@
-#ifndef __RESOURCE_H_
+#pragma once
-#define __RESOURCE_H_
 
 /* Icons */
 #define IDI_MAIN    10
@@ -51,5 +50,3 @@
 #define IDC_SEEKBACK     1504
 #define IDC_SEEKFORW     1505
 #define IDC_FORWARD      1506
-
-#endif /* __RESOURCE_H_ */

reactos/base/applications/msconfig/lang/de-DE.rc

@@ -83,7 +83,7 @@ BEGIN
    PUSHBUTTON    "A&ls Standard", IDC_BTN_SET_DEFAULT_BOOT, 120, 65, 63, 12
    PUSHBUTTON    "Nach &oben", IDC_BTN_MOVE_UP_BOOT_OPTION, 203, 65, 63, 12
    PUSHBUTTON    "Nach &unten", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 286, 65, 63, 12
-   GROUPBOX "Boot Optionen", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
+   GROUPBOX "Bootoptionen", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
    CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
    CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
    CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
@@ -149,7 +149,7 @@ BEGIN
     IDS_TOOLS_CMD_CMD        "cmd.exe"
 
     IDS_TOOLS_INFO_NAME      "Version"
-    IDS_TOOLS_INFO_DESCR     "Zeigt die installierte ReactOS Version an."
+    IDS_TOOLS_INFO_DESCR     "Zeigt die installierte ReactOS-Version an."
     IDS_TOOLS_INFO_CMD       "winver.exe"
 
     IDS_TOOLS_REGEDIT_NAME   "Registrierungs-Editor"

reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc

@@ -51,7 +51,7 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License, wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
 STRINGTABLE DISCARDABLE

reactos/base/applications/mscutils/servman/lang/de-DE.rc

@@ -193,7 +193,7 @@ BEGIN
   IDS_NUM_SERVICES "Anzahl der Dienste: %d"
   IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
   IDS_NO_DEPENDS "<No Dependencies>"
-  IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License, wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
 STRINGTABLE DISCARDABLE

reactos/base/applications/mstsc/bsops.h

@@ -18,8 +18,7 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __BSOPS_MSTSC_H
+#pragma once
-#define __BSOPS_MSTSC_H
 
 int bs_get_pixel(int x, int y);
 void bs_set_pixel(int x, int y, int pixel, int rop, int use_clip);
@@ -50,5 +49,3 @@ void bs_patblt(int opcode, int x, int y, int cx, int cy,
                int brush_style, char * brush_pattern,
                int brush_x_org, int brush_y_org,
                int bgcolour, int fgcolour);
-
-#endif /* __BSOPS_MSTSC_H */

reactos/base/applications/mstsc/lang/de-DE.rc

@@ -15,18 +15,18 @@ BEGIN
     PUSHBUTTON      "Speichern unter",IDC_SAVEAS,120,139,55,14
     PUSHBUTTON      "Öffnen...",IDC_OPEN,177,139,50,14
     ICON            "", IDC_CONNICON, 16,114,20,20
-    LTEXT           "Die derzeitigen Verbindungseinstellungen speichern oder vohandene Einstellungen laden.",IDC_STATIC,50,115,172,20
+    LTEXT           "Die derzeitigen Verbindungseinstellungen speichern oder vorhandene Einstellungen laden.",IDC_STATIC,50,115,172,20
 END
 
 IDD_DISPLAY DIALOGEX 0, 0, 242, 175
 STYLE DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    GROUPBOX        "Remotedesktop Größe",IDC_STATIC,7,7,228,68
+    GROUPBOX        "Remotedesktop-Größe",IDC_STATIC,7,7,228,68
     GROUPBOX        "Farben",IDC_STATIC,7,83,228,85
     ICON            "", IDC_REMICON, 15,19,20,20
     ICON            "", IDC_COLORSICON, 15,98,20,20
-    LTEXT           "Wählen Sie die Bildschirmgröße von Ihrem Remote- desktop. Stellen Sie den Regler für Vollbild nach rechts",IDC_STATIC,53,22,175,21
+    LTEXT           "Wählen Sie die Bildschirmgröße Ihres Remotedesktops. Stellen Sie den Regler für Vollbild nach rechts",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
@@ -38,7 +38,7 @@ END
 
 IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Remotedesktop Verbindung"
+CAPTION "Remotedesktop-Verbindung"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Verbinden",IDOK,147,245,50,14
@@ -58,6 +58,6 @@ BEGIN
     IDS_PIXEL               "%lux%lu Pixel"
     IDS_FULLSCREEN          "Vollbild"
     IDS_BROWSESERVER        "<Nach mehr suchen...>"
-    IDS_HEADERTEXT1         "Remote Desktop"
+    IDS_HEADERTEXT1         "Remotedesktop"
     IDS_HEADERTEXT2         "Verbindung"
 END

reactos/base/applications/mstsc/mstsc.rbuild

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="mstsc" type="win32gui" installbase="system32" installname="mstsc.exe" unicode="yes">
 	<include base="mstsc">.</include>
 	<library>user32</library>

reactos/base/applications/mstsc/orders.h

@@ -18,8 +18,7 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __ORDERS_MSTSC_H
+#pragma once
-#define __ORDERS_MSTSC_H
 
 #define RDP_ORDER_STANDARD   0x01
 #define RDP_ORDER_SECONDARY  0x02
@@ -369,5 +368,3 @@ typedef struct _RDP_COLCACHE_ORDER
 
 }
 RDP_COLCACHE_ORDER;
-
-#endif /* __ORDERS_MSTSC_H */

reactos/base/applications/mstsc/proto.h

@@ -17,8 +17,7 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef RDESKTOP_PROTO_H
+#pragma once
-#define RDESKTOP_PROTO_H
 
 /* *INDENT-OFF* */
 #ifdef __cplusplus
@@ -306,5 +305,3 @@ unsigned int seamless_send_focus(unsigned long id, unsigned long flags);
 }
 #endif
 /* *INDENT-ON* */
-
-#endif

reactos/base/applications/mstsc/rdesktop.h

@@ -18,8 +18,7 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __RDESKTOP_MSTSC_H
+#pragma once
-#define __RDESKTOP_MSTSC_H
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -127,5 +126,3 @@
 #ifndef MAKE_PROTO
 #include "proto.h"
 #endif
-
-#endif /* __RDESKTOP_MSTSC_H */

reactos/base/applications/mstsc/uimain.h

@@ -18,8 +18,7 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __UIMAIN_MSTSC_H
+#pragma once
-#define __UIMAIN_MSTSC_H
 
 /* in uimain.c */
 int
@@ -77,5 +76,3 @@ ui_set_modifier_state(int code);
 #define UI_MAX(a, b)  (((a) > (b)) ? (a) : (b))
 #undef UI_MIN
 #define UI_MIN(a, b)  (((a) < (b)) ? (a) : (b))
-
-#endif /* __UIMAIN_MSTSC_H */

reactos/base/applications/network/finger/err.h

@@ -33,8 +33,7 @@
  *	@(#)err.h	8.1 (Berkeley) 6/2/93
  */
 
-#ifndef _ERR_H_
+#pragma once
-#define	_ERR_H_
 
 /*
  * Don't use va_list in the err/warn prototypes.   Va_list is typedef'd in two
@@ -56,5 +55,3 @@ void		warn __P((const char *, ...));
 void		vwarn __P((const char *, va_list));
 void		warnx __P((const char *, ...));
 void		vwarnx __P((const char *, va_list));
-
-#endif /* !_ERR_H_ */

reactos/base/applications/network/finger/various.h

@@ -1,9 +1,7 @@
 // Various things you need when porting BSD and GNU utilities to
 // Win32.
 
-#ifndef VARIOUS_H
+#pragma once
-#define VARIOUS_H
-
 
 typedef float f4byte_t;
 typedef double f8byte_t;
@@ -32,5 +30,3 @@ typedef long uid_t;  // SunOS 5.5
 #define rindex(s, c)  strrchr(s, c)
 
 void netfinger(char *);
-
-#endif

reactos/base/applications/network/ipconfig/ipconfig.c

@@ -183,17 +183,21 @@ LPTSTR GetConnectionType(LPTSTR lpClass)
             ConType = (LPTSTR)HeapAlloc(ProcessHeap,
                                         0,
                                         dwDataSize);
-            if (ConType == NULL)
+            if (ConType)
-                return NULL;
-
-            if(RegQueryValueEx(hKey,
-                               _T("Name"),
-                               NULL,
-                               &dwType,
-                               (PBYTE)ConType,
-                               &dwDataSize) != ERROR_SUCCESS)
             {
-                ConType = NULL;
+                if(RegQueryValueEx(hKey,
+                                   _T("Name"),
+                                   NULL,
+                                   &dwType,
+                                   (PBYTE)ConType,
+                                   &dwDataSize) != ERROR_SUCCESS)
+                {
+                    HeapFree(ProcessHeap,
+                             0,
+                             ConType);
+
+                    ConType = NULL;
+                }
             }
         }
     }
@@ -456,7 +460,9 @@ VOID ShowInfo(BOOL bAll)
 
         if (bAll)
         {
-            _tprintf(_T("\tDescription . . . . . . . . . . . : %s\n"), GetConnectionDescription(pAdapter->AdapterName));
+            LPTSTR lpDesc = GetConnectionDescription(pAdapter->AdapterName);
+            _tprintf(_T("\tDescription . . . . . . . . . . . : %s\n"), lpDesc);
+            HeapFree(ProcessHeap, 0, lpDesc);
             _tprintf(_T("\tPhysical Address. . . . . . . . . : %s\n"), PrintMacAddr(pAdapter->Address));
             if (pAdapter->DhcpEnabled)
                 _tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : Yes\n"));

reactos/base/applications/network/ipconfig/lang/de-DE.rc

@@ -12,12 +12,12 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
   IDS_OTHER   "Anderer Adapter"
-  IDS_ETH     "Ethernet Adapter"
+  IDS_ETH     "Ethernet-Adapter"
-  IDS_TOKEN   "Token Ring Adapter"
+  IDS_TOKEN   "Token-Ring-Adapter"
-  IDS_FDDI    "FDDI Adapter"
+  IDS_FDDI    "FDDI-Adapter"
-  IDS_PPP     "PPP Adapter"
+  IDS_PPP     "PPP-Adapter"
-  IDS_LOOP    "Loopback Adapter"
+  IDS_LOOP    "Loopback-Adapter"
-  IDS_SLIP    "SLIP Adapter"
+  IDS_SLIP    "SLIP-Adapter"
 END
 
 STRINGTABLE DISCARDABLE
@@ -31,7 +31,7 @@ BEGIN
     \n \
     wobei\n \
         Adapter         Verbindungsname\n \
-                       (wildcards * und ? sind möglich, siehe Beispiele)\n \
+                       (Wildcards * und ? sind möglich, siehe Beispiele)\n \
     \n \
         Optionen:\n \
            /?           Zeigt die Hilfe an.\n \
@@ -61,6 +61,6 @@ BEGIN
         > ipconfig /renew EL*        ... Erneuert alle Verbindungen, deren Name\n \
                                          mit EL beginnt.\n \
         > ipconfig /release *Ver*    ... Gibt alle passenden Verbindungen frei,\n \
-                                         z.B. ""Lokale Vebindung 1"" oder\n \
+                                         z.B. ""Lokale Verbindung 1"" oder\n \
-                                              ""Lokale Vebindung 2""\n"
+                                              ""Lokale Verbindung 2""\n"
 END

reactos/base/applications/network/telnet/src/ansiprsr.h

@@ -1,5 +1,4 @@
-#ifndef __ANSIPRSR_H
+#pragma once
-#define __ANSIPRSR_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -81,5 +80,3 @@ public:
 	char* ParseBuffer(char* pszBuffer, char* pszBufferEnd);
 	static int StripBuffer(char* pszBuffer, char* pszBufferEnd, int width);
 };
-
-#endif

reactos/base/applications/network/telnet/src/keytrans.h

@@ -18,8 +18,7 @@
 //  DeleteKeyDef  : Deletes a key def from the list              //
 ///////////////////////////////////////////////////////////////////
 
-#ifndef __KEYTRANS_H
+#pragma once
-#define __KEYTRANS_H
 
 #include "tkeydef.h"
 #include "tkeymap.h"
@@ -93,5 +92,3 @@ private:
 	int currentKeyMap, mainKeyMap;				// AVS
 
 };
-
-#endif // __KEYTRANS_H

reactos/base/applications/network/telnet/src/stl_bids.h

@@ -1,8 +1,7 @@
 // This is the STL wrapper for classlib/arrays.h from Borland's web site
 // It has been modified to be compatible with vc++ (Paul Branann 5/7/98)
 
-#ifndef STL_ARRAY_AS_VECTOR
+#pragma once
-#define STL_ARRAY_AS_VECTOR
 
 #ifdef _MSC_VER
 #pragma warning(disable: 4786)
@@ -156,5 +155,3 @@ public:
 	}
 
 };
-
-#endif

reactos/base/applications/network/telnet/src/tcharmap.h

@@ -1,8 +1,7 @@
 // This is a simple class to handle character maps
 // (Paul Brannan 6/25/98)
 
-#ifndef __TCHARMAP_H
+#pragma once
-#define __TCHARMAP_H
 
 class TCharmap {
 private:
@@ -37,5 +36,3 @@ public:
 
 	int enabled;
 };
-
-#endif

reactos/base/applications/network/telnet/src/tconsole.h

@@ -1,5 +1,4 @@
-#ifndef __TNPARSER_H
+#pragma once
-#define __TNPARSER_H
 
 #include "tnconfig.h"
 
@@ -168,5 +167,3 @@ void saveScreen(CHAR_INFO* chiBuffer);
 void restoreScreen(CHAR_INFO* chiBuffer);
 CHAR_INFO* newBuffer();
 void deleteBuffer(CHAR_INFO* chiBuffer);
-
-#endif

reactos/base/applications/network/telnet/src/telnet.h

@@ -1,5 +1,4 @@
-#ifndef ___TELNET_H
+#pragma once
-#define ___TELNET_H
 
 /*
 * Copyright (c) 1983 Regents of the University of California.
@@ -298,8 +297,3 @@ extern char *enctype_names[];
 #define	ENCTYPE_NAME(x)		enctype_names[x]
 //////////////////////////////////////////////////////
 //////////////////////////////////////////////////////
-
-
-
-#endif
-

reactos/base/applications/network/telnet/src/tkeydef.h

@@ -3,8 +3,7 @@
 //                   - keeped in an array container    //
 /////////////////////////////////////////////////////////
 
-#ifndef __TKEYDEF_H
+#pragma once
-#define __TKEYDEF_H
 
 #include <windows.h>
 
@@ -67,5 +66,3 @@ public:
 	DWORD GetCodeKey() { return vk_code; }
 
 };
-
-#endif

reactos/base/applications/network/telnet/src/tkeymap.h

@@ -1,5 +1,4 @@
-#ifndef __TKEYMAP_H
+#pragma once
-#define __TKEYMAP_H
 
 #include "tkeydef.h"
 
@@ -35,5 +34,3 @@ struct KeyMap {
 
        ~KeyMap();
 };
-
-#endif

reactos/base/applications/network/telnet/src/tmapldr.h

@@ -68,8 +68,7 @@
 //                                                               //
 ///////////////////////////////////////////////////////////////////
 
-#ifndef __TLOADMAP_H
+#pragma once
-#define __TLOADMAP_H
 
 #include "keytrans.h"
 #include "tcharmap.h"
@@ -101,5 +100,3 @@ private:
 	int LoadCharMap(string buf);
 
 };
-
-#endif

reactos/base/applications/network/telnet/src/tmouse.h

@@ -1,5 +1,4 @@
-#ifndef __TMOUSE_H
+#pragma once
-#define __TMOUSE_H
 
 #include "tnclip.h"
 #include <windows.h>
@@ -25,5 +24,3 @@ public:
 	TMouse(Tnclip &RefClipboard);
 	~TMouse();
 };
-
-#endif

reactos/base/applications/network/telnet/src/tnclass.h

@@ -1,5 +1,4 @@
-#ifndef __TNCLASS_H_
+#pragma once
-#define __TNCLASS_H_
 
 #include <windows.h>
 #include "tnconfig.h"
@@ -69,6 +68,3 @@ private:
 	void NewProcess();					// Paul Brannan 9/13/98
 	void SetLocalAddress(SOCKET s);
 };
-
-#endif
-

reactos/base/applications/network/telnet/src/tnclip.h

@@ -1,5 +1,4 @@
-#ifndef __TNCLIP_H
+#pragma once
-#define __TNCLIP_H
 
 #include <windows.h>
 #include "tnetwork.h"
@@ -16,5 +15,3 @@ public:
 	void Copy(HGLOBAL clipboard_data);
 	void Paste();
 };
-
-#endif

reactos/base/applications/network/telnet/src/tncon.h

@@ -1,5 +1,4 @@
-#ifndef __TNCON_H
+#pragma once
-#define __TNCON_H
 
 #include "tparams.h"
 #include "tnclip.h"
@@ -30,5 +29,3 @@ BOOL WINAPI ControlEventHandler(DWORD);
 
 // Bryan Montgomery 10/14/98
 void setTNetwork(TNetwork);
-
-#endif

reactos/base/applications/network/telnet/src/tnconfig.h

@@ -6,8 +6,7 @@
 // It does not store any information about the current settings, only default
 // or recommended settings.
 
-#ifndef __TNCONFIG_H
+#pragma once
-#define __TNCONFIG_H
 
 // Ioannou 2 June 98:  Borland needs them - quick hack
 #ifdef __BORLANDC__
@@ -207,5 +206,3 @@ private:
 };
 
 extern TConfig ini;
-
-#endif

reactos/base/applications/network/telnet/src/tnerror.h

@@ -1,5 +1,4 @@
-#ifndef __TNERROR_H
+#pragma once
-#define __TNERROR_H
 
 #ifndef __WINDOWS_H
 #include <windows.h>
@@ -12,5 +11,3 @@ extern int Telnet_Redir;
 int printm(LPTSTR szModule, BOOL fSystem, DWORD dwMessageId, ...);
 void LogErrorConsole(LPTSTR szError);
 int printit(const char * it);
-
-#endif

reactos/base/applications/network/telnet/src/tnetwork.h

@@ -1,8 +1,7 @@
 // This is a simple class to handle socket connections
 // (Paul Brannan 6/15/98)
 
-#ifndef __TNETWORK_H
+#pragma once
-#define __TNETWORK_H
 
 #include <windows.h>
 
@@ -46,5 +45,3 @@ public:
 
 	void do_naws(int width, int height);
 };
-
-#endif

reactos/base/applications/network/telnet/src/tnmain.h

@@ -1,5 +1,4 @@
-#ifndef __TNMAIN_H
+#pragma once
-#define __TNMAIN_H
 
 #include <stdlib.h>
 #include <process.h>
@@ -15,5 +14,3 @@ struct cmdHistory {
 	struct cmdHistory *next;
 	struct cmdHistory *prev;
 };
-
-#endif

reactos/base/applications/network/telnet/src/tnmisc.h

@@ -1,5 +1,4 @@
-#ifndef __TNMISC_H
+#pragma once
-#define __TNMISC_H
 
 // Process-related functions
 BOOL CreateHiddenConsoleProcess(LPCTSTR szChildName, PROCESS_INFORMATION* ppi,
@@ -14,5 +13,3 @@ HWND TelnetGetConsoleWindow(void);
 bool SetIcon(HWND hConsoleWindow, HANDLE hIcon, LPARAM *pOldBIcon, LPARAM *pOldSIcon,
 			 const char *icondir);
 void ResetIcon(HWND hConsoleWindow, LPARAM oldBIcon, LPARAM oldSIcon);
-
-#endif

reactos/base/applications/network/telnet/src/tparams.h

@@ -1,5 +1,4 @@
-#ifndef __THREADPARAMS
+#pragma once
-#define __THREADPARAMS
 
 #include "ttelhndl.h"
 
@@ -20,5 +19,3 @@ public:
 	NetParams p;
 	TTelnetHandler &TelHandler;
 };
-
-#endif

reactos/base/applications/network/telnet/src/tparser.h

@@ -10,8 +10,7 @@
 //   - An Init() function, which will re-initialize the parser when
 //     necessary.
 
-#ifndef __TPARSER_H
+#pragma once
-#define __TPARSER_H
 
 #include "tconsole.h"
 #include "keytrans.h"
@@ -45,5 +44,3 @@ protected:
 	TNetwork &Network;
 	TCharmap &Charmap;
 };
-
-#endif

reactos/base/applications/network/telnet/src/tscript.h

@@ -1,5 +1,4 @@
-#ifndef __TSCRIPT_H
+#pragma once
-#define __TSCRIPT_H
 
 #include <windows.h>
 #include <stdio.h>
@@ -16,5 +15,3 @@ private:
 	char *script;
 	TNetwork &Network;
 };
-
-#endif

reactos/base/applications/network/telnet/src/tscroll.h

@@ -1,5 +1,4 @@
-#ifndef __TSCROLL_H
+#pragma once
-#define __TSCROLL_H
 
 #include "tconsole.h"
 #include "tmouse.h"
@@ -22,5 +21,3 @@ public:
 	TScroller(TMouse &M, int size=20000);
 	~TScroller();
 };
-
-#endif

reactos/base/applications/network/telnet/src/ttelhndl.h

@@ -1,5 +1,4 @@
-#ifndef __TTELHNDL_H
+#pragma once
-#define __TTELHNDL_H
 
 #include "tparser.h"
 #include "tnetwork.h"
@@ -47,5 +46,3 @@ public:
 
 	int get_term() {return iTermSet;}
 };
-
-#endif

reactos/base/applications/notepad/lang/de-DE.rc

@@ -127,7 +127,7 @@ FONT 8, "MS Shell Dlg"
 CAPTION "Enkodierung"
 BEGIN
 COMBOBOX        ID_ENCODING,54,0,156,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-LTEXT           "Enkodierung:",0x155,5,2,41,12
+LTEXT           "Kodierung:",0x155,5,2,41,12
 COMBOBOX        ID_EOLN,54,18,156,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 LTEXT           "Zeilenenden:",0x156,5,20,41,12
 END
@@ -161,7 +161,7 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  STRING_LICENSE, "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  STRING_LICENSE, "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License, wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
 STRINGTABLE DISCARDABLE
@@ -183,7 +183,7 @@ STRING_UNTITLED,                                "(unbenannt)"
 STRING_ALL_FILES,                               "Alle Dateien (*.*)"
 STRING_TEXT_FILES_TXT,                  "Textdateien (*.txt)"
 
-STRING_TOOLARGE,                                "Die Datei '%s' ist zu groß für den Editor\n \
+STRING_TOOLARGE,                                "Die Datei '%s' ist zu groß für den Editor.\n \
 Benutzen Sie bitte einen anderen Editor, um diese Datei zu bearbeiten."
 STRING_NOTEXT,                                  "Sie haben keinen Text eingegeben, der \
 gespeichert\n werden könnte. Geben Sie Text ein, und versuchen Sie es \

reactos/base/applications/paint/lang/de-DE.rc

@@ -193,7 +193,7 @@ BEGIN
     IDS_TOOLTIP9, "Sprühdose"
     IDS_TOOLTIP10, "Text"
     IDS_TOOLTIP11, "Linie"
-    IDS_TOOLTIP12, "Bezier-Kurve"
+    IDS_TOOLTIP12, "Bézier-Kurve"
     IDS_TOOLTIP13, "Rechteck"
     IDS_TOOLTIP14, "Polygon"
     IDS_TOOLTIP15, "Ellipse"

reactos/base/applications/paint/lang/pl-PL.rc

@@ -49,7 +49,7 @@ BEGIN
         MENUITEM SEPARATOR
         POPUP "Powiększenie"
         BEGIN
-            POPUP "User defined"
+            POPUP "Zdefiniowane przez użytkownika"
             BEGIN
                 MENUITEM "12,5%", IDM_VIEWZOOM125
                 MENUITEM "25%", IDM_VIEWZOOM25
@@ -60,8 +60,8 @@ BEGIN
                 MENUITEM "800%", IDM_VIEWZOOM800
             END
             MENUITEM SEPARATOR
-            MENUITEM "Show grid", IDM_VIEWSHOWGRID
+            MENUITEM "Pokaż siatkę", IDM_VIEWSHOWGRID
-            MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
+            MENUITEM "Pokaż miniaturę", IDM_VIEWSHOWMINIATURE
         END
         MENUITEM "Pełny ekran\tCtrl+F", IDM_VIEWFULLSCREEN
     END
@@ -181,7 +181,7 @@ BEGIN
     IDS_INFOTEXT, "Paint dla ReactOS jest dostępny na licencji GNU Lesser General Public License (LGPL) wersja 3 (www.gnu.org)"
     IDS_SAVEPROMPTTEXT, "Czy chcesz zapisać zmiany do %s?"
     IDS_DEFAULTFILENAME, "Nienazwany.bmp"
-    IDS_MINIATURETITLE, "Miniature"
+    IDS_MINIATURETITLE, "Miniatura"
     IDS_TOOLTIP1, "Zaznaczenie dowolne"
     IDS_TOOLTIP2, "Zaznaczenie"
     IDS_TOOLTIP3, "Gumka"
@@ -190,16 +190,16 @@ BEGIN
     IDS_TOOLTIP6, "Przybliżenie"
     IDS_TOOLTIP7, "Ołówek"
     IDS_TOOLTIP8, "Pędzel"
-    IDS_TOOLTIP9, "Spray"
+    IDS_TOOLTIP9, "Aerograf"
     IDS_TOOLTIP10, "Tekst"
     IDS_TOOLTIP11, "Linia"
     IDS_TOOLTIP12, "Krzywa Beziera"
     IDS_TOOLTIP13, "Prostokšt"
-    IDS_TOOLTIP14, "Polygon"
+    IDS_TOOLTIP14, "Wielokšt"
     IDS_TOOLTIP15, "Elipsa"
     IDS_TOOLTIP16, "Zaokršglony Prostokšt"
     IDS_OPENFILTER, "Pliki Bitmapy (*.bmp;*.dib)\1*.bmp;*.dib\1Wszystkie pliki (*.*)\1*.*\1"
     IDS_SAVEFILTER, "Bitmapa 24 bit (*.bmp;*.dib)\1*.bmp;*.dib\1"
-    IDS_FILESIZE, "%d bytes"
+    IDS_FILESIZE, "%d bajtów"
-    IDS_PRINTRES, "%d x %d pixels per meter"
+    IDS_PRINTRES, "%d x %d pikseli na metr"
 END

reactos/base/applications/paint/mouse.c

@@ -251,15 +251,18 @@ endPaintingL(HDC hdc, short x, short y, int fg, int bg)
             resetToU1();
             if ((rectSel_src[2] != 0) && (rectSel_src[3] != 0))
             {
-                DeleteObject(SelectObject
-                             (hSelDC, hSelBm =
-                              (HBITMAP) CreateDIBWithProperties(rectSel_src[2], rectSel_src[3])));
                 DeleteObject(hSelMask);
+                hSelMask = CreateBitmap(rectSel_src[2], rectSel_src[3], 1, 1, NULL);
+                DeleteObject(SelectObject(hSelDC, hSelMask));
+                Rect(hSelDC, 0, 0, rectSel_src[2], rectSel_src[3], 0x00ffffff, 0x00ffffff, 1, 2);
+                SelectObject(hSelDC, hSelBm = CreateDIBWithProperties(rectSel_src[2], rectSel_src[3]));
+                resetToU1();
                 BitBlt(hSelDC, 0, 0, rectSel_src[2], rectSel_src[3], hDrawingDC, rectSel_src[0],
                        rectSel_src[1], SRCCOPY);
                 Rect(hdc, rectSel_src[0], rectSel_src[1], rectSel_src[0] + rectSel_src[2],
                      rectSel_src[1] + rectSel_src[3], bgColor, bgColor, 0, TRUE);
                 newReversible();
+
                 placeSelWin();
                 ShowWindow(hSelection, SW_SHOW);
             }

reactos/base/applications/rapps/CreateCabFile.bat

@@ -1 +1 @@
-c:\cabman.exe -M raw -S rappmgr.cab \rapps\*.txt
+..\..\..\output-i386\tools\cabman\cabman.exe -M raw -S rappmgr.cab rapps\*.txt

reactos/base/applications/rapps/lang/de-DE.rc

@@ -42,7 +42,7 @@ BEGIN
 		MENUITEM "&Deinstallieren", ID_UNINSTALL
 		MENUITEM "&Ändern",    ID_MODIFY
 		MENUITEM SEPARATOR
-		MENUITEM "&Remove from Registry", ID_REGREMOVE
+		MENUITEM "Aus &Registry entfernen", ID_REGREMOVE
 		MENUITEM SEPARATOR
 		MENUITEM "&Aktualisieren",   ID_REFRESH
 	END
@@ -71,16 +71,16 @@ END
 
 IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 216, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Program installation"
+CAPTION "Programminstallation"
 FONT 8, "MS Shell Dlg"
 BEGIN
 	LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35
 
-	AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+	AUTORADIOBUTTON "&Installation von einem Datenträger (CD oder DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
-	AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
+	AUTORADIOBUTTON "Herunterla&den und installieren", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
 
 	PUSHBUTTON "OK", IDOK, 86, 78, 60, 14
-	PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14
+	PUSHBUTTON "Abbrechen", IDCANCEL, 150, 78, 60, 14
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
@@ -98,7 +98,7 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 CAPTION "Über"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "ReactOS Anwendungsmanager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
+	LTEXT "ReactOS-Anwendungsmanager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
 	PUSHBUTTON "Schließen", IDOK, 133, 46, 50, 14
 	ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
 END
@@ -124,14 +124,14 @@ STRINGTABLE DISCARDABLE
 BEGIN
 	IDS_INFO_VERSION "\nVersion: "
 	IDS_INFO_DESCRIPTION "\nBeschreibung: "
-	IDS_INFO_PUBLISHER "\nPublisher: "
+	IDS_INFO_PUBLISHER "\nVertrieb: "
 	IDS_INFO_HELPLINK "\nHilfe-Link: "
 	IDS_INFO_HELPPHONE "\nHilfe-Telefonnr.: "
 	IDS_INFO_README "\nReadme: "
 	IDS_INFO_REGOWNER "\nregistrierter Eigentümer: "
 	IDS_INFO_PRODUCTID "\nProdukt-ID: "
-	IDS_INFO_CONTACT "\nKontaktt: "
+	IDS_INFO_CONTACT "\nKontakt: "
-	IDS_INFO_UPDATEINFO "\nUpdate Information: "
+	IDS_INFO_UPDATEINFO "\nUpdate-Informationen: "
 	IDS_INFO_INFOABOUT "\nInformation über: "
 	IDS_INFO_COMMENTS "\nKommentare: "
 	IDS_INFO_INSTLOCATION "\nInstallationsort: "
@@ -171,23 +171,23 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-	IDS_APPTITLE "ReactOS Anwendungsmanager"
+	IDS_APPTITLE "ReactOS-Anwendungsmanager"
 	IDS_SEARCH_TEXT "Suche..."
 	IDS_INSTALL "Installieren"
 	IDS_UNINSTALL "Deinstallieren"
 	IDS_MODIFY "Ändern"
 	IDS_APPS_COUNT "Anzahl der Anwendungen: %d"
-	IDS_WELCOME_TITLE "Willkommen im ReactOS Anwendungsmanager!\n\n"
+	IDS_WELCOME_TITLE "Willkommen im ReactOS-Anwendungsmanager!\n\n"
-	IDS_WELCOME_TEXT "Wählen Sie links eine Kategorie und dann eine Anwendung um sie zu installieren oder zu deinstallieren.\nReactOS Webseite: "
+	IDS_WELCOME_TEXT "Wählen Sie links eine Kategorie und dann eine Anwendung um sie zu installieren oder zu deinstallieren.\nReactOS-Webseite: "
 	IDS_WELCOME_URL "http://www.reactos.org"
 	IDS_INSTALLED "Installiert"
 	IDS_AVAILABLEFORINST "Zur Installation verfügbar"
-	IDS_UPDATES "Updates"
+	IDS_UPDATES "Aktualisierungen"
 	IDS_APPLICATIONS "Anwendungen"
-	IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:"
+	IDS_CHOOSE_FOLDER_TEXT "Wählen Sie ein Verzeichnis aus, das zum Herunterladen verwendet werden soll:"
-	IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!"
+	IDS_CHOOSE_FOLDER_ERROR "Sie haben ein nicht existentes Verzeichnis angegeben!"
-	IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!"
+	IDS_USER_NOT_ADMIN "Sie müssen als Administrator angemeldet sein, um den Anwendungsmanager zu starten!"
-	IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?"
+	IDS_APP_REG_REMOVE "Sind Sie sich sicher, dass Sie die Daten dieses Programms aus der Registry entfernen möchten?"
-	IDS_INFORMATION "Information"
+	IDS_INFORMATION "Informationen"
-	IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!"
+	IDS_UNABLE_TO_REMOVE "Konnte die Daten nicht aus der Registry löschen!"
 END

reactos/base/applications/rapps/lang/pl-PL.rc

@@ -16,7 +16,7 @@ BEGIN
 		MENUITEM "&Odinstaluj",ID_UNINSTALL
 		MENUITEM "&Modyfikuj",   ID_MODIFY
 		MENUITEM SEPARATOR
-		MENUITEM "&Remove from Registry", ID_REGREMOVE
+		MENUITEM "&Usuń z rejestru", ID_REGREMOVE
 		MENUITEM SEPARATOR
 		MENUITEM "O&dœwie¿",  ID_REFRESH
 	END
@@ -44,7 +44,7 @@ BEGIN
 		MENUITEM "&odinstaluj", ID_UNINSTALL
 		MENUITEM "&Modyfikuj",    ID_MODIFY
 		MENUITEM SEPARATOR
-		MENUITEM "&Remove from Registry", ID_REGREMOVE
+		MENUITEM "&Usuń z rejestru", ID_REGREMOVE
 		MENUITEM SEPARATOR
 		MENUITEM "&Odœwie¿",   ID_REFRESH
 	END
@@ -52,37 +52,37 @@ END
 
 IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 250, 144
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Settings"
+CAPTION "Ustawienia"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	GROUPBOX "General", -1, 4, 2, 240, 61
+	GROUPBOX "Ogólne", -1, 4, 2, 240, 61
-	AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
+	AUTOCHECKBOX "&Zapisz pozycję okna", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
-	AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 219, 12
+	AUTOCHECKBOX "&Aktualizuj listę dostępnych programów przy każdym uruchomieniu", IDC_UPDATE_AVLIST, 15, 29, 219, 12
-	AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12
+	AUTOCHECKBOX "Zap&isuj dziennik instalacji i usuwania programów", IDC_LOG_ENABLED, 15, 46, 219, 12
 
-	GROUPBOX "Downloading", -1, 4, 65, 240, 51
+	GROUPBOX "Pobieranie", -1, 4, 65, 240, 51
-	LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9
+	LTEXT "Katalog dla pobranych plików:", -1, 16, 75, 100, 9
 	EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP
-	PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14
+	PUSHBUTTON "&Wybierz", IDC_CHOOSE, 187, 85, 50, 14
-	AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+	AUTOCHECKBOX "&Usuń instalatory programów po ich zainstalowaniu", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
 
-	PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
+	PUSHBUTTON "Domyślne", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
 	PUSHBUTTON "OK", IDOK, 116, 124, 60, 14
-	PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14
+	PUSHBUTTON "Anuluj", 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 "Program installation"
+CAPTION "Instalacja programu"
 FONT 8, "MS Shell Dlg"
 BEGIN
 	LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35
 
-	AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+	AUTORADIOBUTTON "&Zainstaluj z dysku (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
-	AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
+	AUTORADIOBUTTON "&Pobierz i zainstaluj", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
 
 	PUSHBUTTON "OK", IDOK, 86, 78, 60, 14
-	PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14
+	PUSHBUTTON "Anuluj", IDCANCEL, 150, 78, 60, 14
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
@@ -101,7 +101,7 @@ 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
-	PUSHBUTTON "Close", IDOK, 133, 46, 50, 14
+	PUSHBUTTON "Zamknij", IDOK, 133, 46, 50, 14
 	ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
 END
 
@@ -139,7 +139,7 @@ BEGIN
 	IDS_INFO_INSTLOCATION "\nScie¿ka instalacji: "
 	IDS_INFO_INSTALLSRC "\n<>ród³o instalacji: "
 	IDS_INFO_UNINSTALLSTR "\nKomenda deinstalacji: "
-	IDS_INFO_MODIFYPATH "\nModify Path: "
+	IDS_INFO_MODIFYPATH "\nModyfikacja ścieżki instalacji: "
 	IDS_INFO_INSTALLDATE "\nData instalacji: "
 END
 
@@ -186,10 +186,10 @@ BEGIN
 	IDS_AVAILABLEFORINST "Dostêpne"
 	IDS_UPDATES "Uaktualnienia"
 	IDS_APPLICATIONS "Aplikacje"
-	IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:"
+	IDS_CHOOSE_FOLDER_TEXT "Wybierz katalog w którym będa zapisywane pobrane programy:"
-	IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!"
+	IDS_CHOOSE_FOLDER_ERROR "Wybrałeś nieistniejący katalog!"
-	IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!"
+	IDS_USER_NOT_ADMIN "Musisz mieć uprawnienia administratora aby uruchomić ""ReactOS Applications Manager""!"
-	IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?"
+	IDS_APP_REG_REMOVE "Czy na pewno chcesz usunąć wpis tego programu z rejestru?"
-	IDS_INFORMATION "Information"
+	IDS_INFORMATION "Informacja"
-	IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!"
+	IDS_UNABLE_TO_REMOVE "Nie można było usunąć wpisu z rejestru!"
 END

reactos/base/applications/rapps/rapps.h

@@ -1,5 +1,4 @@
-#ifndef _RAPPS_H__
+#pragma once
-#define _RAPPS_H__
 
 #include <windows.h>
 #include <commctrl.h>
@@ -12,7 +11,7 @@
 
 #include "resource.h"
 
-#define APPLICATION_DATEBASE_URL L"http://opendn.org/rappmgr.cab"
+#define APPLICATION_DATEBASE_URL L"http://svn.reactos.org/packages/rappmgr.cab"
 
 #define SPLIT_WIDTH 4
 #define MAX_STR_LEN 256
@@ -185,5 +184,3 @@ VOID ToolBarOnGetDispInfo(LPTOOLTIPTEXT lpttt);
 extern HWND hTreeView;
 BOOL CreateTreeView(HWND hwnd);
 HTREEITEM TreeViewAddItem(HTREEITEM hParent, LPWSTR lpText, INT Image, INT SelectedImage, LPARAM lParam);
-
-#endif /* _RAPPS_H__ */

reactos/base/applications/rapps/rapps/firefox3.txt

@@ -2,41 +2,41 @@
 
 [Section]
 Name = Mozilla Firefox 3.0
-Version = 3.0.17
+Version = 3.0.18
 Licence = MPL/GPL/LGPL
 Description = The most popular and one of the best free Web Browsers out there.
-Size = 7.1M
+Size = 7.2M
 Category = 5
 URLSite = http://www.mozilla.com/en-US/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win32/en-US/Firefox%20Setup%203.0.17.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win32/en-US/Firefox%20Setup%203.0.18.exe
 CDPath = none
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Webbrowser.
-Size = 6.9M
+Size = 7.0M
 URLSite = http://www.mozilla-europe.org/de/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win32/de/Firefox%20Setup%203.0.17.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win32/de/Firefox%20Setup%203.0.18.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores navegadores web gratuitos que hay.
 Size = 7.0M
 URLSite = http://www.mozilla-europe.org/es/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win32/es-ES/Firefox%20Setup%203.0.17.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win32/es-ES/Firefox%20Setup%203.0.18.exe
 
 [Section.0414]
 Description = Mest populære og best også gratis nettleserene der ute.
 Size = 6.9M
 URLSite = http://www.mozilla-europe.org/no/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win32/nb-NO/Firefox%20Setup%203.0.17.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win32/nb-NO/Firefox%20Setup%203.0.18.exe
 
 [Section.0415]
 Description = Najpopularniejsza i jedna z najlepszych darmowych przeglądarek internetowych.
 Size = 7.8M
 URLSite = http://www.mozilla-europe.org/pl/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win32/pl/Firefox%20Setup%203.0.17.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win32/pl/Firefox%20Setup%203.0.18.exe
 
 [Section.0419]
 Description = Один из самых популярных и лучших бесплатных браузеров.
 Size = 7.4M
 URLSite = http://www.mozilla-europe.org/ru/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win32/ru/Firefox%20Setup%203.0.17.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win32/ru/Firefox%20Setup%203.0.18.exe

reactos/base/applications/rapps/rapps/mirandaim.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = Miranda IM
-Version = 0.8.12
+Version = 0.8.18
 Licence = GPL
 Description = Open source multiprotocol instant messaging application - May not work completely.
 Size = 1.6MB
 Category = 5
 URLSite = http://www.miranda-im.org/
-URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.12-unicode.exe
+URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.18-unicode.exe
 CDPath = none
 
 [Section.0407]

reactos/base/applications/rapps/rapps/openoffice2.4.txt

@@ -8,23 +8,23 @@ Description = THE Open Source Office Suite.
 Size = 127MB
 Category = 6
 URLSite = http://www.openoffice.org/
-URLDownload = http://ftp.plusline.de/OpenOffice/stable/2.4.3/OOo_2.4.3_Win32Intel_install_en-US.exe
+URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/stable/2.4.3/OOo_2.4.3_Win32Intel_install_en-US.exe
 CDPath = none
 
 [Section.0407]
 Description = DIE Open Source Office Suite.
 URLSite = http://de.openoffice.org/
 Size = 114.2MB
-URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/de/2.4.3/OOo_2.4.3_Win32Intel_install_de.exe
+URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/de/2.4.3/OOo_2.4.3_Win32Intel_install_de.exe
 
 [Section.040a]
 Description = La suite de ofimática de código abierto.
 URLSite = http://es.openoffice.org/
 Size = 113.9MB
-URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/es/2.4.3/OOo_2.4.3_Win32Intel_install_es.exe
+URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/es/2.4.3/OOo_2.4.3_Win32Intel_install_es.exe
 
 [Section.0415]
 URLSite = http://pl.openoffice.org/
 Description = Otwarty pakiet biurowy.
-URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/pl/2.4.2/OOo_2.4.2_Win32Intel_install_pl.exe
+URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/pl/2.4.2/OOo_2.4.2_Win32Intel_install_pl.exe
 Size = 113.9M

reactos/base/applications/rapps/rapps/openoffice3.0.txt

@@ -2,30 +2,30 @@
 
 [Section]
 Name = OpenOffice 3.0
-Version = 3.1.1
+Version = 3.2.0
 Licence = LGPL
 Description = THE Open Source Office Suite.
-Size = 134.3MB
+Size = 135.4MB
 Category = 6
 URLSite = http://www.openoffice.org/
-URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/stable/3.1.1/OOo_3.1.1_Win32Intel_install_en-US.exe
+URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/stable/3.2.0/OOo_3.2.0_Win32Intel_install_en-US.exe
 CDPath = none
 
 [Section.0407]
 Description = DIE Open Source Office Suite.
 URLSite = http://de.openoffice.org/
-Size = 142.9MB
+Size = 145.8MB
-URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/de/3.1.1/OOo_3.1.1_Win32Intel_install_de.exe
+URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/de/3.2.0/OOo_3.2.0_Win32Intel_install_de.exe
 
 [Section.040a]
 Description = La suite de ofimática de código abierto.
 URLSite = http://es.openoffice.org/
 Version = 3.1.0
-Size = 130.0MB
+Size = 119.4MB
-URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/es/3.1.0/OOo_3.1.0_Win32Intel_install_es.exe
+URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/es/3.2.0/OOo_3.2.0_Win32Intel_install_es.exe
 
 [Section.0415]
 Description = Otwarty pakiet biurowy.
 URLSite = http://pl.openoffice.org/
-Size = 147.1MB
+Size = 133.2MB
-URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/pl/3.1.1/OOo_3.1.1_Win32Intel_install_pl.exe
+URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/pl/3.2.0/OOo_3.2.0_Win32Intel_install_pl.exe

reactos/base/applications/rapps/rapps/openttd.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = OpenTTD
-Version = 0.7.3
+Version = 0.7.5
 Licence = GPL v2
 Description = Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon.
 Size = 2.9MB
 Category = 4
 URLSite = http://www.openttd.org/
-URLDownload = http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.7.3-windows-win32.exe
+URLDownload = http://binaries.openttd.org/releases/0.7.5/openttd-0.7.5-windows-win32.exe
 CDPath = none
 
 [Section.0407]

reactos/base/applications/rapps/rapps/opera.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = Opera
-Version = 10.10
+Version = 10.51
 Licence = Freeware
 Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.
 Size = 11.0M
 Category = 5
 URLSite = http://www.opera.com/
-URLDownload = http://ftp.opera.com/pub/opera/win/1010/int/Opera_1010_in_Setup.exe
+URLDownload = http://get4.opera.com/pub/opera/win/1051/int/Opera_1051_int_Setup.exe
 CDPath = none
 
 [Section.0407]

reactos/base/applications/rapps/rapps/rosbe.txt

@@ -2,17 +2,17 @@
 
 [Section]
 Name = ReactOS Build Environment
-Version = 1.4.5
+Version = 1.5
 Licence = GPL
 Description = Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.
-Size = 14.9MB
+Size = 13.5MB
 Category = 7
 URLSite = http://reactos.org/wiki/Build_Environment/
-URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.4.5.exe
+URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.5.exe
 CDPath = none
 
 [Section.0407]
-Description = Erlaubt es Ihnen ReactOS aus den Quellen zu bauen. Im ReactOS-Wiki finden Sie dazu nähere Anweisungen.
+Description = Erlaubt es Ihnen den ReactOS Source Code zu kompilieren. Im ReactOS-Wiki finden Sie dazu nähere Anweisungen.
 
 [Section.040a]
 Description = Te permite compilar el código de ReactOS. Para más instrucciones consulta la wiki de ReactOS.

reactos/base/applications/rapps/rapps/rosbeamd64.txt

@@ -0,0 +1,21 @@
+; UTF-8
+
+[Section]
+Name = ReactOS Build Environment AMD64 Addon
+Version = 1.3
+Licence = GPL
+Description = Allows you to build the ReactOS AMD64 Source. For more instructions see ReactOS wiki.
+Size = 15.8MB
+Category = 7
+URLSite = http://reactos.org/wiki/Build_Environment/
+URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE64-1.3.exe
+CDPath = none
+
+[Section.0407]
+Description = Erlaubt es Ihnen den ReactOS AMD64 Source Code zu kompilieren. Im ReactOS-Wiki finden Sie dazu nähere Anweisungen.
+
+[Section.040a]
+Description = Te permite compilar el código de ReactOS AMD64. Para más instrucciones consulta la wiki de ReactOS.
+
+[Section.0415]
+Description = Pozwala zbudować obraz płyty ReactOS AMD64 ze źródeł. Więcej informacji na Wiki ReactOS.

reactos/base/applications/rapps/rapps/rosbearm.txt

@@ -0,0 +1,21 @@
+; UTF-8
+
+[Section]
+Name = ReactOS Build Environment ARM Addon
+Version = 1.0
+Licence = GPL
+Description = Allows you to build the ReactOS ARM Source. For more instructions see ReactOS wiki.
+Size = 11.1MB
+Category = 7
+URLSite = http://reactos.org/wiki/Build_Environment/
+URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-ARM-1.0.exe
+CDPath = none
+
+[Section.0407]
+Description = Erlaubt es Ihnen den ReactOS ARM Source Code zu kompilieren. Im ReactOS-Wiki finden Sie dazu nähere Anweisungen.
+
+[Section.040a]
+Description = Te permite compilar el código de ReactOS ARM. Para más instrucciones consulta la wiki de ReactOS.
+
+[Section.0415]
+Description = Pozwala zbudować obraz płyty ReactOS ARM ze źródeł. Więcej informacji na Wiki ReactOS.