* Sync up to trunk HEAD (r62975).

svn path=/branches/shell-experiments/; revision=62976

base/applications/games/solitaire/lang/bg-BG.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "Карти", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Изтегли &една", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Изтегли &три", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Показване на времето", IDC_OPT_SHOWTIME, 7 ,51 ,100 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Показване на времето", IDC_OPT_SHOWTIME, 7 ,51 ,100 ,10, WS_TABSTOP
     AUTOCHECKBOX "Лента &състояние", IDC_OPT_STATUSBAR, 7, 66, 100, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "Добре", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Отказ", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "Да прекратя ли играта?"
     IDS_SOL_WIN "Поздравления, победихте!!"
     IDS_SOL_DEAL "Ново раздаване?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/ca-ES.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "Cartes", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Treu-ne &Una", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Treu-ne &Tres", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Mostra el temps", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Mostra el temps", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "&Barra d'estat", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "Acceptar", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Cancel·lar", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "Voleu sortir del joc actual?"
     IDS_SOL_WIN "Felicitats, heu guanyat!!"
     IDS_SOL_DEAL "Deal again?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/cs-CZ.rc

@@ -16,8 +16,13 @@ BEGIN
     GROUPBOX "Karty", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Sejmout &jednu", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Sejmout &tři", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "Zobrazit č&as", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "Zobrazit č&as", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "Stavový řád&ek", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Storno", IDCANCEL, 101, 97, 50, 14
 END
@@ -52,6 +57,8 @@ BEGIN
     IDS_SOL_QUIT "Ukončit rozehranou hru?"
     IDS_SOL_WIN "Gratulujeme, zvítězili jste!!"
     IDS_SOL_DEAL "Rozdat znova?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

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

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "Karten", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "&Eine ziehen", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "&Drei ziehen", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Zeit anzeigen", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Punkte zählen", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "Ke&ine", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Zeit anzeigen", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "S&tatusleiste", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "P&unkte behalten", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Abbrechen",IDCANCEL,101,97,50,14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "Laufendes Spiel beenden?"
     IDS_SOL_WIN "Glückwunsch, Sie haben gewonnen!"
     IDS_SOL_DEAL "Neu geben?"
+    IDS_SOL_SCORE "Punkte: %d"
+    IDS_SOL_TIME "Zeit: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/el-GR.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "Κάρτες", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Ρίξε Έ&να", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Ρίξε &Τρία", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Εμφάνιση Ώρας", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Εμφάνιση Ώρας", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "Γ&ραμμή κατάστασης", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Ακύρωση", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "Τερματισμός του πιαχνιδιού αυτού;"
     IDS_SOL_WIN "Συγχαρητήρια, κερδίσατε!!"
     IDS_SOL_DEAL "Deal again?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/en-US.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "Cards", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "Quit the current game?"
     IDS_SOL_WIN "Congratulations, you win!"
     IDS_SOL_DEAL "Deal again?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/es-ES.rc

@@ -19,8 +19,13 @@ BEGIN
     GROUPBOX "Cartas", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Sacar &Una", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Sacar &Tres", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Mostrar tiempo", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Mostrar tiempo", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "&Barra de estado", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "Aceptar", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Cancelar", IDCANCEL, 101, 97, 50, 14
 END
@@ -55,6 +60,8 @@ BEGIN
     IDS_SOL_QUIT "¿Finalizar el juego actual?"
     IDS_SOL_WIN "Felicidades, ¡¡Has ganado!!"
     IDS_SOL_DEAL "¿Repartir de nuevo?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/eu-ES.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "Kartak ", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Banaka &atera", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Hirunaka &atera", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Denbora erakutsi", IDC_OPT_SHOWTIME, 7 ,51 ,67 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Denbora erakutsi", IDC_OPT_SHOWTIME, 7 ,51 ,67 ,10, WS_TABSTOP
     AUTOCHECKBOX "&Egoera barra", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "Ados", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Utzi", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "Uneko jokoa amaitu?"
     IDS_SOL_WIN "Zorionak, irabazi duzu!!"
     IDS_SOL_DEAL "Deal again?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/fr-FR.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "Cartes", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "En tirer une", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "En tirer trois", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "Afficher le temp&s", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "Afficher le temp&s", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "Barre de s&tatut", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Annuler", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "Quitter le jeu actuel ?"
     IDS_SOL_WIN "Félicitations ! Vous avez gagné !"
     IDS_SOL_DEAL "Redistribuer ?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/he-IL.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "משיכה", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "משוך &אחד", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "משוך &שלושה", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "משחק קצוב בזמן", IDC_OPT_SHOWTIME, 7 ,51 ,72 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "משחק קצוב בזמן", IDC_OPT_SHOWTIME, 7 ,51 ,72 ,10, WS_TABSTOP
     AUTOCHECKBOX "שורת מצב", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "אישור", IDOK, 35, 97, 50, 14
     PUSHBUTTON "ביטול", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "להפסיק את המשחק הנוכחי?"
     IDS_SOL_WIN "כל הכבוד, ניצחת!"
     IDS_SOL_DEAL "לחלק שוב?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/hu-HU.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "Kártyák", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "&Egy lap", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "&Három lap", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Idõ mutatása", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Idõ mutatása", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "Á&llapotsor", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Mégsem", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "Kilépés ebbõl a játékból?"
     IDS_SOL_WIN "Gratulálok, Ön nyert!"
     IDS_SOL_DEAL "Új leosztás?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/id-ID.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "Cards", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Batal", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "Quit the current game?"
     IDS_SOL_WIN "Congratulations, you win!"
     IDS_SOL_DEAL "Deal again?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/it-IT.rc

@@ -4,6 +4,7 @@
  * FILE:       base/applications/games/solitaire/lang/it-IT.rc
  * PURPOSE:    Italian Language File for Solitaire
  * TRANSLATOR: Gabriel Ilardi
+ *             Marco Maria Emanuele Bartucci, 2014-04-19
  */
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
@@ -18,8 +19,13 @@ BEGIN
     GROUPBOX "Carte", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Girane &Una", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Girane &Tre", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Visualizza il tempo", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Punteggio", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Visualizza il tempo", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "&Barra di stato", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Mantieni il punteggio", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Annulla", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +60,8 @@ BEGIN
     IDS_SOL_QUIT "Chiudere la partita in corso?"
     IDS_SOL_WIN "Congratulazioni, hai vinto!!"
     IDS_SOL_DEAL "Nuova partita?"
+    IDS_SOL_SCORE "Punteggio: %d"
+    IDS_SOL_TIME "Tempo: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/ja-JP.rc

@@ -17,8 +17,13 @@ BEGIN
     GROUPBOX "カード", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "1 枚ずつ取る(&O)", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "3 枚ずつ取る(&T)", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "時間を表示する(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "時間を表示する(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "ステータスバーを表示する(&T)", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "キャンセル", IDCANCEL, 101, 97, 50, 14
 END
@@ -53,6 +58,8 @@ BEGIN
     IDS_SOL_QUIT "現在のゲームを終了しますか?"
     IDS_SOL_WIN "おめでとう、あなたの勝ちです!"
     IDS_SOL_DEAL "もう一度カードを配りますか?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/ko-KR.rc

@@ -12,8 +12,13 @@ BEGIN
     GROUPBOX "카드", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "한 장씩(&O)", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "세 장씩(&T)", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "시간 보이기(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "시간 보이기(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "상태 표시줄(&T)", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "확인", IDOK, 35, 97, 50, 14
     PUSHBUTTON "취소", IDCANCEL, 101, 97, 50, 14
 END
@@ -48,6 +53,8 @@ BEGIN
     IDS_SOL_QUIT "현재 게임을 끝낼가요?"
     IDS_SOL_WIN "축하합니다!!"
     IDS_SOL_DEAL "Deal again?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/lt-LT.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "Kortos", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Dalinti po &vieną", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Dalinti po &tris", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Rodyti laiką", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Rodyti laiką", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "&Būsenos juosta", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "Gerai", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Atsisakyti", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "Baigti žaidimą?"
     IDS_SOL_WIN "Sveikiname, jūs laimėjote!!"
     IDS_SOL_DEAL "Dalinti vėl?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/nl-NL.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "Delen", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "&Eén kaart", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "&Drie kaarten", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "Tijd &weergeven", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "Tijd &weergeven", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "S&tatusbalk", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Annuleren", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "Het huidige spel afsluiten?"
     IDS_SOL_WIN "Gefeliciteerd, u heeft gewonnen!"
     IDS_SOL_DEAL "Nogmaals spelen?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/no-NO.rc

@@ -10,8 +10,13 @@ BEGIN
     GROUPBOX "Kort", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Velg &et", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Velg &tre", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Vis tid", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Vis tid", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "S&tatuslinje", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Avbryt", IDCANCEL, 101, 97, 50, 14
 END
@@ -46,6 +51,8 @@ BEGIN
     IDS_SOL_QUIT "Slutt nåværende spill?"
     IDS_SOL_WIN "Gratulerer, du vant!!"
     IDS_SOL_DEAL "Del ut igjen?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/pl-PL.rc

@@ -5,6 +5,7 @@
  *    Updated by Caemyr (olaf_siejka@o2.pl), Nov, 2008
  *    Updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (Apr, 2011)
  *    UTF-8 conversion by Caemyr (May, 2011)
+ *    updated by Wojciech Kozłowski (wojo664@gmail.com) (April, 2014)
  */
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
@@ -19,8 +20,13 @@ BEGIN
     GROUPBOX "Karty", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Rozdaj &jedną", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Rozdaj &dwie", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Pokazuj czas gry", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Punktowanie", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standardowe", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+	 AUTORADIOBUTTON "&Brak", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Pokazuj czas gry", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "Pokazuj pa&sek stanu", IDC_OPT_STATUSBAR, 7, 66, 77, 10, WS_TABSTOP
+    AUTOCHECKBOX "Pamiętaj punkty", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Anuluj", IDCANCEL, 101, 97, 50, 14
 END
@@ -51,10 +57,12 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME "Pasjans"
-    IDS_SOL_ABOUT "Pasjans by J. Brown\n\nCardLib version 1.0."
+    IDS_SOL_ABOUT "Pasjans - autor: J. Brown\n\nCardLib wersja 1.0."
     IDS_SOL_QUIT "Zakończyć aktualną grę?"
     IDS_SOL_WIN "Gratulacje, wygrałeś!"
     IDS_SOL_DEAL "Nowe rozdanie?"
+    IDS_SOL_SCORE "Wynik: %d"
+    IDS_SOL_TIME "Czas: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/ro-RO.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "Cărți", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Câte &una", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Câte t&rei", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Afișează timp", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Afișează timp", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "&Bară de stare", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "Con&firmă", IDOK, 35, 97, 50, 14
     PUSHBUTTON "A&nulează", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "Abandonați jocul curent?"
     IDS_SOL_WIN "Felicitări, ați câștigat!"
     IDS_SOL_DEAL "O nouă rundă?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/ru-RU.rc

@@ -12,8 +12,13 @@ BEGIN
     GROUPBOX "Карты", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "По &одной", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "По &три", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Показывать время", IDC_OPT_SHOWTIME, 7 ,51 ,75 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Показывать время", IDC_OPT_SHOWTIME, 7 ,51 ,75 ,10, WS_TABSTOP
     AUTOCHECKBOX "&Строка состояния", IDC_OPT_STATUSBAR, 7, 66, 75, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Отмена", IDCANCEL, 101, 97, 50, 14
 END
@@ -48,6 +53,8 @@ BEGIN
     IDS_SOL_QUIT "Закончить текущую игру?"
     IDS_SOL_WIN "Congratulations, you win!!"
     IDS_SOL_DEAL "Deal again?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Меню */

base/applications/games/solitaire/lang/sk-SK.rc

@@ -19,8 +19,13 @@ BEGIN
     GROUPBOX "Karty", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Ťahať &jednu", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Ťahať &tri", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "Ča&sový limit", IDC_OPT_SHOWTIME, 7 ,51 ,64 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "Ča&sový limit", IDC_OPT_SHOWTIME, 7 ,51 ,64 ,10, WS_TABSTOP
     AUTOCHECKBOX "Stavový riad&ok", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Zrušiť", IDCANCEL, 101, 97, 50, 14
 END
@@ -55,6 +60,8 @@ BEGIN
     IDS_SOL_QUIT "Naozaj chcete skončiť aktuálnu hru?"
     IDS_SOL_WIN "Blahoželám, vyhrali ste!"
     IDS_SOL_DEAL "Rozdať znova?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/sq-AL.rc

@@ -19,8 +19,13 @@ BEGIN
     GROUPBOX "Letra", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Barazim &Nje", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Barazim &tRE", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Shfaq Kohen", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Shfaq Kohen", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "T&abela e Statusit", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Anulo", IDCANCEL, 101, 97, 50, 14
 END
@@ -55,6 +60,8 @@ BEGIN
     IDS_SOL_QUIT "Largohu Nga Loja?"
     IDS_SOL_WIN "Urime, keni fituar!"
     IDS_SOL_DEAL "Fillo Perseri?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/sv-SE.rc

@@ -10,8 +10,13 @@ BEGIN
     GROUPBOX "Kort", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Dra &En", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Dra &Tre", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Visa Tid", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Visa Tid", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "&Statusfält", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Avbryt", IDCANCEL, 101, 97, 50, 14
 END
@@ -46,6 +51,8 @@ BEGIN
     IDS_SOL_QUIT "Avsluta nuvarande spel?"
     IDS_SOL_WIN "Grattis, du vann!"
     IDS_SOL_DEAL "Ge igen?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/th-TH.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "Cards", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "ตกลง", IDOK, 35, 97, 50, 14
     PUSHBUTTON "ยกเลิก", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "Quit the current game?"
     IDS_SOL_WIN "Congratulations, you win!"
     IDS_SOL_DEAL "Deal again?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/tr-TR.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "Kâğıtlar", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "&Tekli Çek", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "&Üçlü Çek", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Süreyi Göster", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Süreyi Göster", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "&Durum Çubuğu", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "Tamam", IDOK, 35, 97, 50, 14
     PUSHBUTTON "İptal", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "Bu oyundan çıkılsın mı?"
     IDS_SOL_WIN "Tebrikler, kazandınız!"
     IDS_SOL_DEAL "Yine dağıtılsın mı?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/uk-UA.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "Карти", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "По &одній", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "По &три", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "&Гра за часом", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "&Гра за часом", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "&Рядок стану", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Скасувати", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "Вийти з поточної гри?"
     IDS_SOL_WIN "Вітання, Ви виграли!!"
     IDS_SOL_DEAL "Роздати знову?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/zh-CN.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "翻牌", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "翻一张(&O)", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "翻三张(&T)", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "计时(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "计时(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "状态栏(&T)", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "确定", IDOK, 35, 97, 50, 14
     PUSHBUTTON "取消", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "退出当前游戏?"
     IDS_SOL_WIN "恭喜你，你赢了!!"
     IDS_SOL_DEAL "再玩一次?"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/lang/zh-TW.rc

@@ -18,8 +18,13 @@ BEGIN
     GROUPBOX "發牌", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "發一張牌(&O)", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "發三張牌(&T)", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    AUTOCHECKBOX "計時(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTOCHECKBOX "計時(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "狀態列(&T)", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "確定", IDOK, 35, 97, 50, 14
     PUSHBUTTON "取消", IDCANCEL, 101, 97, 50, 14
 END
@@ -54,6 +59,8 @@ BEGIN
     IDS_SOL_QUIT "退出目前遊戲？"
     IDS_SOL_WIN "恭喜你，你嬴了！！"
     IDS_SOL_DEAL "再玩一次？"
+    IDS_SOL_SCORE "Score: %d"
+    IDS_SOL_TIME "Time: %d"
 END
 
 /* Menus */

base/applications/games/solitaire/resource.h

@@ -20,6 +20,10 @@
 #define IDC_OPT_DRAWTHREE 1202
 #define IDC_OPT_SHOWTIME  1203
 #define IDC_OPT_STATUSBAR 1204
+#define IDC_OPT_STANDARD  1205
+#define IDC_OPT_VEGAS     1206
+#define IDC_OPT_NOSCORE   1207
+#define IDC_OPT_KEEPSCORE 1208
 #define IDD_CARDBACK      1250
 #define IDC_CARDBACK1     1251
 #define IDC_CARDBACK2     1252
@@ -40,3 +44,5 @@
 #define IDS_SOL_QUIT  1302
 #define IDS_SOL_WIN   1303
 #define IDS_SOL_DEAL  1304
+#define IDS_SOL_SCORE 1305
+#define IDS_SOL_TIME  1306

base/applications/games/solitaire/solcreate.cpp

@@ -38,6 +38,7 @@ void CreateSol()
     pPile->SetDropRule(CS_DROP_NONE, 0);
     pPile->SetDblClickProc(PileDblClickProc);
     pPile->SetRemoveCardProc(PileRemoveProc);
+    pPile->SetClickProc(PileClickProc);
 
     //
     //    Create the suit stacks
@@ -50,6 +51,7 @@ void CreateSol()
 
         pSuitStack[i]->SetDropRule(CS_DROP_CALLBACK, SuitStackDropProc);
         pSuitStack[i]->SetDragRule(CS_DRAG_TOP);
+        pSuitStack[i]->SetClickProc(SuitStackClickProc);
 
         pSuitStack[i]->SetAddCardProc(SuitStackAddProc);
     }

base/applications/games/solitaire/solgame.cpp

@@ -10,6 +10,7 @@ extern TCHAR MsgWin[128];
 extern TCHAR MsgDeal[128];
 
 CardStack activepile;
+int LastId;
 bool fGameStarted = false;
 
 void NewGame(void)
@@ -17,6 +18,33 @@ void NewGame(void)
     TRACE("ENTER NewGame()\n");
     int i, j;
 
+    if (GetScoreMode() == SCORE_VEGAS)
+    {
+        if ((dwOptions & OPTION_KEEP_SCORE) && (dwPrevMode == SCORE_VEGAS))
+            lScore = lScore - 52;
+        else
+            lScore = -52;
+        
+        if (dwOptions & OPTION_THREE_CARDS)
+            dwWasteTreshold = 2;
+        else
+            dwWasteTreshold = 0;
+       
+    }
+    else
+    {
+        if (dwOptions & OPTION_THREE_CARDS)
+            dwWasteTreshold = 3;
+        else
+            dwWasteTreshold = 0;
+
+        lScore = 0;
+    }
+
+    dwTime = 0;
+    dwWasteCount = 0;
+    LastId = 0;
+
     SolWnd.EmptyStacks();
 
     //create a new card-stack
@@ -52,7 +80,13 @@ void NewGame(void)
     SolWnd.Redraw();
 
     fGameStarted = false;
+
+    dwPrevMode = GetScoreMode();
+
+    UpdateStatusBar();
+
     TRACE("EXIT NewGame()\n");
+
 }
 
 //
@@ -69,6 +103,8 @@ bool CARDLIBPROC RowStackDragProc(CardRegion &stackobj, int iNumDragCards)
     int numfacedown;
     int numcards;
 
+    SetPlayTimer();
+
     stackobj.GetFaceDirection(&numfacedown);
 
     numcards = stackobj.NumCards();
@@ -90,6 +126,8 @@ bool CARDLIBPROC RowStackDropProc(CardRegion &stackobj, CardStack &dragcards)
     TRACE("ENTER RowStackDropProc()\n");
     Card dragcard = dragcards[dragcards.NumCards() - 1];
 
+    SetPlayTimer();
+
     //if we are empty, can only drop a stack with a King at bottom
     if(stackobj.NumCards() == 0)
     {
@@ -121,6 +159,27 @@ bool CARDLIBPROC RowStackDropProc(CardRegion &stackobj, CardStack &dragcards)
 
     fGameStarted = true;
 
+    if (LastId == PILE_ID)
+    {
+        if (GetScoreMode() == SCORE_STD)
+        {
+            lScore = lScore + 5;
+        }
+    }
+    else if ((LastId >= SUIT_ID) && (LastId <= SUIT_ID + 3))
+    {
+        if (GetScoreMode() == SCORE_STD)
+        {
+            lScore = lScore >= 15 ? lScore - 15 : 0;
+        }
+        else if (GetScoreMode() == SCORE_VEGAS)
+        {
+            lScore = lScore >= -47 ? lScore - 5 : -52;
+        }
+    }
+
+    UpdateStatusBar();
+
     TRACE("EXIT RowStackDropProc(true)\n");
     return true;
 }
@@ -136,6 +195,8 @@ bool CanDrop(CardRegion &stackobj, Card card)
 
     const CardStack &cardstack = stackobj.GetCardStack();
 
+    SetPlayTimer();
+
     if(cardstack.NumCards() > 0)
     {
         if(card.Suit() != cardstack[0].Suit())
@@ -168,6 +229,9 @@ bool CanDrop(CardRegion &stackobj, Card card)
 bool CARDLIBPROC SuitStackDropProc(CardRegion &stackobj, CardStack &dragcards)
 {
     TRACE("ENTER SuitStackDropProc()\n");
+
+    SetPlayTimer();
+
     //only drop 1 card at a time
     if(dragcards.NumCards() != 1)
     {
@@ -177,9 +241,41 @@ bool CARDLIBPROC SuitStackDropProc(CardRegion &stackobj, CardStack &dragcards)
 
     bool b = CanDrop(stackobj, dragcards[0]);
     TRACE("EXIT SuitStackDropProc()\n");
+
+    if (b)
+    {
+        if ((LastId == PILE_ID) || (LastId >= ROW_ID))
+        {
+            if (GetScoreMode() == SCORE_VEGAS)
+            {
+                lScore = lScore + 5;
+            }
+            else if (GetScoreMode() == SCORE_STD)
+            {
+                lScore = lScore + 10;
+            }
+    
+            UpdateStatusBar();
+        }
+    }
+
     return b;
 }
 
+//
+//    Single-click on one of the suit-stacks
+//
+void CARDLIBPROC SuitStackClickProc(CardRegion &stackobj, int iNumClicked)
+{
+    TRACE("ENTER SuitStackClickProc()\n");
+
+    fGameStarted = true;
+
+    LastId = stackobj.Id();
+
+    TRACE("EXIT SuitStackClickProc()\n");
+}
+
 //
 //    Single-click on one of the row-stacks
 //    Turn the top-card over if they are all face-down
@@ -197,7 +293,18 @@ void CARDLIBPROC RowStackClickProc(CardRegion &stackobj, int iNumClicked)
         if(numfacedown > 0) numfacedown--;
         stackobj.SetFaceDirection(CS_FACE_DOWNUP, numfacedown);
         stackobj.Redraw();
+
+        if (GetScoreMode() == SCORE_STD)
+        {
+            lScore = lScore + 5;
+            UpdateStatusBar();
+        }
     }
+
+    LastId = stackobj.Id();
+
+    fGameStarted = true;
+
     TRACE("EXIT RowStackClickProc()\n");
 }
 
@@ -207,6 +314,7 @@ void CARDLIBPROC RowStackClickProc(CardRegion &stackobj, int iNumClicked)
 CardRegion *FindSuitStackFromCard(Card card)
 {
     TRACE("ENTER FindSuitStackFromCard()\n");
+
     for(int i = 0; i < 4; i++)
     {
         if(CanDrop(*pSuitStack[i], card))
@@ -231,17 +339,30 @@ void CARDLIBPROC SuitStackAddProc(CardRegion &stackobj, const CardStack &added)
     TRACE("ENTER SuitStackAddProc()\n");
     bool fGameOver = true;
 
+    SetPlayTimer();
+
     for(int i = 0; i < 4; i++)
     {
         if(pSuitStack[i]->NumCards() != 13)
         {
             fGameOver = false;
+
             break;
         }
     }
 
     if(fGameOver)
     {
+        KillTimer(hwndMain, IDT_PLAYTIMER);
+        PlayTimer = 0;
+
+        if ((dwOptions & OPTION_SHOW_TIME) && (GetScoreMode() == SCORE_STD))
+        {
+            lScore = lScore + (700000 / dwTime);
+        }
+
+        UpdateStatusBar();
+
         MessageBox(SolWnd, MsgWin, szAppName, MB_OK | MB_ICONINFORMATION);
 
         for(int i = 0; i < 4; i++)
@@ -272,6 +393,9 @@ void CARDLIBPROC SuitStackAddProc(CardRegion &stackobj, const CardStack &added)
 void CARDLIBPROC RowStackDblClickProc(CardRegion &stackobj, int iNumClicked)
 {
     TRACE("ENTER RowStackDblClickProc()\n");
+
+    SetPlayTimer();
+
     //can only move 1 card at a time
     if(iNumClicked != 1)
     {
@@ -286,6 +410,7 @@ void CARDLIBPROC RowStackDblClickProc(CardRegion &stackobj, int iNumClicked)
     if(pDest != 0)
     {
         fGameStarted = true;
+        SetPlayTimer();
 
         //stackobj.MoveCards(pDest, 1, true);
         //use the SimulateDrag funcion, because we get the
@@ -295,12 +420,29 @@ void CARDLIBPROC RowStackDblClickProc(CardRegion &stackobj, int iNumClicked)
     TRACE("EXIT RowStackDblClickProc()\n");
 }
 
+//
+//    Face-up pile single-click
+//
+void CARDLIBPROC PileClickProc(CardRegion &stackobj, int iNumClicked)
+{
+    TRACE("ENTER SuitStackClickProc()\n");
+
+    fGameStarted = true;
+
+    LastId = stackobj.Id();
+
+    TRACE("EXIT SuitStackClickProc()\n");
+}
+
 //
 //    Face-up pile double-click
 //
 void CARDLIBPROC PileDblClickProc(CardRegion &stackobj, int iNumClicked)
 {
     TRACE("ENTER PileDblClickProc()\n");
+
+    SetPlayTimer();
+
     RowStackDblClickProc(stackobj, iNumClicked);
     TRACE("EXIT PileDblClickProc()\n");
 }
@@ -311,6 +453,9 @@ void CARDLIBPROC PileDblClickProc(CardRegion &stackobj, int iNumClicked)
 void CARDLIBPROC PileRemoveProc(CardRegion &stackobj, int iItems)
 {
     TRACE("ENTER PileRemoveProc()\n");
+
+    SetPlayTimer();
+
     //modify our "virtual" pile by removing the same card
     //that was removed from the physical card stack
     activepile.Pop(iItems);
@@ -334,10 +479,14 @@ void CARDLIBPROC PileRemoveProc(CardRegion &stackobj, int iItems)
 void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked)
 {
     TRACE("ENTER DeckClickProc()\n");
+
+    SetPlayTimer();
+
     CardStack cardstack = stackobj.GetCardStack();
     CardStack pile      = pPile->GetCardStack();
 
     fGameStarted = true;
+    SetPlayTimer();
 
     //reset the face-up pile to represent 3 cards
     if(dwOptions & OPTION_THREE_CARDS)
@@ -345,11 +494,45 @@ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked)
 
     if(cardstack.NumCards() == 0)
     {
-        pile.Clear();
+        if (GetScoreMode() == SCORE_VEGAS)
+        {
+            if (dwWasteCount < dwWasteTreshold)
+            {
+                pile.Clear();
 
-        activepile.Reverse();
+                activepile.Reverse();
-        cardstack.Push(activepile);
+                cardstack.Push(activepile);
-        activepile.Clear();
+                activepile.Clear();
+            }
+        }
+        else if (GetScoreMode() == SCORE_STD)
+        {
+            if ((dwWasteCount >= dwWasteTreshold) && (activepile.NumCards() != 0))
+            {
+                if (dwOptions & OPTION_THREE_CARDS)
+                    lScore = lScore >= 20 ? lScore - 20 : 0;
+                else
+                    lScore = lScore >= 100 ? lScore - 100 : 0;
+            }
+
+            pile.Clear();
+
+            activepile.Reverse();
+            cardstack.Push(activepile);
+            activepile.Clear();
+
+            UpdateStatusBar();
+        }
+        else
+        {
+            pile.Clear();
+
+            activepile.Reverse();
+            cardstack.Push(activepile);
+            activepile.Clear();
+        }
+
+        dwWasteCount++;
     }
     else
     {

base/applications/games/solitaire/solitaire.cpp

@@ -14,12 +14,21 @@ HWND        hwndStatus;
 HINSTANCE    hInstance;
 
 TCHAR szAppName[128];
+TCHAR szScore[64];
+TCHAR szTime[64];
 TCHAR MsgQuit[128];
 TCHAR MsgAbout[128];
 TCHAR MsgWin[128];
 TCHAR MsgDeal[128];
 DWORD dwOptions = OPTION_THREE_CARDS;
 
+DWORD dwTime;
+DWORD dwWasteCount;
+DWORD dwWasteTreshold;
+DWORD dwPrevMode;
+long lScore;
+UINT_PTR PlayTimer = 0;
+
 CardWindow SolWnd;
 
 typedef struct _CardBack
@@ -115,6 +124,60 @@ VOID SaveSettings(VOID)
     RegCloseKey(hKey);
 }
 
+// Returns 0 for no points, 1 for Standard and 2 for Vegas
+int GetScoreMode(void)
+{
+    if ((dwOptions & OPTION_SCORE_STD) && (dwOptions & OPTION_SCORE_VEGAS))
+    {
+        return SCORE_NONE;
+    }
+
+    if (dwOptions & OPTION_SCORE_STD)
+    {
+        return SCORE_STD;
+    }
+
+    if (dwOptions & OPTION_SCORE_VEGAS)
+    {
+        return SCORE_VEGAS;
+    }
+
+    return 0;
+}
+
+void UpdateStatusBar(void)
+{
+    TCHAR szStatusText[128];
+    TCHAR szTempText[64];
+
+    ZeroMemory(szStatusText, sizeof(szStatusText) / sizeof(TCHAR));
+
+    if (GetScoreMode() != SCORE_NONE)
+    {
+        _stprintf(szStatusText, szScore, lScore);
+        _tcscat(szStatusText, _T("   "));
+    }
+
+    if (dwOptions & OPTION_SHOW_TIME)
+    {
+        _stprintf(szTempText, szTime, dwTime);
+        _tcscat(szStatusText, szTempText);
+    }
+
+    SendMessage(hwndStatus, SB_SETTEXT, 0 | SBT_NOBORDERS, (LPARAM)(LPTSTR)szStatusText);
+}
+
+void SetPlayTimer(void)
+{
+    if (dwOptions & OPTION_SHOW_TIME)
+    {
+        if (!PlayTimer)
+        {
+            PlayTimer = SetTimer(hwndMain, IDT_PLAYTIMER, 1000, NULL);
+        }
+    }
+}
+
 //
 //    Main entry point
 //
@@ -136,6 +199,9 @@ int WINAPI _tWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPTSTR szCmdLine, int iCm
     LoadString(hInst, IDS_SOL_WIN, MsgWin, sizeof(MsgWin) / sizeof(MsgWin[0]));
     LoadString(hInst, IDS_SOL_DEAL, MsgDeal, sizeof(MsgDeal) / sizeof(MsgDeal[0]));
 
+    LoadString(hInst, IDS_SOL_SCORE, szScore, sizeof(szScore) / sizeof(TCHAR));
+    LoadString(hInst, IDS_SOL_TIME, szTime, sizeof(szTime) / sizeof(TCHAR));
+
     //Window class for the main application parent window
     wndclass.style            = 0;//CS_HREDRAW | CS_VREDRAW;
     wndclass.lpfnWndProc    = WndProc;
@@ -160,6 +226,8 @@ int WINAPI _tWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPTSTR szCmdLine, int iCm
 
     LoadSettings();
 
+    dwPrevMode = GetScoreMode();
+
     //Construct the path to our help file
     MakePath(szHelpPath, MAX_PATH, _T(".hlp"));
 
@@ -178,6 +246,8 @@ int WINAPI _tWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPTSTR szCmdLine, int iCm
 
     hwndMain = hwnd;
 
+    UpdateStatusBar();
+
     ShowWindow(hwnd, iCmdShow);
     UpdateWindow(hwnd);
 
@@ -200,6 +270,8 @@ int WINAPI _tWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPTSTR szCmdLine, int iCm
 
 INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
+    HWND hCtrl;
+
     switch (uMsg)
     {
     case WM_INITDIALOG:
@@ -209,11 +281,47 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
         CheckDlgButton(hDlg,
                        IDC_OPT_STATUSBAR,
                        (dwOptions & OPTION_SHOW_STATUS) ? BST_CHECKED : BST_UNCHECKED);
+
+        CheckDlgButton(hDlg,
+                       IDC_OPT_SHOWTIME,
+                       (dwOptions & OPTION_SHOW_TIME) ? BST_CHECKED : BST_UNCHECKED);
+
+        CheckDlgButton(hDlg,
+                       IDC_OPT_KEEPSCORE,
+                       (dwOptions & OPTION_KEEP_SCORE) ? BST_CHECKED : BST_UNCHECKED);
+
+        hCtrl = GetDlgItem(hDlg, IDC_OPT_KEEPSCORE);
+
+        if (GetScoreMode() == SCORE_NONE)
+        {
+            CheckRadioButton(hDlg, IDC_OPT_STANDARD, IDC_OPT_NOSCORE, IDC_OPT_NOSCORE);
+            EnableWindow(hCtrl, FALSE);
+        }
+        else if (GetScoreMode() == SCORE_STD)
+        {
+            CheckRadioButton(hDlg, IDC_OPT_STANDARD, IDC_OPT_NOSCORE, IDC_OPT_STANDARD);
+            EnableWindow(hCtrl, FALSE);
+        }
+        else if (GetScoreMode() == SCORE_VEGAS)
+        {
+            CheckRadioButton(hDlg, IDC_OPT_STANDARD, IDC_OPT_NOSCORE, IDC_OPT_VEGAS);
+            EnableWindow(hCtrl, TRUE);
+        }
         return TRUE;
 
     case WM_COMMAND:
         switch(LOWORD(wParam))
         {
+        case IDC_OPT_NOSCORE:
+        case IDC_OPT_STANDARD:
+        case IDC_OPT_VEGAS:
+            hCtrl = GetDlgItem(hDlg, IDC_OPT_KEEPSCORE);
+            if (wParam == IDC_OPT_VEGAS)
+                EnableWindow(hCtrl, TRUE);
+            else
+                EnableWindow(hCtrl, FALSE);
+            return TRUE;
+ 
         case IDOK:
             dwOptions &= ~OPTION_THREE_CARDS;
             if (IsDlgButtonChecked(hDlg, IDC_OPT_DRAWTHREE) == BST_CHECKED)
@@ -224,6 +332,34 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
             else
                 dwOptions &= ~OPTION_SHOW_STATUS;
 
+            if (IsDlgButtonChecked(hDlg, IDC_OPT_SHOWTIME) == BST_CHECKED)
+                dwOptions |= OPTION_SHOW_TIME;
+            else
+                dwOptions &= ~OPTION_SHOW_TIME;
+
+            if (IsDlgButtonChecked(hDlg, IDC_OPT_KEEPSCORE) == BST_CHECKED)
+                dwOptions |= OPTION_KEEP_SCORE;
+            else
+                dwOptions &= ~OPTION_KEEP_SCORE;
+
+            if (IsDlgButtonChecked(hDlg, IDC_OPT_STANDARD) == BST_CHECKED)
+            {
+                dwOptions |= OPTION_SCORE_STD;
+                dwOptions &= ~OPTION_SCORE_VEGAS;
+            }
+            else if (IsDlgButtonChecked(hDlg, IDC_OPT_VEGAS) == BST_CHECKED)
+            {
+                dwOptions |= OPTION_SCORE_VEGAS;
+                dwOptions &= ~OPTION_SCORE_STD;
+            }
+            else if (IsDlgButtonChecked(hDlg, IDC_OPT_NOSCORE) == BST_CHECKED)
+            {
+                dwOptions |= OPTION_SCORE_VEGAS;
+                dwOptions |= OPTION_SCORE_STD;
+            }
+
+            UpdateStatusBar();
+
             EndDialog(hDlg, TRUE);
             return TRUE;
 
@@ -241,9 +377,13 @@ VOID ShowGameOptionsDlg(HWND hwnd)
     DWORD dwOldOptions = dwOptions;
     RECT rcMain, rcStatus;
 
+    int iOldScoreMode = GetScoreMode();
+
     if (DialogBox(hInstance, MAKEINTRESOURCE(IDD_OPTIONS), hwnd, OptionsDlgProc))
     {
-        if ((dwOldOptions & OPTION_THREE_CARDS) != (dwOptions & OPTION_THREE_CARDS))
+        if (((dwOldOptions & OPTION_THREE_CARDS) != (dwOptions & OPTION_THREE_CARDS)) ||
+            ((dwOldOptions & OPTION_SHOW_TIME) != (dwOptions & OPTION_SHOW_TIME)) ||
+            (iOldScoreMode != GetScoreMode()))
             NewGame();
 
         if ((dwOldOptions & OPTION_SHOW_STATUS) != (dwOptions & OPTION_SHOW_STATUS))
@@ -458,7 +598,7 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
     {
         case WM_CREATE:
         {
-            int parts[] = { 100, -1 };
+            int parts[] = { 150, -1 };
             RECT rcStatus;
 
             hwndStatus = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM | SBARS_SIZEGRIP, _T("Ready"), hwnd, 0);
@@ -496,6 +636,25 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
             PostQuitMessage(0);
             return 0;
 
+        case WM_TIMER:
+            if (!fGameStarted)
+            {
+                KillTimer(hwndMain, IDT_PLAYTIMER);
+                PlayTimer = 0;
+            }
+            else if (dwOptions & OPTION_SHOW_TIME)
+            {
+                if (((dwTime + 1) % 10 == 0) && (GetScoreMode() == SCORE_STD))
+                {
+                    lScore = lScore >= 2 ? lScore - 2 : 0;
+                }
+
+                dwTime++;
+            }
+
+            UpdateStatusBar();
+            return 0;
+
         case WM_SIZE:
             nWidth  = LOWORD(lParam);
             nHeight = HIWORD(lParam);

base/applications/games/solitaire/solitaire.h

@@ -9,6 +9,10 @@ extern bool fGameStarted;
 
 #define OPTION_SHOW_STATUS       4
 #define OPTION_THREE_CARDS       8
+#define OPTION_SHOW_TIME         16
+#define OPTION_KEEP_SCORE       32
+#define OPTION_SCORE_STD        64
+#define OPTION_SCORE_VEGAS      128
 #define CARDBACK_START           IDC_CARDBACK1
 #define CARDBACK_END             IDC_CARDBACK12
 #define NUM_CARDBACKS            (CARDBACK_END - CARDBACK_START + 1)
@@ -19,6 +23,16 @@ extern bool fGameStarted;
 
 extern DWORD dwOptions;
 
+extern DWORD dwTime;
+extern DWORD dwWasteCount;
+extern DWORD dwWasteTreshold;
+extern DWORD dwPrevMode;
+extern long lScore;
+extern HWND hwndMain;
+extern UINT_PTR PlayTimer;
+
+#define IDT_PLAYTIMER 1000
+
 void CreateSol(void);
 void NewGame(void);
 
@@ -28,6 +42,10 @@ void NewGame(void);
 #define SUIT_ID            4
 #define ROW_ID             10
 
+#define SCORE_NONE  0
+#define SCORE_STD   1
+#define SCORE_VEGAS 2
+
 // Various metrics used for placing the objects and computing the minimum window size
 #define X_BORDER                 20
 #define X_PILE_BORDER            18
@@ -42,18 +60,25 @@ extern CardRegion *pPile;
 extern CardRegion *pSuitStack[];
 extern CardRegion *pRowStack[];
 
+extern void UpdateStatusBar(void);
+extern void SetPlayTimer(void);
+extern int GetScoreMode(void);
+
 bool CARDLIBPROC RowStackDragProc(CardRegion &stackobj, int iNumCards);
 bool CARDLIBPROC RowStackDropProc(CardRegion &stackobj,  CardStack &dragcards);
 
 bool CARDLIBPROC SuitStackDropProc(CardRegion &stackobj, CardStack &dragcards);
 void CARDLIBPROC SuitStackAddProc(CardRegion &stackobj, const CardStack &added);
+void CARDLIBPROC SuitStackClickProc(CardRegion &stackobj, int iNumClicked);
 
 void CARDLIBPROC RowStackClickProc(CardRegion &stackobj, int iNumClicked);
 void CARDLIBPROC RowStackDblClickProc(CardRegion &stackobj, int iNumClicked);
 
 void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked);
 void CARDLIBPROC PileDblClickProc(CardRegion &stackobj, int iNumClicked);
+void CARDLIBPROC PileClickProc(CardRegion &stackobj, int iNumClicked);
 
 void CARDLIBPROC PileRemoveProc(CardRegion &stackobj, int iRemoved);
 
+
 #endif /* _SOL_PCH_ */

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

@@ -1,4 +1,4 @@
-/*
+/*
  *    Translated by Caemyr - Olaf Siejka (Aug, 2009)
  *    Use ReactOS forum PM or IRC to contact me
  *    Updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (Apr, 2011)
@@ -26,7 +26,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "O&dśwież", ID_REFRESH
         MENUITEM SEPARATOR
-        MENUITEM "Update Da&tabase", ID_RESETDB
+        MENUITEM "Ak&tualizuj bazę programów", ID_RESETDB
     END
     POPUP "Pomoc"
     BEGIN
@@ -56,7 +56,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Odśwież", ID_REFRESH
         MENUITEM SEPARATOR
-        MENUITEM "Update Da&tabase", ID_RESETDB
+        MENUITEM "Ak&tualizuj bazę programów", ID_RESETDB
     END
 END
 
@@ -71,7 +71,7 @@ BEGIN
     AUTOCHECKBOX "Zap&isuj dziennik instalacji i usuwania programów", IDC_LOG_ENABLED, 15, 46, 219, 12
     GROUPBOX "Pobieranie", -1, 4, 65, 240, 51
     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 | ES_AUTOHSCROLL
+    EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP
     PUSHBUTTON "&Wybierz", IDC_CHOOSE, 187, 85, 50, 14
     AUTOCHECKBOX "&Usuń instalatory programów po ich zainstalowaniu", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
     PUSHBUTTON "Domyślne", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14

base/applications/rapps/rapps/alreader.txt

@@ -2,8 +2,7 @@
 
 [Section]
 Name = AlReader
-Version = 110502
+Description = A FB2 eBook Reader. Read formats: fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. Supported ZIP and GZ archives.
-Description = A FB2 eBook Reader.
 URLSite = http://www.alreader.com
 Size = 4.6 MB
 Category = 6
@@ -11,11 +10,14 @@ URLDownload = http://svn.reactos.org/packages/AlReader2Setup.exe
 CDPath = none
 
 [Section.0407]
-Description = Ein FB2 eBook Reader.
+Description = Ein FB2 eBook Reader. Unterstützung für folgende Formate: fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. ZIP und GZ Archive werden ebenfalls unterstützt.
 
 [Section.0410]
 Description = Un eBook Reader.
 
+[Section.0415]
+Description = Czytnik eBooków. Obsługuje formaty: fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. Obsługiwane są także pliki w archivach ZIP i GZ.
+
 [Section.0418]
 Description = Cititor de cărți electronice în format FB2.
 Size = 4,6 Mo

base/applications/rapps/rapps/ants.txt

@@ -1,5 +1,5 @@
 ; UTF-8
-
+; PL translation by wojo664
 [Section]
 Name = Ants
 Version = N/A
@@ -14,12 +14,16 @@ CDPath = none
 [Section.0407]
 Description = Ein strategisches Kartenspiel. Sie bauen Ihr eigenes Schloss und versuchen, die gegnerische Burg zu zerstören. Sie benötigen ein ZIP-Programm, um es zu installieren.
 
+[Section.0415]
+Description = Karciana gra strategiczna. Budujesz zamek, przy okazji próbujesz zniszczyć zamek wroga. Wymaga programu archiwizującego do wypakowania.
+
 [Section.0418]
 Licence = Gratuită
 Description = Un joc strategic de cărți. Jucătorul își va construi un castel și încerca să distrugă castelele oponenților. Este necesar un utilitar de dezarhivare ZIP pentru a instala acest joc.
 Size = 632 ko
 
 [Section.041f]
+Name = Karıncalar
 Licence = Ücretsiz
 Description = Bir kartlarla izlem oyunu. Kalenizi bitirmeye veyâ rakip kaleyi yıkmaya çalışın. Yazılımı kurmak için ZIP biçiminde çıkartma yeteneği olan bir yazılım gerekir.
 Size = 632 KB

base/applications/rapps/rapps/bochs.txt

@@ -1,4 +1,5 @@
 ; UTF-8
+; PL translation by wojo664
 
 [Section]
 Name = Bochs
@@ -14,6 +15,9 @@ CDPath = none
 [Section.0407]
 Description = Bochs ist ein portabler Open-Source IA-32 (x86) PC-Emulator geschrieben in C++, der auf den meisten populären Plattformen läuft. 
 
+[Section.0415]
+Description = Bochs to przenośny (portable) emulator platformy IA-32 (x86) napisany w C++, działa na wielu popularnych platformach sprzętowych.
+
 [Section.0418]
 Description = Bochs este un emulator PC (x86) cu surse publice și portabilitate înaltă, scris în C++, compatibil cu majoritatea platformelor.
 Size = 4,7 Mo

base/applications/rapps/rapps/boswars.txt

@@ -1,4 +1,5 @@
 ; UTF-8
+; PL translation by wojo664
 
 [Section]
 Name = Bos Wars
@@ -17,10 +18,14 @@ Description = Bos Wars ist ein futuristisches Echtzeitstrategiespiel. Um das Spi
 [Section.0410]
 Description = Bos Wars è un gioco futuristico di strategia in tempo reale. Per iniziare il gioco, installare Microsoft Visual C + + 2008 runtime.
 
+[Section.0415]
+Description = Bos Wars to futurystyczna gra strategiczna czasu rzeczywistego. Aby uruchomić grę, zainstaluj Microsoft Visual C++ 2008 runtime.
+
 [Section.0418]
 Description = Bos Wars e o strategie în timp real, futuristă. Pentru a porni jocul, instalați Microsoft Visual C++ 2008 Runtime.
 Size = 62,3 Mo
 
 [Section.041f]
-Description = Bos Wars, gelecekçi ve gerçek zamanlı bir izlem oyunudur. Oyunu başlatmak için Microsoft Visual C++ 2008 Yürütücüsü'nü kurunuz.
+Name = Bos Savaşları
+Description = Bos Savaşları, gelecekçi ve gerçek zamanlı bir izlem oyunudur. Oyunu başlatmak için Mikroyazılım Basarî C++ 2008 Yürütücüsü'nü kurunuz.
 Size = 62,3 MB

base/applications/rapps/rapps/boundaround.txt

@@ -0,0 +1,20 @@
+; UTF-8
+
+[Section]
+Name = Bound Around (Demo)
+Licence = Shareware
+Description = A game similar Frozen Fruits.
+Size = 1.95 MB
+Category = 4
+URLSite = http://www.blueskied.com/boundaround.htm
+URLDownload = http://www.blueskied.com/BoundAround_Demo.exe
+CDPath = none
+
+[Section.0407]
+Description = Ein Spiel, ähnlich zu Frozen Fruits.
+
+[Section.041f]
+Name = Bound Around (Göstermelik)
+Licence = Kısıtlı
+Description = Frozen Fruits'e benzeyen bir oyun.
+Size = 1,95 MB

base/applications/rapps/rapps/christmasbound.txt

@@ -0,0 +1,20 @@
+; UTF-8
+
+[Section]
+Name = Christmas Bound
+Version = 1.4
+Licence = Freeware
+Description = A game similar Frozen Fruits.
+Size = 892 kB
+Category = 4
+URLSite = http://www.blueskied.com/xmas/christmas_main.htm
+URLDownload = http://www.blueskied.com/xmas/ChristmasBound_setup.exe
+CDPath = none
+
+[Section.0407]
+Description = Ein Spiel, ähnlich zu Frozen Fruits.
+
+[Section.041f]
+Licence = Ücretsiz
+Description = Frozen Fruits'e benzeyen bir oyun.
+Size = 892 KB

base/applications/rapps/rapps/chromium.txt

@@ -1,5 +1,5 @@
 ; UTF-8
-
+; PL translation by wojo664
 [Section]
 Name = Chromium B.S.U.
 Version = 0.9.13.2
@@ -17,6 +17,9 @@ Description = Chromium B.S.U. ist ein Arcade-Style, Top-Scrolling Space Shooter.
 [Section.0410]
 Description = Cromo B.S.U. è sparatutto spaziale.
 
+[Section.0415]
+Description = Chromium B.S.U to gra w stylu Arcade, z widokiem z góry.
+
 [Section.0418]
 Description = Chromium B.S.U. este un joc de vânătoare în spațiul cosmic (arcadă 2D).
 Size = 2,3 Mo

base/applications/rapps/rapps/codeblocks.txt

@@ -0,0 +1,20 @@
+; UTF-8
+
+[Section]
+Name = Code::Blocks (no compiler)
+Version = 13.12
+Licence = GPLv3
+Description = A open source, cross-platform, powerful IDE. It doesn't contain a compiler.
+Size = 29.2 MB
+Category = 7
+URLSite = http://www.codeblocks.org/
+URLDownload = http://sourceforge.net/projects/codeblocks/files/Binaries/13.12/Windows/codeblocks-13.12-setup.exe
+CDPath = none
+
+[Section.0407]
+Description = Eine quelloffene, plattformübergreifende, mächtige IDE. Diese enthält keinen Compiler.
+
+[Section.041f]
+Name = Code::Blocks (Derleyicisiz)
+Description = Açık kaynak, çapraz platform, güçlü bir tümleşik geliştirme ortamı. Bir derleyici içermez.
+Size = 29,2 MB

base/applications/rapps/rapps/codeblocks_gcc.txt

@@ -0,0 +1,20 @@
+; UTF-8
+
+[Section]
+Name = Code::Blocks TDM-GCC (version 4.7.1, 32 bit)
+Version = 13.12
+Licence = GPLv3
+Description = A open source, cross-platform, powerful IDE. It contains TDM-GCC (version 4.7.1, 32 bit) compiler.
+Size = 97.8 MB
+Category = 7
+URLSite = http://www.codeblocks.org/
+URLDownload = http://sourceforge.net/projects/codeblocks/files/Binaries/13.12/Windows/codeblocks-13.12mingw-setup.exe
+CDPath = none
+
+[Section.0407]
+Description = Eine quelloffene, plattformübergreifende, mächtige IDE. Diese enthält den TDM-GCC (version 4.7.1, 32 bit) Compiler.
+
+[Section.041f]
+Name = Code::Blocks TDM-GCC (sürüm 4.7.1, 32 bitlik)
+Description = Açık kaynak, çapraz platform, güçlü bir tümleşik geliştirme ortamı. TDM-GCC (sürüm 4.7.1, 32 bitlik) derleyicisini içerir.
+Size = 97,8 MB

base/applications/rapps/rapps/codeblocks_gcc_2.txt

@@ -0,0 +1,20 @@
+; UTF-8
+
+[Section]
+Name = Code::Blocks TDM-GCC (version 4.8.1, 32 bit)
+Version = 13.12
+Licence = GPLv3
+Description = A open source, cross-platform, powerful IDE. It contains TDM-GCC (version 4.8.1, 32 bit) compiler.
+Size = 100 MB
+Category = 7
+URLSite = http://www.codeblocks.org/
+URLDownload = http://sourceforge.net/projects/codeblocks/files/Binaries/13.12/Windows/codeblocks-13.12mingw-setup-TDM-GCC-481.exe
+CDPath = none
+
+[Section.0407]
+Description = Eine quelloffene, plattformübergreifende, mächtige IDE. Diese enthät den TDM-GCC (version 4.8.1, 32 bit) Compiler.
+
+[Section.041f]
+Name = Code::Blocks TDM-GCC (sürüm 4.8.1, 32 bitlik)
+Description = Açık kaynak, çapraz platform, güçlü bir tümleşik geliştirme ortamı. TDM-GCC (sürüm 4.8.1, 32 bitlik) derleyicisini içerir.
+Size = 100 MB

base/applications/rapps/rapps/devcpp_mingw32.txt

@@ -0,0 +1,19 @@
+; UTF-8
+
+[Section]
+Name = Orwell Dev-C++ MinGW32
+Version = 5.6.2
+Licence = GPLv2
+Description = A maintained version of Dev-C++. It contains MinGW32 compiler.
+Size = 60.2 MB
+Category = 7
+URLSite = http://orwelldevcpp.blogspot.com/
+URLDownload = http://sourceforge.net/projects/orwelldevcpp/files/Setup%20Releases/Dev-Cpp%205.6.2%20MinGW%204.8.1%20Setup.exe
+CDPath = none
+
+[Section.0407]
+Description = Eine gepflegte Version von Dev-C++. Der MinGW32 Compiler liegt bei.
+
+[Section.041f]
+Description = Dev-C++'nın sürdürülen bir sürümü. MinGW32 derleyicisini içerir.
+Size = 60,2 MB

base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt

@@ -0,0 +1,19 @@
+; UTF-8
+
+[Section]
+Name = Orwell Dev-C++ TDM GCC x64
+Version = 5.6.2
+Licence = GPLv2
+Description = A maintained version of Dev-C++. It contains 64 bit TDM-GCC compiler.
+Size = 44.8 MB
+Category = 7
+URLSite = http://orwelldevcpp.blogspot.com/
+URLDownload = http://sourceforge.net/projects/orwelldevcpp/files/Setup%20Releases/Dev-Cpp%205.6.2%20TDM-GCC%20x64%204.8.1%20Setup.exe
+CDPath = none
+
+[Section.0407]
+Description = Eine gepflegte Version von Dev-C++. Der 64 bit TDM-GCC Compiler liegt bei.
+
+[Section.041f]
+Description = Dev-C++'nın sürdürülen bir sürümü. 64 bitlik TDM-GCC derleyicisini içerir.
+Size = 44,8 MB

base/applications/rapps/rapps/doublecommander.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = Double Commander
-Version = 0.5.8 Beta
+Version = 0.5.9 Beta
 Licence = GPL
 Description = Double Commander is an open source file manager with two panels side by side. You need 7-Zip or a similar Utility to extract it.
-Size = 7.5 MB
+Size = 7.6 MB
 Category = 12
 URLSite = http://doublecmd.sourceforge.net/
-URLDownload = http://download.sourceforge.net/project/doublecmd/DC%20for%20Windows%2032%20bit/Double%20Commander%200.5.8%20beta/doublecmd-0.5.8.i386-win32.exe
+URLDownload = http://download.sourceforge.net/project/doublecmd/DC%20for%20Windows%2032%20bit/Double%20Commander%200.5.9%20beta/doublecmd-0.5.9.i386-win32.exe
 CDPath = none
 
 [Section.0407]
@@ -25,7 +25,7 @@ Description = Double Commander to menedżer plików, o otwartym źródle, z klas
 
 [Section.0418]
 Description = Double Commander este un gestionar (open-source) de fișiere după modelul «două paneluri alăturate».  Este necesar 7-Zip sau un utilitar similar de dezarhivare pentru a-l putea extrage.
-Size = 7,5 Mo
+Size = 7,6 Mo
 
 [Section.0419]
 Description = Double Commander - это открытый двухпанельный файловый менеджер. Вам нужен 7-Zip или подобная утилита для его распаковки.
@@ -33,7 +33,7 @@ Description = Double Commander - это открытый двухпанельн
 [Section.041f]
 Version = 0.5.8 Gelişme
 Description = Double Commander, yan yana duran iki bölmenin bulunduğu bir açık kaynak kütük yöneticisidir. Bunu çıkartmak için 7-Zip ya da 7-Zip benzeri bir yazılım kullanmanız gerekir.
-Size = 7,5 MB
+Size = 7,6 MB
 
 [Section.0422]
 Description = Double Commander - це відкритий двопанельний файловий менеджер. Вам потрібен 7-Zip або подібна утиліта щоб розпакувати його.

base/applications/rapps/rapps/dvdwritenow.txt

@@ -1,5 +1,5 @@
 ; UTF-8
-
+; PL translation by wojo664
 [Section]
 Name = DVD Write Now
 Version = 1.5.12 sp2
@@ -17,6 +17,9 @@ Description = Eine kostenlose CD/DVD Brennsoftware. Sobald es installiert ist, k
 [Section.0410]
 Description = Un software di masterizzazione CD/DVD diretto e gratuito. Una volta installato, è possibile utilizzare il CD/DVD RW da flash USB o dischi rigidi rimovibili. Insieme a questo è possibile scrivere CD/DVD RW registrati con filesystem UDF. È anche possibile leggere i dischi UDF creati con altri software. (Microsoft DVD-ROM, dischi RW registrati con InCD Ahead). Il programma ha bisogno di un programma di decompressione ZIP per installarlo.
 
+[Section.0415]
+Description = Darmowe oprogramowanie do nagrywania CD/DVD. Po zainstalowaniu, możesz używać płyty CD RW i DVD RW tak, jak dyski przenośne / pendrive. Możesz także zapisywać (i odczytywać dyski utworzone przez inne programy) dane do dysków RW zapisanych w systemie UDF. Wymaga programu archiwizującego do wypakowania i instalacji.  
+
 [Section.0418]
 Licence = Gratuită
 Description = Un program de înscriere CD/DVD directă. Odată instalat, puteți utiliza CD/DVD ca memorie USB sau disc dur detașabil. Pe lângă aceasta, veți putea scrie pe CD/DVD inscripționate cu sistem de fișiere UDF. Se pot de asemenea citi discuri UDF create cu alte programe. (Microsoft DVD-ROM, discuri RW inscripționate cu Ahead InCD). Este necesar un program de decompresie ZIP pentru a-l instala.
@@ -27,6 +30,7 @@ Description = DVD Write Now - бесплатная программа для п
 URLSite = http://dwn.alter.org.ua/ru/
 
 [Section.041f]
+Name = DVD Şimdi Yaz
 Licence = Ücretsiz
-Description =  Ücretsiz bir doğrudan CD/DVD kaydedicisi. Kurulur kurulmaz CD/DVD RW'leri çıkartılabilir disk olarak kullanabilirsiniz. Bununla birlikte CD/DVD RW'leri UDF kütük dizgesiyle kaydedebilirsiniz. Ayrıca, Microsoft DVD−ROM'ları, Ahead InCD ile kaydedilen RW diskleri gibi diğer yazılımlarla oluşturulan UDF diskleri okutabilirsiniz. Yazılımı kurmak için ZIP biçiminde çıkartma yeteneği olan bir yazılım gerekir.
+Description =  Ücretsiz bir doğrudan CD/DVD kaydedicisi. Kurulur kurulmaz CD/DVD RW'leri çıkartılabilir disk olarak kullanabilirsiniz. Bununla birlikte CD/DVD RW'leri UDF kütük dizgesiyle kaydedebilirsiniz. Ayrıca, Mikroyazılım DVD−ROM'ları, Ahead InCD ile kaydedilen RW diskleri gibi diğer yazılımlarla oluşturulan UDF diskleri okutabilirsiniz. Yazılımı kurmak için ZIP biçiminde çıkartma yeteneği olan bir yazılım gerekir.
 Size = 1,2 MB

base/applications/rapps/rapps/fira.txt

@@ -1,4 +1,5 @@
 ; UTF-8
+; PL translation by wojo664
 
 [Section]
 Name = Mozilla Fira Font
@@ -15,13 +16,17 @@ CDPath = none
 Licence = Unbekannt
 Description = Mozilla Fira Font Pack, Beinhaltet Mono und Sans Schriften. Bitte in den "ReactOS" Ordner entpacken.
 
+[Section.0415]
+Description = Pakiet czcionek Mozilla Fira Font, zawiera czcionki Mono i Sans. Wypakuj do folderu "ReactOS".
+Licence = Nieznana
+
 [Section.0418]
 Licence = Nespecificată
 Description = Pachetul Mozilla Fira Font, include fonturile Mono și Sans. Dezarhivați în dosarul „ReactOS”.
 Size = 543 ko
 
 [Section.041f]
-Name = Mozilla Fira Yazı Tipi
+Name = Mozilla Fira Yazı Türü
 Licence = Bilinmiyor
-Description = Mozilla Fira Yazı Tipi Paketi, Mono ve Sans yazı tiplerini kapsar. ReactOS dizinine çıkartınız.
+Description = Mozilla Fira Yazı Türü Paketi, Mono ve Sans yazı türlerini kapsar. ReactOS'un "Fonts" dizinine çıkartınız.
 Size = 543 KB

base/applications/rapps/rapps/firefox.txt

@@ -1,83 +1,83 @@
 ; UTF-8
 
 [Section]
-Name = Mozilla Firefox 26
+Name = Mozilla Firefox 28
-Version = 26.0
+Version = 28.0
 Licence = MPL/GPL/LGPL
 Description = The most popular and one of the best free Web Browsers out there.
 Size = 22.9 MB
 Category = 5
 URLSite = http://www.mozilla.org/en-US/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/en-US/Firefox%20Setup%2026.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/en-US/Firefox%20Setup%2028.0.exe
 CDPath = none
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Webbrowser.
 Size = 22.8 MB
 URLSite = http://www.mozilla.org/de/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/de/Firefox%20Setup%2026.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/de/Firefox%20Setup%2028.0.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores navegadores web gratuitos que hay.
 Size = 22.7 MB
 URLSite = http://www.mozilla.org/es-ES/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/es-ES/Firefox%20Setup%2026.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/es-ES/Firefox%20Setup%2028.0.exe
 
 [Section.040c]
 Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs.
 Size = 23,0 Mo
 URLSite = http://www.mozilla.org/fr/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/fr/Firefox%20Setup%2026.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/fr/Firefox%20Setup%2028.0.exe
 
 [Section.0410]
 Description = Il più popolare e uno dei migliori web browser gratuiti.
 Size = 22.7 MB
 URLSite = http://www.mozilla.org/it/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/it/Firefox%20Setup%2026.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/it/Firefox%20Setup%2028.0.exe
 
 [Section.0413]
 Description = De meest populaire en een van de beste gratis Web browsers.
 Size = 23.4 MB
 URLSite = http://www.mozilla.org/nl/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/nl/Firefox%20Setup%2026.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/nl/Firefox%20Setup%2028.0.exe
 
 [Section.0414]
 Description = Mest populære og best også gratis nettleserene der ute.
 Size = 22.8 MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/nb-NO/Firefox%20Setup%2026.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/nb-NO/Firefox%20Setup%2028.0.exe
 
 [Section.0415]
 Description = Najpopularniejsza i jedna z najlepszych darmowych przeglądarek internetowych.
 Size = 23.7 MB
 URLSite = http://www.mozilla.org/pl/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/pl/Firefox%20Setup%2026.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/pl/Firefox%20Setup%2028.0.exe
 
 [Section.0418]
 Description = Cel mai popular și unul dintre cele mai bune navigatoare web gratuite existente.
 Size = 23,3 Mo
 URLSite = http://www.mozilla.org/ro/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/ro/Firefox%20Setup%2026.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/ro/Firefox%20Setup%2028.0.exe
 
 [Section.0419]
 Description = Один из самых популярных и лучших бесплатных браузеров.
 Size = 23,2 MB
 URLSite = http://www.mozilla.org/ru/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/ru/Firefox%20Setup%2026.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/ru/Firefox%20Setup%2028.0.exe
 
 [Section.041b] 
 Description = Najpopulárnejší a jeden z najlepších slobodný webových prehliadačov.
 Size = 23,4 MB
 URLSite = http://www.mozilla.org/sk/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/sk/Firefox%20Setup%2026.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/sk/Firefox%20Setup%2028.0.exe
 
 [Section.041f]
 Description = Özgür Umûmî Ağ tarayıcıları arasında en tutulanı ve en iyisi.
 Size = 22,8 MB
 URLSite = http://www.mozilla.org/tr/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/tr/Firefox%20Setup%2026.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/tr/Firefox%20Setup%2028.0.exe
 
 [Section.0422]
 Description = Найпопулярніший та один з кращих безплатних веб-браузерів.
 Size = 23,2 MB
 URLSite = http://www.mozilla.org/uk/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/26.0/win32/uk/Firefox%20Setup%2026.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/uk/Firefox%20Setup%2028.0.exe

base/applications/rapps/rapps/globulation2.txt

@@ -1,5 +1,5 @@
 ; UTF-8
-
+; PL translation by wojo664
 [Section]
 Name = Globulation2
 Version = 0.9.4.4
@@ -17,6 +17,9 @@ Description = Globulation 2 ist ein Echtzeitstrategiespiel. Das Spiel vereinfach
 [Section.0410]
 Description = Globulation 2 è un gioco di strategia in tempo reale.
 
+[Section.0415]
+Description = Globulation 2 to gra strategiczna czasu rzeczywistego. Gra minimalizuje zarządzanie automatycznie przydzielając zadania jednostkom.
+
 [Section.0418]
 Description = Globulation 2 este un joc de strategie în timp real. Jocul minimizează microgestiunea prin alocarea automată de sarcini unităților.
 Size = 13,5 Mo

base/applications/rapps/rapps/hover.txt

@@ -1,4 +1,5 @@
 ; UTF-8
+; PL translation by wojo664
 
 [Section]
 Name = Hover!
@@ -16,10 +17,13 @@ Description = Das klassische Hover CTF Spiel, dass auf der Windows 95 CD zu find
 [Section.0410]
 Description = Il classico gioco Hover CTF che trovate sul CD di Windows 95.
 
+[Section.0415]
+Description = Klasyczna gra Hover CTF znaleziona na dysku Windows 95
+
 [Section.0418]
 Description = Jocul clasic Hover CTF, care se găsea pe CD-ul Windows 95.
 Size = 6,2 Mo
 
 [Section.041f]
-Description = Windows 95 CD'sinde bulunan bir bayrak kapmaca oyunu.
+Description = Pencereler 95 CD'sinde bulunan bir bayrak kapmaca oyunu.
 Size = 6,2 MB

base/applications/rapps/rapps/hxd.txt

@@ -1,4 +1,5 @@
 ; UTF-8
+; PL translation by wojo664
 
 [Section]
 Name = HxD
@@ -17,6 +18,9 @@ Size = 854 kB
 URLSite = http://mh-nexus.de/de/
 URLDownload = http://mh-nexus.de/downloads/HxDSetupDE.zip
 
+[Section.0415]
+Description = Dobry edytor Hex. Do wypakowania pliku potrzebny jest program archiwizujący np. 7-Zip.
+
 [Section.0418]
 Licence = Gratuită
 Description = Un bun editor hexazecimal. E necesar un utilitar de dezarhivare de tip ZIP.

base/applications/rapps/rapps/indiftpd.txt

@@ -1,4 +1,5 @@
 ; UTF-8
+; PL translation by wojo664
 
 [Section]
 Name = IndiFTPD
@@ -17,6 +18,9 @@ Description = IndiFTPD ist ein eigenständiger FTP Server in einer einzigen Anwe
 [Section.0410]
 Description = IndiFTPD è un server FTP autonomo che funziona come un unico eseguibile. È stato progettato per le situazioni quando un utente non vuole installare / configurare un server sul sistema (o non ha il permesso di farlo), e vuole ottenere rapidamente un server che esegue.
 
+[Section.0415]
+Description = IndiFTPD to samodzielny serwer FTP składający sie z jednego pliku wykonywalnego. Zaprojektowany z myślą o użytkownikach, którzy nie chcą instalować / konfigurować serwera w systemie (lub nie mają uprawnień) i chcą szybko uruchomić serwer FTP.
+
 [Section.0418]
 Description = IndiFTPD este un server FTP de sine stătător, într-un singur executabil. A fost gândit pentru situațiile în care un utilizator nu dorește instalarea/configurarea unui server în sistem (sau nu deține privelegiile necesare) însă dorește obținerea rapidă a unui server funcțional.
 Size = 556 ko

base/applications/rapps/rapps/kyodai.txt

@@ -1,5 +1,5 @@
 ; UTF-8
-
+; PL translation by wojo664
 [Section]
 Name = Kyodai Mahjongg
 Version = 21.42
@@ -16,6 +16,9 @@ Description = Eines der besten Mahjongg Solitaire Spiele im Netz.
 [Section.0410]
 Description = Uno dei migliori giochi di Mahjongg Solitaire.
 
+[Section.0415]
+Description = Jedna z najlepszych gier Mahjongg Solitaire.
+
 [Section.0418]
 Licence = Versiune de evaluare
 Description = Unul dintre cele mai bune jocuri de pasiență Mahjongg.

base/applications/rapps/rapps/lazaruside.txt

@@ -1,27 +1,31 @@
 ; UTF-8
+; PL translation by wojo664
 
 [Section]
 Name = Lazarus
-Version = 1.0.14
+Version = 1.2
 Licence = modified LGPL, GPL
 Description = A cross-platform integrated development environment (IDE) that lets you create visual (GUI) and non-visual Object Pascal programs, and uses the Free Pascal compiler to generate your executable.
-Size = 111 MB
+Size = 112 MB
 Category = 7
 URLSite = http://www.lazarus.freepascal.org/
-URLDownload = http://download.sourceforge.net/project/lazarus/Lazarus%20Windows%2032%20bits/Lazarus%201.0.14/lazarus-1.0.14-fpc-2.6.2-win32.exe
+URLDownload = http://download.sourceforge.net/project/lazarus/Lazarus%20Windows%2032%20bits/Lazarus%201.2/lazarus-1.2.0-fpc-2.6.2-win32.exe
 CDPath = none
 
 [Section.0407]
 Description = Eine plattformunabhängige, integrierte Entwicklungsumgebung (IDE), mit der man grafische (GUI) und nicht-grafische Pascal-Programme erstellen kann. Es verwendet den Free Pascal Compiler um die Programme zu erzeugen.
 
+[Section.0415]
+Description = Wielopratformowe zintegrowane środowisko programistyczne (IDE) które pozwala na tworzenie graficznych (GUI) i niegraficznych (działających w konsoli) programów obiektowych w języku Pascal. Program używa darmowego kompilatora Free Pascal.
+
 [Section.0410]
 Description = Un ambiente di sviluppo integrato (IDE) cross-platform che consente di creare interfacce grafiche (GUI) e programmi non visivi Object Pascal, e utilizza il compilatore Free Pascal per generare l'eseguibile.
 
 [Section.0418]
 Licence = GPL, LGPL modificată
 Description = Un mediu integrat de dezvoltare (IDE) multi-platformă care vă permite crearea de programe Object Pascal, atât vizuale (GUI) cât și ne-vizuale, și utilizează compilatorul Free Pascal pentru a genera executabile.
-Size = 111 Mo
+Size = 112 Mo
 
 [Section.041f]
 Licence = Değiştirilmiş LGPL, GPL
-Description = Basarî ve basarî olmayan Nesne Paskal izlenceleri oluşturmayı sağlayan, Özgür Paskal derleyicisini kullanarak çalıştırabilir kütük oluşturan bir çapraz platform tümleşik geliştirme ortamı.
+Description = Basarî ve basarî olmayan Nesne Paskal çizeylemleri oluşturmayı sağlayan, Özgür Paskal derleyicisini kullanarak çalıştırabilir kütük oluşturan bir çapraz platform tümleşik geliştirme ortamı.

base/applications/rapps/rapps/libreoffice.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = LibreOffice
-Version = 4.1.4
+Version = 4.2.3
 Licence = LGPL
 Description = Former called OpenOffice. Open Source Office Suite.
-Size = 205.9 MB
+Size = 211.0 MB
 Category = 6
 URLSite = http://www.documentfoundation.org/
-URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.1.4/win/x86/LibreOffice_4.1.4_Win_x86.msi
+URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.2.3/win/x86/LibreOffice_4.2.3_Win_x86.msi
 CDPath = none
 
 [Section.0407]
@@ -19,7 +19,7 @@ Description = La suite de ofimática de código abierto.
 
 [Section.040c]
 Description = Précédemment appelé OpenOffice. Suite bureautique open source.
-Size = 205,9 Mo
+Size = 211,0 Mo
 
 [Section.0410]
 Description = Precedentemente chiamato OpenOffice. Open Source Office Suite.
@@ -32,11 +32,11 @@ Description = Otwarty pakiet biurowy.
 
 [Section.0418]
 Description = Fostul OpenOffice. Suita de aplicații de birotică open-source.
-Size = 205,9 Mo
+Size = 211,0 Mo
 
 [Section.041f]
 Description = OpenOffice gibi bir açık kaynak büro takımı.
-Size = 205,9 MB
+Size = 211,0 MB
 
 [Section.0422]
 Description = Відкритий офісний пакет.

base/applications/rapps/rapps/mirandaim.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = Miranda IM
-Version = 0.10.21
+Version = 0.10.22
 Licence = GPL
 Description = Open source multiprotocol instant messaging application - May not work completely.
-Size = 2.82 MB
+Size = 2.8 MB
 Category = 5
 URLSite = http://www.miranda-im.org/
-URLDownload = http://files.miranda-im.org/stable/0.10.21.0/miranda-im-v0.10.21-unicode.exe
+URLDownload = http://files.miranda-im.org/stable/0.10.22.0/miranda-im-v0.10.22-unicode.exe
 CDPath = none
 
 [Section.0407]
@@ -19,7 +19,7 @@ Description = Aplicación de mensajería instantánea multiprotocolo de código
 
 [Section.040c]
 Description = Application de messagerie instantannée multi-protocoles open source - pourrait ne pas fonctionner complètement.
-Size = 2,82 Mo
+Size = 2,8 Mo
 
 [Section.0410]
 Description = Multi-protocollo open source per applicazioni di messaggistica istantanea - potrebbe non funzionare del tutto.
@@ -32,11 +32,11 @@ Description = Otwarty komunikator internetowy, obsługujący wiele różnych pro
 
 [Section.0418]
 Description = Aplicație de mesagerie instant multiprotocol (open-source) - posibil cu limitări în funcționalitate.
-Size = 2,82 Mo
+Size = 2,8 Mo
 
 [Section.041f]
 Description = Bir açık kaynak, çoklu iletişim kurallı ve evgin iletileşme yazılımı. Eksiksiz olarak çalışmayabilir.
-Size = 2,82 MB
+Size = 2,8 MB
 
 [Section.0422]
 Description = Відкрита мультипротокольна програма миттєвих повідомлень - може не працювати повністю.

base/applications/rapps/rapps/mpc.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = Media Player Classic Home Cinema
-Version = 1.7.1
+Version = 1.7.4
 Licence = GPL
 Description = A media player.
-Size = 9.8 MB
+Size = 10.1 MB
 Category = 2
 URLSite = http://mpc-hc.org/
-URLDownload = http://download.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win32/MPC-HC_v1.7.1_x86/MPC-HC.1.7.1.x86.exe
+URLDownload = http://download.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win32/MPC-HC_v1.7.4_x86/MPC-HC.1.7.4.x86.exe
 CDPath = none
 
 [Section.0407]
@@ -19,7 +19,7 @@ Description = Reproductor multimedia.
 
 [Section.040c]
 Description = Un lecteur media.
-Size = 9,8 Mo
+Size = 10,1 Mo
 
 [Section.0410]
 Description = Lettore multimediale.
@@ -32,7 +32,7 @@ Description = Odtwarzacz multimediów.
 
 [Section.0418]
 Description = Lector multimedia.
-Size = 9,8 Mo
+Size = 10,1 Mo
 
 [Section.0419]
 Description = Мультимедийный проигрыватель.
@@ -42,7 +42,7 @@ Description = Multimediálny prehrávač.
 
 [Section.041f]
 Description = Bir ortam oynatıcısı.
-Size = 9,8 MB
+Size = 10,1 MB
 
 [Section.0422]
 Description = Мультимедійний програвач.

base/applications/rapps/rapps/mpxplay.txt

@@ -1,5 +1,5 @@
 ; UTF-8
-
+; PL translation by wojo664
 [Section]
 Name = Mpxplay
 Version = 1.60b
@@ -14,6 +14,9 @@ CDPath = none
 [Section.0407]
 Description = Mpxplay ist ein konsolenbasierter 32-bit Audio Player für Windows. Zum extrahieren wird 7-Zip oder ein ähnliches Tool benötigt.
 
+[Section.0415]
+Description = Mpxplay to 32 bitowy odtwarzacz audio (działający w konsoli) dla Windows. Wymaga programu archiwizującego (np. 7-Zip) do wypakowania.
+
 [Section.0418]
 Description = Mpxplay este un lector audio de tip consolă, pe 32-biți pentru Windows. E necesar un utilitar de dezarhivare de tip ZIP.
 Size = 520 ko
@@ -22,5 +25,5 @@ Size = 520 ko
 Description = Mpxplay - 32-разрядный консольный аудиоплеер для Windows. Вам нужен 7-Zip или подобная утилита для его распаковки.
 
 [Section.041f]
-Description = Mpxplay, Windows için 32 bitlik, konsolluk bir ses oynatıcısıdır. Bunu çıkartmak için 7-Zip ya da 7-Zip benzeri bir yazılım kullanmanız gerekir.
+Description = Mpxplay, Pencereler için 32 ikillik, konsolluk bir ses oynatıcısıdır. Bunu çıkartmak için 7-Zip ya da 7-Zip benzeri bir yazılım kullanmanız gerekir.
 Size = 520 KB

base/applications/rapps/rapps/npp.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = Notepad++
-Version = 6.5.3
+Version = 6.5.5
 Licence = GPL
 Description = A text editor.
-Size = 7.25 MB
+Size = 7.3 MB
 Category = 6
 URLSite = http://notepad-plus-plus.org/
-URLDownload = http://download.tuxfamily.org/notepadplus/6.5.3/npp.6.5.3.Installer.exe
+URLDownload = http://download.tuxfamily.org/notepadplus/6.5.5/npp.6.5.5.Installer.exe
 CDPath = none
 
 [Section.0407]
@@ -19,7 +19,7 @@ Description = Un editor de text.
 
 [Section.040c]
 Description = Un éditeur de texte.
-Size = 7,25 Mo
+Size = 7,3 Mo
 
 [Section.0410]
 Description = Un editor di testo.
@@ -32,7 +32,7 @@ Description = Edytor tekstu.
 
 [Section.0418]
 Description = Un editor de text.
-Size = 7,25 Mo
+Size = 7,3 Mo
 
 [Section.0419]
 Description = Текстовый редактор.
@@ -42,7 +42,7 @@ Description = Textový editor.
 
 [Section.041f]
 Description = Bir metin düzenleyicisi.
-Size = 7,25 MB
+Size = 7,3 MB
 
 [Section.0422]
 Description = Текстовый редактор.

base/applications/rapps/rapps/opencodecs.txt

@@ -1,4 +1,5 @@
 ; UTF-8
+; PL trans by wojo664
 
 [Section]
 Name = xiph.org OpenCodecs
@@ -17,6 +18,9 @@ Description = DirectShow Filter für Ogg Vorbis, Speex, Theora, FLAC, und WebM D
 [Section.0410]
 Description = I filtri DirectShow per la Ogg Vorbis, Speex, Theora, FLAC e formati di file WebM.
 
+[Section.0415]
+Description = Filtry DirectShow dla Ogg Vorbis, Speex, Theora, FLAC, i plików w formacie WebM.
+
 [Section.0418]
 Description = Filtrele DirectShow pentru formatele de fișiere Ogg Vorbis, Speex, Theora, FLAC și WebM.
 Size = 2,53 Mo

base/applications/rapps/rapps/openttd.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = OpenTTD
-Version = 1.3.3
+Version = 1.4.0
 Licence = GPL v2
 Description = Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon.
-Size = 6.75 MB
+Size = 7.0 MB
 Category = 4
 URLSite = http://www.openttd.org/
-URLDownload = http://binaries.openttd.org/releases/1.3.3/openttd-1.3.3-windows-win32.exe
+URLDownload = http://binaries.openttd.org/releases/1.4.0/openttd-1.4.0-windows-win32.exe
 CDPath = none
 
 [Section.0407]
@@ -19,7 +19,7 @@ Description = Clon del motor de juegos "Transport Tycoon Deluxe" de código abie
 
 [Section.040c]
 Description = Clone open source du moteur de jeu "Transport Tycoon Deluxe". Vous aurez besoin d'une copie de Transport Tycoon.
-Size = 6,75 Mo
+Size = 7,0 Mo
 
 [Section.0410]
 Description = Clone open source del  motore di gioco di "Transport Tycoon Deluxe". Hai bisogno di una copia di Transport Tycoon.
@@ -32,11 +32,11 @@ Description = Otwarty klon silnika gry "Transport Tycoon Deluxe". Do poprawnego
 
 [Section.0418]
 Description = Clona (open-source a) motorului de joc "Transport Tycoon Deluxe". Este necesară o copie a jocului Transport Tycoon.
-Size = 6,75 Mo
+Size = 7,0 Mo
 
 [Section.041f]
 Description = Transport Tycoon Deluxe oyun motorunun bir açık kaynak taklidi. Transport Tycoon'un bir kopyası gerekir.
-Size = 6,75 MB
+Size = 7,0 MB
 
 [Section.0422]
 Description = Відкритий клон двигуна гри "Transport Tycoon Deluxe". Вам потрібна копія гри Transport Tycoon.

base/applications/rapps/rapps/peazip.txt

@@ -0,0 +1,19 @@
+; UTF-8
+
+[Section]
+Name = PeaZip
+Version = 5.3.0
+Licence = LGPL v3, OpenCandy EULA
+Description = PeaZip is a free, cross-platform, open source file and archive manager. It supports over 150 archive formats.
+Size = 5.8 MB
+Category = 12
+URLSite = http://peazip.sourceforge.net/
+URLDownload = http://sourceforge.net/projects/peazip/files/5.3.0/peazip-5.3.0.WINDOWS.exe
+CDPath = none
+
+[Section.0407]
+Description = PeaZip ist ein freier, plattformübergreifender, quelloffener Datei- und Archivmanager. Er unterstützt über 150 Archiv-Formate.
+
+[Section.041f]
+Description = PeaZip; ücretsiz, çapraz platform, açık kaynak bir kütük ve belgelik yöneticisidir. 150'den çok belgelikleme biçimini destekler.
+Size = 5,8 MB

base/applications/rapps/rapps/pengupop.txt

@@ -1,5 +1,5 @@
 ; UTF-8
-
+; PL translation by wojo664
 [Section]
 Name = Pengupop
 Version = 2.2.3
@@ -16,6 +16,9 @@ Description = Das Ziel des Spiels ist es farbige Orbs ins Spielfeld zu feuern, s
 [Section.0410]
 Description = Lo scopo di questo gioco è quello di sparare sfere colorate nel vostro campo di gioco, in modo da formare gruppi di tre o più.
 
+[Section.0415]
+Description = Celem tej gry jest strzelanie kolorowymi kulkami tak, aby utworzyć rzędy trzech lub więcej kulek w tym samym kolorze.
+
 [Section.0418]
 Description = Scopul acestui joc este de a arunca globuri colorate în propriul teren pentru a forma grupuri de câte trei sau mai multe.
 Size = 384 ko

base/applications/rapps/rapps/photofiltre.txt

@@ -1,4 +1,5 @@
 ; UTF-8
+; PL translation by wojo664
 
 [Section]
 Name = PhotoFiltre 7
@@ -14,6 +15,9 @@ CDPath = none
 [Section.0407]
 Description = Version mit Layers, aber eingeschänkter als die Studio-X Version. PhotoFiltre Studio ist ein komplettes Bildretuschier-Programm.
 
+[Section.0415]
+Description = Ta wersja obsługuje warstwy, ale ma większe ograniczenia od Studio X. PhotoFiltre Studio to program do retuszu zdjęć.
+
 [Section.0418]
 Licence = Gratuită
 Description = PhotoFiltre Studio este o aplicație completă de retușare a imaginilor.
@@ -21,5 +25,5 @@ Size = 4,99 Mo
 
 [Section.041f]
 Licence = Ücretsiz
-Description = Bu sürüm, katmanlarla gelmektedir ancak Studio X sürümünden daha kısıtlıdır. PhotoFiltre Studio, eksiksiz bir resim düzeltme yazılımıdır.
+Description = Bu sürüm, katmanlarla gelmektedir ancak Stüdyo X sürümünden daha kısıtlıdır. PhotoFiltre Stüdyo, eksiksiz bir resim düzeltme yazılımıdır.
 Size = 4,99 MB

base/applications/rapps/rapps/pingus.txt

@@ -1,4 +1,5 @@
 ; UTF-8
+; PL translation by wojo664
 
 [Section]
 Name = Pingus
@@ -17,10 +18,13 @@ Description = Pingus ist ein freies Lemings-ähnliches Puzzle Spiel.
 [Section.0410]
 Description = Pingus è un gioco gratuito simile a Lemmings.
 
+[Section.0415]
+Description = Pingus to darmowa gra logiczna podobna do gry Lemmings
+
 [Section.0418]
 Description = Pingus este un joc-enigmă asemănător cu Lemmings.
 Size = 16,0 Mo
 
 [Section.041f]
-Description = Pingus, ücretsiz, Lemmings gibi bir bulmaca oyunudur.
+Description = Pingus, ücretsiz, Yaban Sıçanları gibi bir bulmaca oyunudur.
 Size = 16,0 MB

base/applications/rapps/rapps/pspad.txt

@@ -1,4 +1,5 @@
 ; UTF-8
+; PL translation by wojo664
 
 [Section]
 Name = PSPad
@@ -24,6 +25,9 @@ Size = 4,46 Mo
 [Section.0410]
 Description = Un editor di testo.
 
+Section.0415]
+Description = Edytor tekstu.
+
 [Section.0413]
 Description = Een teksteditor.
 

base/applications/rapps/rapps/ptanks.txt

@@ -1,4 +1,5 @@
 ; UTF-8
+; PL translation by wojo664
 
 [Section]
 Name = Pocket Tanks
@@ -14,12 +15,16 @@ CDPath = none
 [Section.0407]
 Description = Das schnellste Artillerie-Spiel, das Sie jemals gespielt haben.
 
+[Section.0415]
+Description = Szybka gra artyleryjska 
+
 [Section.0418]
 Licence = Versiune de evaluare
 Description = Cel mai rapid joc de artilerie pe care-l veți juca vreodată.
 Size = 2,86 Mo
 
 [Section.041f]
+Name = Küçük Tanklar
 Licence = Kısıtlı
-Description = Bu güne dek oynadığınız en hızlı topçu oyunu.
+Description = Bu güne kadar oynadığınız en hızlı topçu oyunu.
 Size = 2,86 MB

base/applications/rapps/rapps/python.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = Python 3
-Version = 3.3.3
+Version = 3.4.0
 Licence = GPL/LGPL
 Description = A remarkably powerful dynamic programming language.
-Size = 19.6 MB
+Size = 23.4 MB
 Category = 7
 URLSite = http://www.python.org/
-URLDownload = http://www.python.org/ftp/python/3.3.3/python-3.3.3.msi
+URLDownload = http://www.python.org/ftp/python/3.4.0/python-3.4.0.msi
 CDPath = none
 
 [Section.0407]
@@ -19,7 +19,7 @@ Description = Un lenguaje de programación dinámico sumamente potente.
 
 [Section.040c]
 Description = Un langage de programmation dynamique remarquablement puissant.
-Size = 19,6 Mo
+Size = 23,4 Mo
 
 [Section.0410]
 Description = Un Linguaggio di programmazione dinamico e potente.
@@ -32,11 +32,11 @@ Description = Potęży i dynamiczny język programowania.
 
 [Section.0418]
 Description = Un limbaj de programare dinamic și puternic.
-Size = 19,6 Mo
+Size = 23,4 Mo
 
 [Section.041f]
 Description = İlgi çekici, güçlü ve devingen bir izlenceleme dili.
-Size = 19,6 MB
+Size = 23,4 MB
 
 [Section.0422]
 Description = Дуже потужна динамічна мова програмування.

base/applications/rapps/rapps/qb64sdl.txt

@@ -1,26 +1,29 @@
 ; UTF-8
-
+; PL translation by wojo664
 [Section]
 Name = QB64 (SDL version)
-Version = 0.954
+Version = 0.980
 Licence = Freeware
 Description = QB64 is a self-hosting BASIC compiler for Microsoft Windows, Linux and Mac OS X, designed to be compatible with Microsoft QBasic and Microsoft QuickBASIC. You need 7-Zip or a similar utility to extract it.
-Size = 33.1 MB
+Size = 39.0 MB
 Category = 7
 URLSite = http://www.qb64.net/
-URLDownload = http://www.qb64.net/qb64v0954-win.7z
+URLDownload = http://www.qb64.net/qb64v0980-win.7z
 CDPath = none
 
 [Section.0407]
 Description = QB64 ist ein Self-Hosting BASIC-Compiler für Microsoft Windows, Linux und Mac OS X, entwickelt, um mit Microsoft QBasic und Microsoft QuickBASIC kompatibel zu sein. Sie müssen 7-Zip oder ein ähnliches Dienstprogramm installiert haben, um es zu extrahieren.
 
+[Section.0415]
+Description = QB64 to kompilator BASIC zdolny do kompilacji własnego kodu źródłowego. Działa w systemach Windows, Linux i Mac OS X. Jest kompatybilny z Microsoft QBasic i QuickBASIC. Wymaga programu archiwizującego do wypakowania.
+
 [Section.0418]
 Licence = Gratuită
 Description = QB64 este un compilator BASIC auto-compilabil pentru Windows, Linux și Mac OS X, conceput pentru a fi compatibil cu Microsoft QBasic și Microsoft QuickBASIC. Este necesar un utilitar de derarhivare de tip ZIP.
-Size = 33,1 Mo
+Size = 39,0 Mo
 
 [Section.041f]
 Name = QB64 (SDL Sürümü)
 Licence = Ücretsiz
-Description = QB64; Microsoft Windows, Linux ve Mac OS X için yapılmış, Microsoft QBasic ve Microsoft QuickBASIC ile uyumlu olarak tasarlanan, kendi kendini derleyen bir BASIC derleyicisidir. Bunu çıkartmak için 7-Zip ya da 7-Zip benzeri bir yazılım kullanmanız gerekir.
+Description = QB64; Mikroyazılım Pencereler, Linux ve Mac OS X için yapılmış, Mikroyazılım QBasic ve Mikroyazılım QuickBASIC ile uyumlu olarak tasarlanan, kendi kendini derleyen bir BASIC derleyicisidir. Bunu çıkartmak için 7-Zip ya da 7-Zip benzeri bir yazılım kullanmanız gerekir.
-Size = 33,1 MB
+Size = 39,0 MB

base/applications/rapps/rapps/qmmp.txt

@@ -1,4 +1,5 @@
 ; UTF-8
+; PL translation by wojo664
 
 [Section]
 Name = Qmmp (Qt-based Multimedia Player)
@@ -14,6 +15,9 @@ CDPath = none
 [Section.0407]
 Description = Qmmp ist ein Audio-Player, der mit Hilfe der Qt Bibliothek geschrieben wurde. Die Benutzeroberfläche ist ähnlich zu WinAMP oder XMMS. Alternative Benutzeroberflächen sind ebenfalls verfügbar.
 
+[Section.0415]
+Description = Gmmp to odtwarzacz audio, napisany z pomocą biblioteki Qt. Interfejs podobny jest do Winampa lub XMMS. Dostępnme są także dodatkowe skórki.
+
 [Section.0418]
 Description = Qmmp este un lector audio, ce utilizează biblioteca QT. Interfața de utilizare e asemănătoare cu cea din WinAMP sau XMMS. De asemenea sunt disponibile interfețe de utilizare alternative.
 Size = 16,0 Mo
@@ -22,6 +26,6 @@ Size = 16,0 Mo
 Description = Аудиоплеер Qmmp (Qt-based Multimedia Player).
 
 [Section.041f]
-Name = Qmmp (Qt Tabanlı Çokluortam Oynatıcısı)
+Name = Qt Tabanlı Çokluortam Oynatıcısı
 Description = Qmmp, Qt kitaplığının yardımıyla yazılan bir ses oynatıcısıdır. Kullanıcı arayüzüsü WinAMP'ınkine ve XMMS'ninkine benzer. Ayrıca değişik kullanıcı arayüzleri de vardır.
 Size = 16,0 MB

base/applications/rapps/rapps/reshack.txt

@@ -1,4 +1,5 @@
 ; UTF-8
+; PL translation by wojo664
 
 [Section]
 Name = Resource Hacker
@@ -14,12 +15,16 @@ CDPath = none
 [Section.0407]
 Description = Resource Hacker ist ein Freeware-Tool zum anzeigen, ändern, umbenennen, hinzufügen, löschen und extrahieren von Ressourcen in 32-Bit & 64-Bit-Windows Anwendungen und Ressourcen-Dateien (*. Res).
 
+[Section.0415]
+Description = Resource Hacker to darmowe narzędzie do podglądu, modyfikacji, zmiany nazw, dodawania, kasowania i wypakowywania zasobów w plikach wykonywalnych 32bit i 64bit, oraz w plikach zasobów (*.res).
+
 [Section.0418]
 Licence = Gratuită
 Description = Resource Hacker este un utilitar gratuit pentru inspectarea, modificarea, redenumirea, adăugarea, ștergerea și extragerea resurselor din fișierele resursă (*.res) și fișierele executabile pe 32 și 64 de biți pentru Windows.
 Size = 730 ko
 
 [Section.041f]
+Name = Kaynak Korsancısı
 Licence = Ücretsiz
-Description = Resource Hacker, 32 ya da 64 bitlik Windows çaılştırabilirlerini ve .res uzantılı kaynak kütüklerindeki kaynakları görüntüleyen, değiştiren, yeniden adlandıran, ekleyen, silen ve çıkartan ücretsiz bir araçtır.
+Description = Kaynak Korsancısı, 32 ya da 64 ikillik Pencereler çaılştırabilirlerini ve .res uzantılı kaynak kütüklerindeki kaynakları görüntüleyen, değiştiren, yeniden adlandıran, ekleyen, silen ve çıkartan ücretsiz bir araçtır.
 Size = 730 KB

base/applications/rapps/rapps/rocks.txt

@@ -1,4 +1,5 @@
 ; UTF-8
+; PL translation by wojo664
 
 [Section]
 Name = Rocks'n'Diamonds
@@ -14,10 +15,13 @@ CDPath = none
 [Section.0407]
 Description = Arcade-Style Spiel für UNIX, Mac OS X, Windows und DOS in der Tradition von: "Boulder Dash" (C64), "Emerald Mine" (Amiga), "Supaplex" (Amiga / PC), "Sokoban" (PC). Sie benötigen ein ZIP-Programm, um es zu installieren.
 
+Section.0415]
+Description = Gra typu Arcade dla UNIX, Mac OS X, Windows i DOS. Bazująca na "Boulder Dash" (C64), "Emerald Mine" (Amiga), "Supaplex" (Amiga/PC), "Sokoban" (PC). Aby zainstalować te grę, potrzebny jest program archiwizujący np. 7-Zip.
+
 [Section.0418]
 Description = Un joc de tip arcadă pentru UNIX, Mac OS X, Windows și DOS; respectând tradiția: "Boulder Dash" (C64), "Emerald Mine" (Amiga), "Supaplex" (Amiga/PC), "Sokoban" (PC).
 Size = 2,42 Mo
 
 [Section.041f]
-Description = UNIX, Mac OS X, Windows ve DOS için yapılmış, atari oyun salonu türünde bir oyun. Şu gelenekleri içerir: "Boulder Dash" (C64), "Emerald Mine" (Amiga), "Supaplex" (Amiga ve PC), "Sokoban" (PC). Yazılımı kurmak için ZIP biçiminde çıkartma yeteneği olan bir yazılım gerekir.
+Description = UNIX, Mac OS X, Pencereler ve DOS için yapılmış, atari oyun salonu türünde bir oyun. Şu gelenekleri içerir: "Boulder Dash" (C64), "Zümrüt Mâdeni" (Amiga), "Supaplex" (Amiga ve PC), "Sokoban" (PC). Yazılımı kurmak için ZIP biçiminde çıkartma yeteneği olan bir yazılım gerekir.
 Size = 2,42 MB

base/applications/rapps/rapps/scite.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = SciTE
-Version = 3.3.7
+Version = 3.4.1
 Licence = Freeware
 Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs.
-Size = 722 kB
+Size = 730 kB
 Category = 7
 URLSite = http://www.scintilla.org/
-URLDownload = http://download.sourceforge.net/project/scintilla/SciTE/3.3.7/Sc337.exe
+URLDownload = http://download.sourceforge.net/project/scintilla/SciTE/3.4.1/Sc341.exe
 CDPath = none
 
 [Section.0407]
@@ -19,7 +19,7 @@ Description = Editor de texto basado en SCIntilla. Originalmente creado para dem
 
 [Section.040c]
 Description = SciTE est un éditeur de texte basé sur SCIntilla. Originelement réalisé pour montrer Scintilla, il a évolué pour devenir un éditeur généralement utile avec des options pour compiler et lancer des programmes.
-Size = 722 ko
+Size = 730 ko
 
 [Section.0410]
 Description = SciTE è un editor di testo basato scintilla. Originariamente costruito per dimostrare Scintilla, è cresciuto fino a essere un editor generalmente utile con strutture per la creazione e l'esecuzione di programmi.
@@ -33,12 +33,12 @@ Description = SciTE to edytor tekstu bazowany na SCIntilla. Oryginalnie stworzon
 [Section.0418]
 Licence = Gratuită
 Description = SciTE este un editor de text bazat pe SCIntilla. Construit inițial pentru a demonstra Scintilla, a crescut ulterior într-un editor de uz general cu funcționalități de compilare și execuție a programelor.
-Size = 722 ko
+Size = 730 ko
 
 [Section.041f]
 Licence = Ücretsiz
 Description = SciTE, Scintilla tabanlı bir metin düzenleyicisidir. Başlangıçta, Scintilla'yı göstermek için yapılmıştır ancak umûmiyetle izlenceleri yapmak ve çalıştırmak yetenekleriyle birlikte kullanışlı bir düzenleyici olarak geliştirilmiştir.
-Size = 722 KB
+Size = 730 KB
 
 [Section.0422]
 Description = Текстовий редактор на основі SCIntilla. Був зібраний як презентація Scintilla, але виріс до редактора загального користування з засобами збирання та запуску програм.

base/applications/rapps/rapps/seamonkey.txt

@@ -2,44 +2,44 @@
 
 [Section]
 Name = Mozilla SeaMonkey
-Version = 2.23
+Version = 2.25
 Licence = MPL/GPL/LGPL
 Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.
 Size = 23.90 MB
 Category = 5
 URLSite = http://www.seamonkey-project.org/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.23/win32/en-US/SeaMonkey%20Setup%202.23.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/en-US/SeaMonkey%20Setup%202.25.exe
 CDPath = none
 
 [Section.0407]
 Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benötigen.
 Size = 23.80 MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.23/win32/de/SeaMonkey%20Setup%202.23.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/de/SeaMonkey%20Setup%202.25.exe
 
 [Section.040a]
 Description = La suite de Mozilla está viva. Es el primero y único navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarás.
 Size = 23.79 MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.23/win32/es-ES/SeaMonkey%20Setup%202.23.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/es-ES/SeaMonkey%20Setup%202.25.exe
 
 [Section.040c]
 Description = La suite Mozilla est en vie. Ceci est le seul et l'unique package navigateur, client mail, client chat et composer dont vous aurez besoin.
 Size = 24,06 Mo
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.23/win32/fr/SeaMonkey%20Setup%202.23.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/fr/SeaMonkey%20Setup%202.25.exe
 
 [Section.0410]
 Description = Mozilla Suite è vivo. Questo è l'unico e solo Browser, Mail, Chat, e Composer di cui avrete mai bisogno...
 Size = 23.71 MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.23/win32/it/SeaMonkey%20Setup%202.23.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/it/SeaMonkey%20Setup%202.25.exe
 
 [Section.0413]
 Description = Mozilla Suite bundelt alle applicaties voor het Web: Browser, Mail, Chat, Composer.
 Size = 24.40 MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.23/win32/nl/SeaMonkey%20Setup%202.23.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/nl/SeaMonkey%20Setup%202.25.exe
 
 [Section.0415]
 Description = Pakiet Mozilla żyje. W zestawie: przeglądarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz.
 Size = 24.72 MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.23/win32/pl/SeaMonkey%20Setup%202.23.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/pl/SeaMonkey%20Setup%202.25.exe
 
 [Section.0418]
 Description = Suita Mozilla. Acest pachet ce încorporează navigator, poștă electronică, client IRC și editor HTML, acoperind astfel o arie largă de necesități.
@@ -48,14 +48,14 @@ Size = 23,90 Mo
 [Section.0419]
 Description = Продолжение Mozilla Suite. Включает браузер, почтовый клиент, IRC-клиент и HTML-редактор.
 Size = 24.27 MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.23/win32/ru/SeaMonkey%20Setup%202.23.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/ru/SeaMonkey%20Setup%202.25.exe
 
 [Section.041f]
 Description = Bu; yalnızca Tarayıcı, Mail, Söyleşi ve Yazar'dan oluşan, hiç gereksinim duymayacağınız bir bohçadır.
 Size = 23,83 MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.23/win32/tr/SeaMonkey%20Setup%202.23.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/tr/SeaMonkey%20Setup%202.25.exe
 
 [Section.0422]
 Description = Продовження Mozilla Suite. Включає в себе браузер, поштовий клієнт, IRC-клієнт та HTML-редактор.
 Size = 24.27 MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.23/win32/ru/SeaMonkey%20Setup%202.23.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/ru/SeaMonkey%20Setup%202.25.exe

base/applications/rapps/rapps/smplayer.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = SMPlayer
-Version = 0.8.6
+Version = 14.3.0
 Licence = GPL
 Description = Graphical Frontend for MPlayer.
-Size = 16.98 MB
+Size = 20.7 MB
 Category = 2
 URLSite = http://smplayer.sourceforge.net/en/info
-URLDownload = http://download.sourceforge.net/project/smplayer/SMPlayer/0.8.6/smplayer-0.8.6-win32.exe
+URLDownload = http://download.sourceforge.net/project/smplayer/SMPlayer/14.3.0/smplayer-14.3.0-oc2-win32.exe
 CDPath = none
 
 [Section.0407]
@@ -20,7 +20,7 @@ Description = Interfaz gráfico para Mplayer (reproductor multimedia).
 URLSite = http://smplayer.sourceforge.net/es/info
 
 [Section.040c]
-Size = 16,98 Mo
+Size = 20,7 Mo
 URLSite = http://smplayer.sourceforge.net/fr/info
 
 [Section.0410]
@@ -35,11 +35,11 @@ URLSite = http://smplayer.sourceforge.net/pl/info
 
 [Section.0418]
 Description = Lector multimedia (interfață pentru MPlayer).
-Size = 16,98 Mo
+Size = 20,7 Mo
 
 [Section.041f]
 Description = MPlayer için çizgelik önyüz.
-Size = 16,98 MB
+Size = 20,7 MB
 URLSite = http://smplayer.sourceforge.net/tr/info
 
 [Section.0422]

base/applications/rapps/rapps/snoopy.txt

@@ -0,0 +1,20 @@
+; UTF-8
+
+[Section]
+Name = Snoopy
+Version = 1.0
+Licence = Freeware
+Description = The original C64 Snoopy remake.
+Size = 704 kB
+Category = 4
+URLSite = http://www.blueskied.com/snoopinfo.htm
+URLDownload = http://www.blueskied.com/snoop/Snoop_install.exe
+CDPath = none
+
+[Section.0407]
+Description = Das Original C64 Snoopy Remake.
+
+[Section.041f]
+Licence = Ücretsiz
+Description = Özgün C64 Snoppy'nın yeniden yapılmışı.
+Size = 704 KB

base/applications/rapps/rapps/stamina.txt

@@ -1,8 +1,9 @@
-; UTF-8
+; UTF-8
+; PL translation by wojo664
 
 [Section]
 Name = Stamina 2.5
-Description = Free typing tutor. To run this program, please install the Microsoft Visual C++ 6 Redistributable Package.
+Description = Free typing tutor.
 URLSite = http://stamina.ru
 Size = 4.7 MB
 Category = 8
@@ -10,12 +11,15 @@ URLDownload = http://stamina.ru/files/StaminaSetup.exe
 CDPath = none
 
 [Section.0407]
-Description = Ein freies Schreiblernprogramm. Um dieses Programm nutzen zu können, müssen Sie das Microsoft Visual C++ 6 Redistributable Package installieren.
+Description = Ein freies Schreiblernprogramm.
+
+[Section.0415]
+Description = Darmowy program do nauki pisania na klawiaturze.
 
 [Section.0418]
-Description = Tutor gratuit pentru dactilografiere. Pentru a putea lansa acest program, asigurați-vă că aveți instalat pachetul Microsoft Visual C++ 6 Redistributable.
+Description = Tutor gratuit pentru dactilografiere.
 Size = 4,7 Mo
 
 [Section.041f]
-Description = Ücretsiz bir düğme takımında yazma öğreticisi. Yazılımı çalıştırmk için Microsoft Visual C++ 6 Yeniden Dağıtılabilir Paket'i kurunuz.
+Description = Ücretsiz bir düğme takımında yazma öğreticisi.
 Size = 4,7 MB

base/applications/rapps/rapps/summerbound.txt

@@ -0,0 +1,20 @@
+; UTF-8
+
+[Section]
+Name = Summer Bound
+Version = 1.4
+Licence = Freeware
+Description = A game similar Frozen Fruits.
+Size = 764 kB
+Category = 4
+URLSite = http://www.blueskied.com/summer_bound.htm
+URLDownload = http://www.blueskied.com/summer/SummerBound_setup.exe
+CDPath = none
+
+[Section.0407]
+Description = Ein Spiel, ähnlich zu Frozen Fruits.
+
+[Section.041f]
+Licence = Ücretsiz
+Description = Frozen Fruits'e benzeyen bir oyun.
+Size = 764 KB

base/applications/rapps/rapps/superdxb.txt

@@ -1,5 +1,5 @@
 ; UTF-8
-
+; PL translation by wojo664
 [Section]
 Name = Super DX-Ball
 Version = 1.1
@@ -14,12 +14,16 @@ CDPath = none
 [Section.0407]
 Description = Super DX-Ball ist ein lebendiges und buntes Brick-Breaking-Spiel.
 
+[Section.0415]
+Description = Super DX-Ball - pełna koloru i animacji gra polegająca na zbijaniu klocków.
+
 [Section.0418]
 Licence = Versiune de evaluare
 Description = Un joc ce implică spargerea de cărămizi.
 Size = 3,8 Mo
 
 [Section.041f]
+Name = Süper DX-Ball
 Licence = Kısıtlı
-Description = Super DX-Ball, canlı ve renkli bir tuğla kırma oyunudur.
+Description = Süper DX-Ball, canlı ve renkli bir tuğla kırma oyunudur.
 Size = 3,8 MB

base/applications/rapps/rapps/supertux.txt

@@ -1,5 +1,5 @@
 ; UTF-8
-
+; PL translation by wojo664
 [Section]
 Name = SuperTux
 Version = 0.1.3
@@ -17,6 +17,9 @@ Description = SuperTux ist ein zweidimensionales, freies, Open Source Plattforms
 [Section.0410]
 Description = SuperTux è un gioco open-source a 2D.
 
+[Section.0415]
+Description = SuperTux to darmowa dwu wymiarowa gra platformowa  OpenSource.
+
 [Section.0418]
 Description = SuperTux este un joc gratuit, cu surse publice, pe platformă bi-dimensională.
 Size = 7,3 Mo

base/applications/rapps/rapps/thunderbird.txt

@@ -2,71 +2,71 @@
 
 [Section]
 Name = Mozilla Thunderbird 24
-Version = 24.2.0
+Version = 24.4.0
 Licence = MPL/GPL/LGPL
 Description = The most popular and one of the best free Mail Clients out there.
 Size = 21.12 MB
 Category = 5
 URLSite = https://www.mozilla.org/en-US/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/en-US/Thunderbird%20Setup%2024.2.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/en-US/Thunderbird%20Setup%2024.4.0.exe
 CDPath = none
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Mail-Clients.
 Size = 20.96 MB
 URLSite = https://www.mozilla.org/de/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/de/Thunderbird%20Setup%2024.2.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/de/Thunderbird%20Setup%2024.4.0.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores clientes mail que hay.
 Size = 20.92 MB
 URLSite = https://www.mozilla.org/es-ES/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/es-ES/Thunderbird%20Setup%2024.2.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/es-ES/Thunderbird%20Setup%2024.4.0.exe
 
 [Section.040c]
 Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible.
 Size = 21,27 Mo
 URLSite = https://www.mozilla.org/fr/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/fr/Thunderbird%20Setup%2024.2.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/fr/Thunderbird%20Setup%2024.4.0.exe
 
 [Section.0410]
 Description = Il più popolare e il migliore Clients mail gratuito.
 Size = 20.91 MB
 URLSite = https://www.mozilla.org/it/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/it/Thunderbird%20Setup%2024.2.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/it/Thunderbird%20Setup%2024.4.0.exe
 
 [Section.0413]
 Description = De meest populaire en een van de beste gratis e-mail-programma's.
 Size = 21.61 MB
 URLSite = https://www.mozilla.org/nl/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/nl/Thunderbird%20Setup%2024.2.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/nl/Thunderbird%20Setup%2024.4.0.exe
 
 [Section.0415]
 Description = Najpopularniejszy i jeden z najlepszych darmowych klientów poczty.
 Size = 21.80 MB
 URLSite = https://www.mozilla.org/pl/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/pl/Thunderbird%20Setup%2024.2.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/pl/Thunderbird%20Setup%2024.4.0.exe
 
 [Section.0418]
 Description = Cel mai popular și unul dintre cele mai bune clientele gratuite de poștă electronică.
 Size = 21,48 Mo
 URLSite = https://www.mozilla.org/ro/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/ro/Thunderbird%20Setup%2024.2.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/ro/Thunderbird%20Setup%2024.4.0.exe
 
 [Section.0419]
 Description = Один из самых популярных и лучших бесплатных почтовых клиентов.
 Size = 21.38 MB
 URLSite = https://www.mozilla.org/ru/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/ru/Thunderbird%20Setup%2024.2.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/ru/Thunderbird%20Setup%2024.4.0.exe
 
 [Section.041f]
 Description = Özgür mail istemcileri arasında en tutulanı ve en iyisi.
 Size = 20,99 MB
 URLSite = https://www.mozilla.org/tr/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/tr/Thunderbird%20Setup%2024.2.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/tr/Thunderbird%20Setup%2024.4.0.exe
 
 [Section.0422]
 Description = Найпопулярніший та один з кращих поштових клієнтів.
 Size = 21.41 MB
 URLSite = https://www.mozilla.org/uk/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.2.0/win32/uk/Thunderbird%20Setup%2024.2.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/uk/Thunderbird%20Setup%2024.4.0.exe

base/applications/rapps/rapps/totalcommander.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = Total Commander
-Version = 8.01
+Version = 8.50
 Licence = Shareware
 Description = Total Commander is a file manager with two panels side by side.
-Size = 3.3 MB
+Size = 3.5 MB
 Category = 12
 URLSite = http://www.ghisler.com/
-URLDownload = http://www.slo.ru/download/total_commander/tcm801x32.exe
+URLDownload = http://www.slo.ru/download/total_commander/tcm850x32.exe
 CDPath = none
 
 [Section.0407]
@@ -26,12 +26,12 @@ Description = Total Commander to popularny menedżer plików z dwoma panelami, u
 [Section.0418]
 Licence = Versiune de evaluare
 Description = Total Commander este un gestionar de fișiere după modelul «două paneluri alăturate».
-Size = 3,3 Mo
+Size = 3,5 Mo
 
 [Section.041f]
 Licence = Kısıtlı
 Description = Total Commander, yan yana iki bölmenin bulunduğu bir kütük yöneticisidir.
-Size = 3,3 MB
+Size = 3,5 MB
 
 [Section.0813]
 Description = Total Commander is een bestandsbeheerder met twee panelen zij aan zij.

base/applications/rapps/rapps/utorrent.txt

@@ -2,10 +2,10 @@
 
 [Section]
 Name = µTorrent
-Version = 3.3.2
+Version = 3.4.1
 Licence = Freeware for non-commercial uses
 Description = Small and fast BitTorrent Client.
-Size = 1020.58 kB
+Size = 1.6 MB
 Category = 5
 URLSite = http://www.utorrent.com/
 URLDownload = http://download-new.utorrent.com/endpoint/utorrent/os/windows/track/stable/utorrent.exe
@@ -22,7 +22,7 @@ Description = Pequeño y rápido cliente BitTorrent.
 [Section.040c]
 Licence = Gratuit pour une utilisation non-commerciale
 Description = Client BitTorrent petit et rapide.
-Size = 1020,58 ko
+Size = 1,6 Mo
 
 [Section.040c]
 Licence = Gratita per un uso non-commerciale
@@ -43,7 +43,7 @@ Description = Mały i szybki klient BitTorrent.
 [Section.0418]
 Licence = Gratuită pentru uz necomercial
 Description = Client BitTorrent, mic și rapid.
-Size = 1020,58 ko
+Size = 1,6 Mo
 
 [Section.0419]
 Licence = Бесплатная для некоммерческого использования
@@ -52,7 +52,7 @@ Description = Маленький и быстрый клиент BitTorrent.
 [Section.041f]
 Licence = Ticârî olmayan kullanımlarda ücretsiz.
 Description = Küçük ve hızlı bir BitTorrent istemcisi.
-Size = 1020,58 KB
+Size = 1,6 MB
 
 [Section.0422]
 Licence = Безплатна для некомерційного використання

base/applications/rapps/rapps/vlc.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = VLC media player
-Version = 2.1.2
+Version = 2.1.3
 Licence = GPL
 Description = A media player.
-Size = 23.0 MB
+Size = 23.5 MB
 Category = 2
 URLSite = http://www.videolan.org/vlc/
-URLDownload = http://mirror.de.leaseweb.net/videolan/vlc/2.1.2/win32/vlc-2.1.2-win32.exe
+URLDownload = http://mirror.de.leaseweb.net/videolan/vlc/2.1.3/win32/vlc-2.1.3-win32.exe
 CDPath = none
 
 [Section.0407]
@@ -19,7 +19,7 @@ Description = Reproductor multimedia.
 
 [Section.040c]
 Description = Un lecteur media.
-Size = 23,0 Mo
+Size = 23,5 Mo
 
 [Section.0410]
 Description = Lettore multimediale.
@@ -32,7 +32,7 @@ Description = Odtwarzacz multimediów.
 
 [Section.0418]
 Description = Lector multimedia.
-Size = 23,0 Mo
+Size = 23,5 Mo
 
 [Section.0419]
 Description = Мультимедийный проигрыватель.
@@ -43,7 +43,7 @@ Description = Multimediálny prehrávač.
 [Section.041f]
 Name = VLC Ortam Oynatıcısı
 Description = Bir ortam oynatıcısı.
-Size = 23,0 MB
+Size = 23,5 MB
 
 [Section.0422]
 Description = Мультимедійний програвач.

base/applications/rapps/rapps/zaz.txt

@@ -1,4 +1,5 @@
 ; UTF-8
+;PL translation by wojo664
 
 [Section]
 Name = Zaz
@@ -17,6 +18,9 @@ Description = Zaz ist ein freies Arcade Action Puzzle Spiel, ein wenig wie Froze
 [Section.0410]
 Description = Zaz è un puzzle game gratuito, simile a Frozen Bubble.
 
+[Section.0415]
+Description = Zaz to darmowa gra logiczno-zręcznościowa, trochę podobna do gry Frozen Bubble
+
 [Section.0418]
 Description = Zaz este un joc de acțiune de tip enigmă/arcadă, asemănător cu Frozen Bubble.
 Size = 21,0 Mo

base/applications/regedit/regproc.h

@@ -14,7 +14,7 @@
  *
  * 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 Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #pragma once
@@ -25,7 +25,7 @@
 #define REG_FORMAT_4 2
 
 BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format);
-BOOL import_registry_file(FILE* reg_file);
+BOOL import_registry_file(FILE *in);
-void delete_registry_key(LPTSTR reg_key_name);
+void delete_registry_key(WCHAR *reg_key_name);
 WCHAR* GetWideString(const char* strA);
 CHAR* GetMultiByteString(const WCHAR* strW);

base/applications/taskmgr/lang/ru-RU.rc

@@ -111,7 +111,7 @@ IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
     POPUP "DUMMY"
     BEGIN
-        MENUITEM "&Заверщить процесс", ID_PROCESS_PAGE_ENDPROCESS
+        MENUITEM "&Завершить процесс", ID_PROCESS_PAGE_ENDPROCESS
         MENUITEM "З&авершить дерево процессов", ID_PROCESS_PAGE_ENDPROCESSTREE
         MENUITEM "&Отладка", ID_PROCESS_PAGE_DEBUG
         MENUITEM SEPARATOR

base/setup/usetup/interface/usetup.c

@@ -1524,6 +1524,8 @@ SelectPartitionPage(PINPUT_RECORD Ir)
                                    MaxSize,
                                    TRUE);
 
+                DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter[0];
+
                 return SELECT_FILE_SYSTEM_PAGE;
             }
         }
@@ -1535,6 +1537,8 @@ SelectPartitionPage(PINPUT_RECORD Ir)
                 return SELECT_PARTITION_PAGE; /* let the user select another partition */
             }
 
+            DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter[0];
+
             return SELECT_FILE_SYSTEM_PAGE;
         }
     }
@@ -2392,8 +2396,10 @@ FormatPartitionPage(PINPUT_RECORD Ir)
                     }
                 }
             }
+#if 0
             else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") == 0)
                 PartEntry->PartInfo[PartNum].PartitionType = PARTITION_EXT2;
+#endif
             else if (!FileSystemList->Selected->FormatFunc)
                 return QUIT_PAGE;
 

base/setup/usetup/native/fslist.c

@@ -5,7 +5,9 @@ NATIVE_CreateFileSystemList(
 	IN PFILE_SYSTEM_LIST List)
 {
 	FS_AddProvider(List, L"FAT", VfatFormat, VfatChkdsk);
+#if 0
 	FS_AddProvider(List, L"EXT2", Ext2Format, Ext2Chkdsk);
+#endif
 	return TRUE;
 }
 

boot/bootdata/txtsetup.sif

@@ -132,32 +132,32 @@ DefaultLanguage  = 00000409
 
 [Computer]
 pci_up = "Standard PC Uniprocessor"
-pci_mp = "Standard PC Multiprocessor"
+;pci_mp = "Standard PC Multiprocessor"
 acpi_up = "ACPI PC Uniprocessor"
-acpi_mp = "ACPI PC Multiprocessor"
+;acpi_mp = "ACPI PC Multiprocessor"
 
 [Map.Computer]
 ;<id> = <pnp id string>
 pci_up = "PC UP"
-pci_mp = "PC MP"
+;pci_mp = "PC MP"
 acpi_up = "ACPI UP"
-acpi_mp = "ACPI MP"
+;acpi_mp = "ACPI MP"
 
 [Files.pci_up]
 ntoskrnl.exe=,,,,,,,,,,,,2
 hal.dll=,,,,,,,,,,,,2
 
-[Files.pci_mp]
+;[Files.pci_mp]
-ntkrnlmp.exe=,,,,,,,,,,ntoskrnl.exe,,2
+;ntkrnlmp.exe=,,,,,,,,,,ntoskrnl.exe,,2
-halmps.dll=,,,,,,,,,,hal.dll,,2
+;halmps.dll=,,,,,,,,,,hal.dll,,2
 
 [Files.acpi_up]
 ntoskrnl.exe=,,,,,,,,,,,,2
 halacpi.dll=,,,,,,,,,,hal.dll,,2
 
-[Files.acpi_mp]
+;[Files.acpi_mp]
-ntkrnlmp.exe=,,,,,,,,,,ntoskrnl.exe,,2
+;ntkrnlmp.exe=,,,,,,,,,,ntoskrnl.exe,,2
-halacpi.dll=,,,,,,,,,,hal.dll,,2
+;halacpi.dll=,,,,,,,,,,hal.dll,,2
 
 [Display]
 ;<id> = <user friendly name>,<spare>,<service key name>,<hight>,<width>,<bpp>

cmake/gcc.cmake

@@ -324,6 +324,7 @@ set(PSEH_LIB "pseh")
 
 # Macros
 if(PCH)
+    add_compile_flags("-Winvalid-pch -Werror=invalid-pch")
     macro(add_pch _target _pch _sources)
         # When including x.h GCC looks for x.h.gch first
         set(_pch_final_name "${_target}_pch.h")
@@ -351,7 +352,7 @@ if(PCH)
         # Include the gch in the specified source files, skipping the pch file itself
         list(REMOVE_ITEM ${_sources} ${_pch})
         foreach(_src ${${_sources}})
-            set_property(SOURCE ${_src} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_ccache_flag} -Winvalid-pch -Werror=invalid-pch -include ${_pch_final_name}")
+            set_property(SOURCE ${_src} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_ccache_flag} -include ${_pch_final_name}")
             set_property(SOURCE ${_src} APPEND PROPERTY OBJECT_DEPENDS ${_gch})
         endforeach()
     endmacro()

cmake/msvc.cmake

@@ -56,8 +56,7 @@ add_compile_flags("/wd4290")
 # - C4163: 'identifier': not available as an intrinsic function
 # - C4229: modifiers on data are ignored
 # - C4700: uninitialized variable usage
-# - C4603: macro is not defined or definition is different after precompiled header use
+add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4229 /we4700")
-add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4229 /we4700 /we4603")
 
 # Enable warnings above the default level, but don't treat them as errors:
 # - C4115: named type definition in parentheses

configure.cmd

@@ -15,7 +15,7 @@ if /I "%1" == "arm_hosttools" (
     call %2 x86
 
     :: Configure host tools for x86
-    cmake -G %3 -DARCH=i386 %~dp0
+    cmake -G %3 -DARCH:STRING=i386 %~dp0
     exit
 )
 
@@ -148,7 +148,7 @@ if "%ARCH%" == "arm" (
     :: Launch new script instance for x86 host tools configuration
     start "Preparing host tools for ARM cross build..." /I /B /WAIT %~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat" %CMAKE_GENERATOR%
 ) else (
-    cmake -G %CMAKE_GENERATOR% -DARCH=%ARCH% "%REACTOS_SOURCE_DIR%"
+    cmake -G %CMAKE_GENERATOR% -DARCH:STRING=%ARCH% "%REACTOS_SOURCE_DIR%"
 )
 
 cd..
@@ -160,11 +160,11 @@ if EXIST CMakeCache.txt (
 )
 
 if "%BUILD_ENVIRONMENT%" == "MinGW" (
-    cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"
+    cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:PATH="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"
 ) else if "%BUILD_ENVIRONMENT%" == "Clang" (
-    cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-clang.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"
+    cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-clang.cmake -DARCH:STRING=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:PATH="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"
 ) else (
-    cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"
+    cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:PATH="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"
 )
 
 cd..

configure.sh

@@ -53,12 +53,12 @@ cd host-tools
 rm -f CMakeCache.txt
 
 REACTOS_BUILD_TOOLS_DIR="$PWD"
-cmake -G "$CMAKE_GENERATOR" -DARCH=$ARCH $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
+cmake -G "$CMAKE_GENERATOR" -DARCH:STRING=$ARCH $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
 
 echo Preparing reactos...
 cd ../reactos
 rm -f CMakeCache.txt
 
-cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
+cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=1 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH -DREACTOS_BUILD_TOOLS_DIR:PATH="$REACTOS_BUILD_TOOLS_DIR" $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"
 
 echo Configure script complete! Enter directories and execute appropriate build commands \(ex: ninja, make, makex, etc...\).

dll/3rdparty/libxslt/CMakeLists.txt

@@ -1,6 +1,6 @@
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libxslt
-                    ${REACTOS_SOURCE_DIR}/include/reactos/libs/libxslt)
+                    ${REACTOS_SOURCE_DIR}/lib/3rdparty/libwin-iconv)
 
 add_definitions(
     -DHAVE_CONFIG_H
@@ -37,7 +37,7 @@ list(APPEND SOURCE
 
 add_library(libxslt SHARED ${SOURCE})
 set_module_type(libxslt win32dll)
-target_link_libraries(libxslt libxml2 iconv-static)
+target_link_libraries(libxslt libxml2 iconv-static zlib)
 add_importlibs(libxslt msvcrt ws2_32 kernel32)
 if(MSVC)
     add_importlibs(libxslt ntdll)

dll/cpl/sysdm/general.c

@@ -22,12 +22,14 @@ typedef struct _IMGINFO
     HBITMAP hBitmap;
     INT cxSource;
     INT cySource;
+    INT iPLanes;
+    INT iBits;
 } IMGINFO, *PIMGINFO;
 
 PIMGINFO pImgInfo = NULL;
+BLENDFUNCTION BlendFunc = {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA};
 
-void
+VOID ShowLastWin32Error(HWND hWndOwner)
-ShowLastWin32Error(HWND hWndOwner)
 {
     LPTSTR lpMsg;
     DWORD LastError;
@@ -53,39 +55,86 @@ ShowLastWin32Error(HWND hWndOwner)
 }
 
 
-static VOID
+static VOID InitLogo(HWND hwndDlg)
-InitImageInfo(PIMGINFO ImgInfo)
 {
-    BITMAP bitmap;
+    BITMAP logoBitmap;
+    BITMAP maskBitmap;
+    BITMAPINFO bmpi;
+    HDC hDC = GetDC(hwndDlg);
+    HDC hDCLogo = CreateCompatibleDC(NULL);
+    HDC hDCMask = CreateCompatibleDC(NULL);
+    HBITMAP hMask, hLogo, hAlphaLogo = NULL;
+    COLORREF *pBits;
+    INT line, column;
 
-    ZeroMemory(ImgInfo, sizeof(*ImgInfo));
+    ZeroMemory(pImgInfo, sizeof(*pImgInfo));
+    ZeroMemory(&bmpi, sizeof(bmpi));
 
-    ImgInfo->hBitmap = LoadImage(hApplet,
+    hLogo = (HBITMAP)LoadImage(hApplet, MAKEINTRESOURCE(IDB_ROSBMP), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
-                                 MAKEINTRESOURCE(IDB_ROSBMP),
+    hMask = (HBITMAP)LoadImage(hApplet, MAKEINTRESOURCE(IDB_ROSMASK), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
-                                 IMAGE_BITMAP,
-                                 0,
-                                 0,
-                                 LR_DEFAULTCOLOR);
 
-    if (ImgInfo->hBitmap != NULL)
+    if (hLogo != NULL && hMask != NULL)
     {
-        GetObject(ImgInfo->hBitmap, sizeof(BITMAP), &bitmap);
+        GetObject(hLogo, sizeof(BITMAP), &logoBitmap);
+        GetObject(hMask, sizeof(BITMAP), &maskBitmap);
 
-        ImgInfo->cxSource = bitmap.bmWidth;
+        if(logoBitmap.bmHeight != maskBitmap.bmHeight || logoBitmap.bmWidth != maskBitmap.bmWidth)
-        ImgInfo->cySource = bitmap.bmHeight;
+            return;
+
+        pImgInfo->cxSource = logoBitmap.bmWidth;
+        pImgInfo->cySource = logoBitmap.bmHeight;
+
+        bmpi.bmiHeader.biSize = sizeof(BITMAPINFO);
+        bmpi.bmiHeader.biWidth = logoBitmap.bmWidth;
+        bmpi.bmiHeader.biHeight = logoBitmap.bmHeight;
+        bmpi.bmiHeader.biPlanes = 1;
+        bmpi.bmiHeader.biBitCount = 32;
+        bmpi.bmiHeader.biCompression = BI_RGB;
+        bmpi.bmiHeader.biSizeImage = 4 * logoBitmap.bmWidth * logoBitmap.bmHeight;
+
+        hAlphaLogo = CreateDIBSection(hDC, &bmpi, DIB_RGB_COLORS, (PVOID*)&pBits, 0, 0);
+
+        if(!hAlphaLogo)
+            return;
+
+        SelectObject(hDCLogo, hLogo);
+        SelectObject(hDCMask, hMask);
+
+        for(line = logoBitmap.bmHeight - 1; line >= 0; line--)
+        {
+            for(column = 0; column < logoBitmap.bmWidth; column++)
+            {
+                COLORREF alpha = GetPixel(hDCMask, column, line) & 0xFF;
+                COLORREF Color = GetPixel(hDCLogo, column, line);
+                DWORD r, g, b;
+
+                r = GetRValue(Color) * alpha / 255;
+                g = GetGValue(Color) * alpha / 255;
+                b = GetBValue(Color) * alpha / 255;
+
+                *pBits++ =  b | g << 8 | r << 16 | alpha << 24;
+            }
+          }
     }
+
+    pImgInfo->hBitmap = hAlphaLogo;
+    pImgInfo->cxSource = logoBitmap.bmWidth;
+    pImgInfo->cySource = logoBitmap.bmHeight;
+    pImgInfo->iBits = logoBitmap.bmBitsPixel;
+    pImgInfo->iPLanes = logoBitmap.bmPlanes;
+
+    DeleteObject(hLogo);
+    DeleteObject(hMask);
+    DeleteDC(hDCLogo);
+    DeleteDC(hDCMask);
+
 }
 
 LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     static UINT timerid = 0, top = 0, offset;
-    static HBITMAP hBitmap2;
+    static HBITMAP hCreditsBitmap;
-    RECT r;
+
-    NONCLIENTMETRICS ncm;
-    HFONT hfont;
-    BITMAP bitmap;
-    HDC dc, sdc;
-    TCHAR devtext[2048];
     switch (uMsg)
     {
         case WM_LBUTTONDBLCLK:
@@ -93,51 +142,65 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
             {
                 if (timerid == 0)
                 {
-                    top = 0; // Set top
+                    HDC hCreditsDC, hLogoDC;
+                    HFONT hFont;
+                    NONCLIENTMETRICS ncm;
+                    RECT rcCredits;
+                    TCHAR szCredits[2048];
+                    INT iDevsHeight;
 
-                    // Build new bitmap
+                    top = 0;
-                    GetObject(pImgInfo->hBitmap, sizeof(BITMAP), &bitmap);
+                    offset = 0;
-                    dc = CreateCompatibleDC(GetDC(NULL));
+                    hCreditsDC = CreateCompatibleDC(GetDC(NULL));
-                    if (dc == NULL)
+                    hLogoDC = CreateCompatibleDC(hCreditsDC);
-                    {
+
+                    if (hCreditsDC == NULL || hLogoDC == NULL)
                         break;
-                    }
+
-                    sdc = CreateCompatibleDC(dc);
+                    SetRect(&rcCredits, 0, 0, 0, 0);
-                    if (sdc == NULL)
+
-                    {
-                        DeleteDC(dc);
-                        break;
-                    }
                     ncm.cbSize = sizeof(NONCLIENTMETRICS);
                     SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0);
 
-                    hfont = CreateFontIndirect(&ncm.lfMessageFont);
+                    hFont = CreateFontIndirect(&ncm.lfMessageFont);
-                    SelectObject(dc, hfont);
+                    SelectObject(hCreditsDC, hFont);
-                    SetRect(&r, 0, 0, 0, 0);
-                    LoadString(hApplet, IDS_DEVS, devtext, sizeof(devtext) / sizeof(TCHAR));
-                    DrawText(dc, devtext, -1, &r, DT_CALCRECT);
-                    hBitmap2 = CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + (r.bottom + 1 - r.top), bitmap.bmPlanes, bitmap.bmBitsPixel, NULL);
-                    SelectObject(sdc, pImgInfo->hBitmap);
-                    SelectObject(dc, hBitmap2);
-                    offset = 0;
-                    BitBlt(dc, 0, offset, bitmap.bmWidth, bitmap.bmHeight, sdc, 0, 0, SRCCOPY);
-                    offset += bitmap.bmHeight;
 
-                    SetRect(&r, 0, offset, bitmap.bmWidth, offset + (r.bottom - r.top) + 1);
+                    LoadString(hApplet, IDS_DEVS, szCredits, sizeof(szCredits) / sizeof(TCHAR));
-                    FillRect(dc, &r, GetSysColorBrush(COLOR_3DFACE));
+                    DrawText(hCreditsDC, szCredits, -1, &rcCredits, DT_CALCRECT);
-                    SetBkMode(dc, TRANSPARENT);
-                    OffsetRect(&r, 1, 1);
-                    SetTextColor(dc, GetSysColor(COLOR_BTNSHADOW));
-                    DrawText(dc, devtext, -1, &r, DT_CENTER);
-                    OffsetRect(&r, -1, -1);
-                    SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT));
-                    DrawText(dc, devtext, -1, &r, DT_CENTER);
-                    offset += r.bottom - r.top;
 
-                    BitBlt(dc, 0, offset, bitmap.bmWidth, bitmap.bmHeight, sdc, 0, 0, SRCCOPY);
+                    iDevsHeight = rcCredits.bottom - rcCredits.top;
-                    offset += bitmap.bmHeight;
+
-                    DeleteDC(sdc);
+                    hCreditsBitmap = CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + iDevsHeight + 1, pImgInfo->iPLanes, pImgInfo->iBits, NULL);
-                    DeleteDC(dc);
+
+                    if(!hCreditsBitmap)
+                        break;
+
+                    SelectObject(hLogoDC, pImgInfo->hBitmap);
+                    SelectObject(hCreditsDC, hCreditsBitmap);
+
+                    offset += pImgInfo->cySource;
+
+                    SetRect(&rcCredits, 0, 0, pImgInfo->cxSource, (2 * pImgInfo->cySource) + iDevsHeight + 1);
+                    FillRect(hCreditsDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE));
+
+                    SetRect(&rcCredits, 0, offset, pImgInfo->cxSource, offset + iDevsHeight + 1);
+                    SetBkMode(hCreditsDC, TRANSPARENT);
+
+                    OffsetRect(&rcCredits, 1, 1);
+                    SetTextColor(hCreditsDC, GetSysColor(COLOR_BTNSHADOW));
+                    DrawText(hCreditsDC, szCredits, -1, &rcCredits, DT_CENTER);
+
+                    OffsetRect(&rcCredits, -1, -1);
+                    SetTextColor(hCreditsDC, GetSysColor(COLOR_WINDOWTEXT));
+                    DrawText(hCreditsDC, szCredits, -1, &rcCredits, DT_CENTER);
+
+                    offset += iDevsHeight;
+
+                    AlphaBlend(hCreditsDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, hLogoDC, 0,  0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc);
+                    AlphaBlend(hCreditsDC, 0, offset, pImgInfo->cxSource, pImgInfo->cySource, hLogoDC, 0,  0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc);
+
+                    DeleteDC(hLogoDC);
+                    DeleteDC(hCreditsDC);
 
                     timerid = SetTimer(hwnd, 1, ANIM_TIME, NULL);
                 }
@@ -146,22 +209,40 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
         case WM_LBUTTONDOWN:
             if (timerid)
             {
+                RECT rcCredits;
+                HDC hDC = GetDC(hwnd);
+
+                GetClientRect(hwnd, &rcCredits);
+                SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource);
+                FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE));
+
                 KillTimer(hwnd, timerid);
+                DeleteObject(hCreditsBitmap);
+                InvalidateRect(hwnd, NULL, FALSE);
+
                 top = 0;
                 timerid = 0;
-                DeleteObject(hBitmap2);
-                InvalidateRect(hwnd, NULL, FALSE);
             }
             break;
         case WM_TIMER:
             top += ANIM_STEP;
-            if (top > offset - pImgInfo->cySource)
+
+            if (top > offset)
             {
+                RECT rcCredits;
+                HDC hDC = GetDC(hwnd);
+
+                GetClientRect(hwnd, &rcCredits);
+                SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource);
+                FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE));
+
                 KillTimer(hwnd, timerid);
+                DeleteObject(hCreditsBitmap);
+
                 top = 0;
                 timerid = 0;
-                DeleteObject(hBitmap2);
             }
+
             InvalidateRect(hwnd, NULL, FALSE);
             break;
         case WM_PAINT:
@@ -169,15 +250,10 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
             PAINTSTRUCT PS;
             HDC hdcMem, hdc;
             LONG left;
-            if (wParam != 0)
+
-            {
+            hdc = wParam != 0 ? (HDC)wParam : BeginPaint(hwnd, &PS);
-                hdc = (HDC)wParam;
+
-            }
+            GetClientRect(hwnd, &PS.rcPaint);
-            else
-            {
-                hdc = BeginPaint(hwnd,&PS);
-            }
-            GetClientRect(hwnd,&PS.rcPaint);
 
             /* Position image in center of dialog */
             left = (PS.rcPaint.right - pImgInfo->cxSource) / 2;
@@ -185,16 +261,17 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 
             if (hdcMem != NULL)
             {
-                SelectObject(hdcMem, timerid ? hBitmap2 : pImgInfo->hBitmap);
+                if(timerid != 0)
-                BitBlt(hdc,
+                {
-                       left,
+                    SelectObject(hdcMem, hCreditsBitmap);
-                       PS.rcPaint.top,
+                    BitBlt(hdc, left, PS.rcPaint.top, PS.rcPaint.right - PS.rcPaint.left, PS.rcPaint.top + pImgInfo->cySource, hdcMem, 0, top, SRCCOPY);
-                       PS.rcPaint.right - PS.rcPaint.left,
+                }
-                       PS.rcPaint.top + pImgInfo->cySource,
+                else
-                       hdcMem,
+                {
-                       0,
+                    SelectObject(hdcMem, pImgInfo->hBitmap);
-                       top,
+                    AlphaBlend(hdc, left, PS.rcPaint.top, pImgInfo->cxSource, pImgInfo->cySource, hdcMem, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc);
-                       SRCCOPY);
+                }
+
                 DeleteDC(hdcMem);
             }
 
@@ -206,53 +283,27 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
     return TRUE;
 }
 
-static VOID
+static VOID SetRegTextData(HWND hwnd, HKEY hKey, LPTSTR Value, UINT uID)
-SetRegTextData(HWND hwnd,
-               HKEY hKey,
-               LPTSTR Value,
-               UINT uID)
 {
     LPTSTR lpBuf = NULL;
     DWORD BufSize = 0;
     DWORD Type;
 
-    if (RegQueryValueEx(hKey,
+    if (RegQueryValueEx(hKey, Value, NULL, &Type, NULL, &BufSize) == ERROR_SUCCESS)
-                        Value,
-                        NULL,
-                        &Type,
-                        NULL,
-                        &BufSize) == ERROR_SUCCESS)
     {
-        lpBuf = HeapAlloc(GetProcessHeap(),
+        lpBuf = HeapAlloc(GetProcessHeap(), 0, BufSize);
-                          0,
+
-                          BufSize);
         if (!lpBuf)
             return;
 
-        if (RegQueryValueEx(hKey,
+        if (RegQueryValueEx(hKey, Value, NULL, &Type, (PBYTE)lpBuf, &BufSize) == ERROR_SUCCESS)
-                            Value,
+            SetDlgItemText(hwnd, uID, lpBuf);
-                            NULL,
-                            &Type,
-                            (PBYTE)lpBuf,
-                            &BufSize) == ERROR_SUCCESS)
-        {
-            SetDlgItemText(hwnd,
-                           uID,
-                           lpBuf);
-        }
 
-        HeapFree(GetProcessHeap(),
+        HeapFree(GetProcessHeap(), 0, lpBuf);
-                 0,
-                 lpBuf);
     }
 }
 
-static INT
+static INT SetProcNameString(HWND hwnd, HKEY hKey, LPTSTR Value, UINT uID1, UINT uID2)
-SetProcNameString(HWND hwnd,
-                  HKEY hKey,
-                  LPTSTR Value,
-                  UINT uID1,
-                  UINT uID2)
 {
     LPTSTR lpBuf = NULL;
     DWORD BufSize = 0;
@@ -262,25 +313,14 @@ SetProcNameString(HWND hwnd,
     TCHAR* szLastSpace;
     INT LastSpace = 0;
 
-    if (RegQueryValueEx(hKey,
+    if (RegQueryValueEx(hKey, Value, NULL, &Type, NULL, &BufSize) == ERROR_SUCCESS)
-                        Value,
-                        NULL,
-                        &Type,
-                        NULL,
-                        &BufSize) == ERROR_SUCCESS)
     {
-        lpBuf = HeapAlloc(GetProcessHeap(),
+        lpBuf = HeapAlloc(GetProcessHeap(), 0, BufSize);
-                          0,
+
-                          BufSize);
         if (!lpBuf)
             return 0;
 
-        if (RegQueryValueEx(hKey,
+        if (RegQueryValueEx(hKey, Value, NULL, &Type, (PBYTE)lpBuf, &BufSize) == ERROR_SUCCESS)
-                            Value,
-                            NULL,
-                            &Type,
-                            (PBYTE)lpBuf,
-                            &BufSize) == ERROR_SUCCESS)
         {
             if (BufSize > ((30 + 1) * sizeof(TCHAR)))
             {
@@ -308,39 +348,26 @@ SetProcNameString(HWND hwnd,
 
                 _tcsncpy(szBuf, lpBuf, LastSpace);
 
-                SetDlgItemText(hwnd,
+                SetDlgItemText(hwnd, uID1, szBuf);
-                               uID1,
+                SetDlgItemText(hwnd, uID2, lpBuf+LastSpace+1);
-                               szBuf);
-
-                SetDlgItemText(hwnd,
-                               uID2,
-                               lpBuf+LastSpace+1);
 
                 /* Return the number of used lines */
                 Ret = 2;
             }
             else
             {
-                SetDlgItemText(hwnd,
+                SetDlgItemText(hwnd, uID1, lpBuf);
-                             uID1,
-                             lpBuf);
-
                 Ret = 1;
             }
         }
 
-        HeapFree(GetProcessHeap(),
+        HeapFree(GetProcessHeap(), 0, lpBuf);
-                 0,
-                 lpBuf);
     }
 
     return Ret;
 }
 
-static VOID
+static VOID MakeFloatValueString(DOUBLE* dFloatValue, LPTSTR szOutput, LPTSTR szAppend)
-MakeFloatValueString(double* dFloatValue,
-                     LPTSTR szOutput,
-                     LPTSTR szAppend)
 {
     TCHAR szDecimalSeparator[4];
 
@@ -358,32 +385,21 @@ MakeFloatValueString(double* dFloatValue,
     }
 }
 
-static VOID
+static VOID SetProcSpeed(HWND hwnd, HKEY hKey, LPTSTR Value, UINT uID)
-SetProcSpeed(HWND hwnd,
-             HKEY hKey,
-             LPTSTR Value,
-             UINT uID)
 {
     TCHAR szBuf[64];
     DWORD BufSize = sizeof(DWORD);
     DWORD Type = REG_SZ;
     PROCESSOR_POWER_INFORMATION ppi;
 
-    ZeroMemory(&ppi,
+    ZeroMemory(&ppi, sizeof(ppi));
-               sizeof(ppi));
 
     if ((CallNtPowerInformation(ProcessorInformation,
                                 NULL,
                                 0,
                                 (PVOID)&ppi,
                                 sizeof(ppi)) == STATUS_SUCCESS &&
-         ppi.CurrentMhz != 0) ||
+         ppi.CurrentMhz != 0) || RegQueryValueEx(hKey, Value, NULL, &Type, (PBYTE)&ppi.CurrentMhz, &BufSize) == ERROR_SUCCESS)
-         RegQueryValueEx(hKey,
-                         Value,
-                         NULL,
-                         &Type,
-                         (PBYTE)&ppi.CurrentMhz,
-                         &BufSize) == ERROR_SUCCESS)
     {
         if (ppi.CurrentMhz < 1000)
         {
@@ -395,14 +411,11 @@ SetProcSpeed(HWND hwnd,
             MakeFloatValueString(&flt, szBuf, _T("GHz"));
         }
 
-        SetDlgItemText(hwnd,
+        SetDlgItemText(hwnd, uID, szBuf);
-                       uID,
-                       szBuf);
     }
 }
 
-static VOID
+static VOID GetSystemInformation(HWND hwnd)
-GetSystemInformation(HWND hwnd)
 {
     HKEY hKey;
     TCHAR ProcKey[] = _T("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0");
@@ -416,16 +429,9 @@ GetSystemInformation(HWND hwnd)
      * directly out of the registry instead of via setupapi as it
      * contains all the info we need, and should remain static
      */
-    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, ProcKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS)
-                     ProcKey,
-                     0,
-                     KEY_READ,
-                     &hKey) == ERROR_SUCCESS)
     {
-        SetRegTextData(hwnd,
+        SetRegTextData(hwnd, hKey, _T("VendorIdentifier"), CurMachineLine);
-                       hKey,
-                       _T("VendorIdentifier"),
-                       CurMachineLine);
         CurMachineLine++;
 
         CurMachineLine += SetProcNameString(hwnd,
@@ -434,16 +440,13 @@ GetSystemInformation(HWND hwnd)
                                             CurMachineLine,
                                             CurMachineLine + 1);
 
-        SetProcSpeed(hwnd,
+        SetProcSpeed(hwnd, hKey, _T("~MHz"), CurMachineLine);
-                     hKey,
-                     _T("~MHz"),
-                     CurMachineLine);
         CurMachineLine++;
     }
 
-
     /* Get total physical RAM */
     MemStat.dwLength = sizeof(MemStat);
+
     if (GlobalMemoryStatusEx(&MemStat))
     {
         TCHAR szStr[32];
@@ -452,11 +455,7 @@ GetSystemInformation(HWND hwnd)
         if (MemStat.ullTotalPhys > 1024 * 1024 * 1024)
         {
             UINT i = 0;
-            static const UINT uStrId[] = {
+            static const UINT uStrId[] = { IDS_GIGABYTE, IDS_TERABYTE, IDS_PETABYTE};
-                IDS_GIGABYTE,
-                IDS_TERABYTE,
-                IDS_PETABYTE
-            };
 
             // We're dealing with GBs or more
             MemStat.ullTotalPhys /= 1024 * 1024;
@@ -501,13 +500,8 @@ GetSystemInformation(HWND hwnd)
 
 
 /* Property page dialog callback */
-INT_PTR CALLBACK
+INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-GeneralPageProc(HWND hwndDlg,
-                UINT uMsg,
-                WPARAM wParam,
-                LPARAM lParam)
 {
-
     UNREFERENCED_PARAMETER(lParam);
     UNREFERENCED_PARAMETER(wParam);
 
@@ -521,7 +515,7 @@ GeneralPageProc(HWND hwndDlg,
                 return FALSE;
             }
 
-            InitImageInfo(pImgInfo);
+            InitLogo(hwndDlg);
             SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_ROSIMG), GWL_WNDPROC, (LONG)RosImageProc);
             GetSystemInformation(hwndDlg);
             break;
@@ -533,10 +527,7 @@ GeneralPageProc(HWND hwndDlg,
         case WM_COMMAND:
             if (LOWORD(wParam) == IDC_LICENCE)
             {
-                DialogBox(hApplet,
+                DialogBox(hApplet, MAKEINTRESOURCE(IDD_LICENCE), hwndDlg, LicenceDlgProc);
-                          MAKEINTRESOURCE(IDD_LICENCE),
-                          hwndDlg,
-                          LicenceDlgProc);
 
                 return TRUE;
             }
@@ -544,8 +535,8 @@ GeneralPageProc(HWND hwndDlg,
 
         case WM_DRAWITEM:
         {
-            LPDRAWITEMSTRUCT lpDrawItem;
+            LPDRAWITEMSTRUCT lpDrawItem = (LPDRAWITEMSTRUCT) lParam;
-            lpDrawItem = (LPDRAWITEMSTRUCT) lParam;
+
             if (lpDrawItem->CtlID == IDC_ROSIMG)
             {
                 HDC hdcMem;
@@ -581,12 +572,7 @@ GeneralPageProc(HWND hwndDlg,
             {
                 PNMLINK nml = (PNMLINK)nmhdr;
 
-                ShellExecuteW(hwndDlg,
+                ShellExecuteW(hwndDlg, L"open", nml->item.szUrl, NULL, NULL, SW_SHOWNORMAL);
-                              L"open",
-                              nml->item.szUrl,
-                              NULL,
-                              NULL,
-                              SW_SHOWNORMAL);
             }
             break;
         }