Updated German language texts.v0.2.0

Set version number and release date for version 0.2.0

7 files changed, 506 insertions, 38 deletions

diff --git a/HISTORY b/HISTORY
index 7746364..5644983 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,5 @@
-VDR Plugin 'spider' Revision History
-------------------------------------
+VDR plug-in 'Spider-Arachnid' Revision History
+----------------------------------------------
 
 2005-05-12: Version 0.1.0
 
@@ -27,3 +27,18 @@ VDR Plugin 'spider' Revision History
 - Fixed compiler warnings with gcc-4.1.2.
 - Updated FSF address in the license information.
 - Improved copyright and license information in the header of all source files.
+
+2007-09-26: Version 0.2.0
+
+- Renamed *.c files to C++ suffix *.cpp.
+- Added namespaces.
+- Added gettext support (VDR >= 1.5.7).
+- Resume the last game.
+- Customizable width and height.
+- OSD error compensation (shrink width/height or reduce colors).
+- Added setup option to hide the top row.
+- Set normal variation (two decks and 10 piles) as standard, together with
+  "shrink height" and "hide top row".
+- Added user-defined variations.
+- Improved key handling.
+- Updated German language texts.
diff --git a/README b/README
index 1895028..1cc1533 100644
--- a/README
+++ b/README
@@ -101,7 +101,7 @@ Setup:
                            Otherwise it will be aligned.
                            Values: 100-720. Default: 624.
 - OSD height               The height of the OSD.
-                           Values: 100-576. Default is 486.
+                           Values: 100-576. Default: 486.
 - OSD error compensation   Method of compensation if the OSD memory limit is
                            exceeded.
                            Values: Shrink height, Shrink width, Shrink width and
diff --git a/TODO b/TODO
index 85484b9..e43400d 100644
--- a/TODO
+++ b/TODO
@@ -1,12 +1,8 @@
-To-do list for the spider plugin
-================================
-- user-defined variations
-- hiding pack and final heaps
+To-do list for the spider plug-in
+=================================
 - varying card distance in piles
-- resume a game
 - load and save games
 - improved random generator
 - compatibility with other implementations
-- customizable width and height
 - show points
 - help screen
diff --git a/i18n.cpp b/i18n.cpp
index a85ce5e..162018a 100644
--- a/i18n.cpp
+++ b/i18n.cpp
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * $Id: i18n.cpp 96 2007-09-23 13:18:41Z tom $
+ * $Id: i18n.cpp 98 2007-09-26 00:05:32Z tom $
  *
  *
  * Translations provided by:
@@ -143,6 +143,336 @@ const tI18nPhrase SpiderPlugin::Phrases[] = {
     "", // Dansk / Danish
     "", // Èesky / Czech
   },
+  { "Custom", // English
+    "Benutzerdefiniert", // Deutsch / German
+    "", // Slovenski / Slovenian
+    "", // Italiano / Italian
+    "", // Nederlands / Dutch
+    "", // Português / Portuguese
+    "", // Français / French
+    "", // Norsk / Norwegian
+    "", // suomi / Finnish
+    "", // Polski / Polish
+    "", // Español / Spanish
+    "", // ÅëëçíéêÜ / Greek
+    "", // Svenska / Swedish
+    "", // Românã / Romanian
+    "", // Magyar / Hungarian
+    "", // Català / Catalanian
+    "", // ÀãááÚØÙ / Russian
+    "", // Hrvatski / Croatian
+    "", // Eesti / Estonian
+    "", // Dansk / Danish
+    "", // Èesky / Czech
+  },
+  { " Deck count", // English
+    " Blatt-Anzahl", // Deutsch / German
+    "", // Slovenski / Slovenian
+    "", // Italiano / Italian
+    "", // Nederlands / Dutch
+    "", // Português / Portuguese
+    "", // Français / French
+    "", // Norsk / Norwegian
+    "", // suomi / Finnish
+    "", // Polski / Polish
+    "", // Español / Spanish
+    "", // ÅëëçíéêÜ / Greek
+    "", // Svenska / Swedish
+    "", // Românã / Romanian
+    "", // Magyar / Hungarian
+    "", // Català / Catalanian
+    "", // ÀãááÚØÙ / Russian
+    "", // Hrvatski / Croatian
+    "", // Eesti / Estonian
+    "", // Dansk / Danish
+    "", // Èesky / Czech
+  },
+  { " Pile count", // English
+    " Anzahl Reihen", // Deutsch / German
+    "", // Slovenski / Slovenian
+    "", // Italiano / Italian
+    "", // Nederlands / Dutch
+    "", // Português / Portuguese
+    "", // Français / French
+    "", // Norsk / Norwegian
+    "", // suomi / Finnish
+    "", // Polski / Polish
+    "", // Español / Spanish
+    "", // ÅëëçíéêÜ / Greek
+    "", // Svenska / Swedish
+    "", // Românã / Romanian
+    "", // Magyar / Hungarian
+    "", // Català / Catalanian
+    "", // ÀãááÚØÙ / Russian
+    "", // Hrvatski / Croatian
+    "", // Eesti / Estonian
+    "", // Dansk / Danish
+    "", // Èesky / Czech
+  },
+  { " Deal count", // English
+    " Neue Karten geben", // Deutsch / German
+    "", // Slovenski / Slovenian
+    "", // Italiano / Italian
+    "", // Nederlands / Dutch
+    "", // Português / Portuguese
+    "", // Français / French
+    "", // Norsk / Norwegian
+    "", // suomi / Finnish
+    "", // Polski / Polish
+    "", // Español / Spanish
+    "", // ÅëëçíéêÜ / Greek
+    "", // Svenska / Swedish
+    "", // Românã / Romanian
+    "", // Magyar / Hungarian
+    "", // Català / Catalanian
+    "", // ÀãááÚØÙ / Russian
+    "", // Hrvatski / Croatian
+    "", // Eesti / Estonian
+    "", // Dansk / Danish
+    "", // Èesky / Czech
+  },
+  { "OSD position left", // English
+    "OSD-Position links", // Deutsch / German
+    "", // Slovenski / Slovenian
+    "", // Italiano / Italian
+    "", // Nederlands / Dutch
+    "", // Português / Portuguese
+    "", // Français / French
+    "", // Norsk / Norwegian
+    "", // suomi / Finnish
+    "", // Polski / Polish
+    "", // Español / Spanish
+    "", // ÅëëçíéêÜ / Greek
+    "", // Svenska / Swedish
+    "", // Românã / Romanian
+    "", // Magyar / Hungarian
+    "", // Català / Catalanian
+    "", // ÀãááÚØÙ / Russian
+    "", // Hrvatski / Croatian
+    "", // Eesti / Estonian
+    "", // Dansk / Danish
+    "", // Èesky / Czech
+  },
+  { "OSD position top", // English
+    "OSD-Position oben", // Deutsch / German
+    "", // Slovenski / Slovenian
+    "", // Italiano / Italian
+    "", // Nederlands / Dutch
+    "", // Português / Portuguese
+    "", // Français / French
+    "", // Norsk / Norwegian
+    "", // suomi / Finnish
+    "", // Polski / Polish
+    "", // Español / Spanish
+    "", // ÅëëçíéêÜ / Greek
+    "", // Svenska / Swedish
+    "", // Românã / Romanian
+    "", // Magyar / Hungarian
+    "", // Català / Catalanian
+    "", // ÀãááÚØÙ / Russian
+    "", // Hrvatski / Croatian
+    "", // Eesti / Estonian
+    "", // Dansk / Danish
+    "", // Èesky / Czech
+  },
+  { "OSD width", // English
+    "OSD-Breite", // Deutsch / German
+    "", // Slovenski / Slovenian
+    "", // Italiano / Italian
+    "", // Nederlands / Dutch
+    "", // Português / Portuguese
+    "", // Français / French
+    "", // Norsk / Norwegian
+    "", // suomi / Finnish
+    "", // Polski / Polish
+    "", // Español / Spanish
+    "", // ÅëëçíéêÜ / Greek
+    "", // Svenska / Swedish
+    "", // Românã / Romanian
+    "", // Magyar / Hungarian
+    "", // Català / Catalanian
+    "", // ÀãááÚØÙ / Russian
+    "", // Hrvatski / Croatian
+    "", // Eesti / Estonian
+    "", // Dansk / Danish
+    "", // Èesky / Czech
+  },
+  { "OSD height", // English
+    "OSD-Höhe", // Deutsch / German
+    "", // Slovenski / Slovenian
+    "", // Italiano / Italian
+    "", // Nederlands / Dutch
+    "", // Português / Portuguese
+    "", // Français / French
+    "", // Norsk / Norwegian
+    "", // suomi / Finnish
+    "", // Polski / Polish
+    "", // Español / Spanish
+    "", // ÅëëçíéêÜ / Greek
+    "", // Svenska / Swedish
+    "", // Românã / Romanian
+    "", // Magyar / Hungarian
+    "", // Català / Catalanian
+    "", // ÀãááÚØÙ / Russian
+    "", // Hrvatski / Croatian
+    "", // Eesti / Estonian
+    "", // Dansk / Danish
+    "", // Èesky / Czech
+  },
+  { "OSD error compensation", // English
+    "OSD-Fehler kompensieren", // Deutsch / German
+    "", // Slovenski / Slovenian
+    "", // Italiano / Italian
+    "", // Nederlands / Dutch
+    "", // Português / Portuguese
+    "", // Français / French
+    "", // Norsk / Norwegian
+    "", // suomi / Finnish
+    "", // Polski / Polish
+    "", // Español / Spanish
+    "", // ÅëëçíéêÜ / Greek
+    "", // Svenska / Swedish
+    "", // Românã / Romanian
+    "", // Magyar / Hungarian
+    "", // Català / Catalanian
+    "", // ÀãááÚØÙ / Russian
+    "", // Hrvatski / Croatian
+    "", // Eesti / Estonian
+    "", // Dansk / Danish
+    "", // Èesky / Czech
+  },
+  { "Shrink height", // English
+    "Höhe verringern", // Deutsch / German
+    "", // Slovenski / Slovenian
+    "", // Italiano / Italian
+    "", // Nederlands / Dutch
+    "", // Português / Portuguese
+    "", // Français / French
+    "", // Norsk / Norwegian
+    "", // suomi / Finnish
+    "", // Polski / Polish
+    "", // Español / Spanish
+    "", // ÅëëçíéêÜ / Greek
+    "", // Svenska / Swedish
+    "", // Românã / Romanian
+    "", // Magyar / Hungarian
+    "", // Català / Catalanian
+    "", // ÀãááÚØÙ / Russian
+    "", // Hrvatski / Croatian
+    "", // Eesti / Estonian
+    "", // Dansk / Danish
+    "", // Èesky / Czech
+  },
+  { "Shrink width", // English
+    "Breite verringern", // Deutsch / German
+    "", // Slovenski / Slovenian
+    "", // Italiano / Italian
+    "", // Nederlands / Dutch
+    "", // Português / Portuguese
+    "", // Français / French
+    "", // Norsk / Norwegian
+    "", // suomi / Finnish
+    "", // Polski / Polish
+    "", // Español / Spanish
+    "", // ÅëëçíéêÜ / Greek
+    "", // Svenska / Swedish
+    "", // Românã / Romanian
+    "", // Magyar / Hungarian
+    "", // Català / Catalanian
+    "", // ÀãááÚØÙ / Russian
+    "", // Hrvatski / Croatian
+    "", // Eesti / Estonian
+    "", // Dansk / Danish
+    "", // Èesky / Czech
+  },
+  { "Shrink width and height", // English
+    "Breite und Höhe verringern", // Deutsch / German
+    "", // Slovenski / Slovenian
+    "", // Italiano / Italian
+    "", // Nederlands / Dutch
+    "", // Português / Portuguese
+    "", // Français / French
+    "", // Norsk / Norwegian
+    "", // suomi / Finnish
+    "", // Polski / Polish
+    "", // Español / Spanish
+    "", // ÅëëçíéêÜ / Greek
+    "", // Svenska / Swedish
+    "", // Românã / Romanian
+    "", // Magyar / Hungarian
+    "", // Català / Catalanian
+    "", // ÀãááÚØÙ / Russian
+    "", // Hrvatski / Croatian
+    "", // Eesti / Estonian
+    "", // Dansk / Danish
+    "", // Èesky / Czech
+  },
+  { "Reduce colors", // English
+    "Farben reduzieren", // Deutsch / German
+    "", // Slovenski / Slovenian
+    "", // Italiano / Italian
+    "", // Nederlands / Dutch
+    "", // Português / Portuguese
+    "", // Français / French
+    "", // Norsk / Norwegian
+    "", // suomi / Finnish
+    "", // Polski / Polish
+    "", // Español / Spanish
+    "", // ÅëëçíéêÜ / Greek
+    "", // Svenska / Swedish
+    "", // Românã / Romanian
+    "", // Magyar / Hungarian
+    "", // Català / Catalanian
+    "", // ÀãááÚØÙ / Russian
+    "", // Hrvatski / Croatian
+    "", // Eesti / Estonian
+    "", // Dansk / Danish
+    "", // Èesky / Czech
+  },
+  { "Hide top row", // English
+    "Oberste Zeile verbergen", // Deutsch / German
+    "", // Slovenski / Slovenian
+    "", // Italiano / Italian
+    "", // Nederlands / Dutch
+    "", // Português / Portuguese
+    "", // Français / French
+    "", // Norsk / Norwegian
+    "", // suomi / Finnish
+    "", // Polski / Polish
+    "", // Español / Spanish
+    "", // ÅëëçíéêÜ / Greek
+    "", // Svenska / Swedish
+    "", // Românã / Romanian
+    "", // Magyar / Hungarian
+    "", // Català / Catalanian
+    "", // ÀãááÚØÙ / Russian
+    "", // Hrvatski / Croatian
+    "", // Eesti / Estonian
+    "", // Dansk / Danish
+    "", // Èesky / Czech
+  },
+  { "Reset", // English
+    "Zurücksetzen", // Deutsch / German
+    "", // Slovenski / Slovenian
+    "", // Italiano / Italian
+    "", // Nederlands / Dutch
+    "", // Português / Portuguese
+    "", // Français / French
+    "", // Norsk / Norwegian
+    "", // suomi / Finnish
+    "", // Polski / Polish
+    "", // Español / Spanish
+    "", // ÅëëçíéêÜ / Greek
+    "", // Svenska / Swedish
+    "", // Românã / Romanian
+    "", // Magyar / Hungarian
+    "", // Català / Catalanian
+    "", // ÀãááÚØÙ / Russian
+    "", // Hrvatski / Croatian
+    "", // Eesti / Estonian
+    "", // Dansk / Danish
+    "", // Èesky / Czech
+  },
   { "Only complete suits are allowed to remove", // English
     "Nur vollständige Sätze können entfernt werden", // Deutsch / German
     "", // Slovenski / Slovenian
diff --git a/po/de_DE.po b/po/de_DE.po
index d251b8f..1f6b854 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,35 +1,35 @@
 # German translations for vdr-spider package.
 # Copyright (C) 2007 Thomas Günther <tom@toms-cafe.de>
 # This file is distributed under the same license as the vdr-spider package.
-# Thomas Günther <tom@toms-cafe.de>, 2005.
+# Thomas Günther <tom@toms-cafe.de>, 2005, 2007.
 #
-# $Id: de_DE.po 97 2007-09-24 22:29:48Z tom $
+# $Id: de_DE.po 98 2007-09-26 00:05:32Z tom $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-spider 0.1.4\n"
+"Project-Id-Version: vdr-spider 0.2.0\n"
 "Report-Msgid-Bugs-To: <tom@toms-cafe.de>\n"
-"POT-Creation-Date: 2007-09-23 14:56+0200\n"
-"PO-Revision-Date: 2007-09-23 14:56+0200\n"
+"POT-Creation-Date: 2007-09-25 00:47+0200\n"
+"PO-Revision-Date: 2007-09-25 00:47+0200\n"
 "Last-Translator: Thomas Günther <tom@toms-cafe.de>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: game.cpp:190
+#: game.cpp:256
 msgid "Only complete suits are allowed to remove"
 msgstr "Nur vollständige Sätze können entfernt werden"
 
-#: game.cpp:216
+#: game.cpp:293
 msgid "No cards left"
 msgstr "Keine Karten übrig"
 
-#: game.cpp:218
+#: game.cpp:295
 msgid "Deal not allowed with empty piles"
 msgstr "Neue Karten nur, wenn alle Reihen belegt"
 
-#: game.cpp:229
+#: game.cpp:312
 msgid ""
 "Congratulations!\n"
 "Press OK to start a new game"
@@ -37,22 +37,86 @@ msgstr ""
 "Herzlichen Glückwunsch!\n"
 "OK startet ein neues Spiel"
 
-#: setup.cpp:62
+#: setup.cpp:89
 msgid "Mini (one deck)"
 msgstr "Mini (ein Blatt)"
 
-#: setup.cpp:63
+#: setup.cpp:90
 msgid "Normal"
 msgstr "Normal"
 
-#: setup.cpp:64
+#: setup.cpp:91
+msgid "Custom"
+msgstr "Benutzerdefiniert"
+
+#: setup.cpp:92
+msgid "Shrink height"
+msgstr "Höhe verringern"
+
+#: setup.cpp:93
+msgid "Shrink width"
+msgstr "Breite verringern"
+
+#: setup.cpp:94
+msgid "Shrink width and height"
+msgstr "Breite und Höhe verringern"
+
+#: setup.cpp:95
+msgid "Reduce colors"
+msgstr "Farben reduzieren"
+
+#: setup.cpp:96
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+#: setup.cpp:106
 msgid "Variation"
 msgstr "Variante"
 
-#: spider.cpp:40
+#. TRANSLATORS: note the leading blank!
+#: setup.cpp:112
+msgid " Deck count"
+msgstr " Blatt-Anzahl"
+
+#. TRANSLATORS: note the leading blank!
+#: setup.cpp:114
+msgid " Pile count"
+msgstr " Anzahl Reihen"
+
+#. TRANSLATORS: note the leading blank!
+#: setup.cpp:116
+msgid " Deal count"
+msgstr " Neue Karten geben"
+
+#: setup.cpp:119
+msgid "OSD position left"
+msgstr "OSD-Position links"
+
+#: setup.cpp:120
+msgid "OSD position top"
+msgstr "OSD-Position oben"
+
+#: setup.cpp:121
+msgid "OSD width"
+msgstr "OSD-Breite"
+
+#: setup.cpp:122
+msgid "OSD height"
+msgstr "OSD-Höhe"
+
+#: setup.cpp:123
+msgid "OSD error compensation"
+msgstr "OSD-Fehler kompensieren"
+
+#: setup.cpp:126
+msgid "Hide top row"
+msgstr "Oberste Zeile verbergen"
+
+#: spider.cpp:41
 msgid "Spider Arachnid - the best patience game"
 msgstr "Spider Arachnid - die beste Patience"
 
-#: spider.cpp:43
+#: spider.cpp:44
 msgid "Spider Arachnid"
 msgstr "Spider Arachnid"
+
diff --git a/po/es_ES.po b/po/es_ES.po
index e99ed10..564e137 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -3,33 +3,33 @@
 # This file is distributed under the same license as the vdr-spider package.
 # bittor from open7x0.org, 2007.
 #
-# $Id: es_ES.po 97 2007-09-24 22:29:48Z tom $
+# $Id: es_ES.po 98 2007-09-26 00:05:32Z tom $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: vdr-spider 0.1.4\n"
 "Report-Msgid-Bugs-To: <tom@toms-cafe.de>\n"
-"POT-Creation-Date: 2007-09-23 14:56+0200\n"
+"POT-Creation-Date: 2007-09-25 00:47+0200\n"
 "PO-Revision-Date: 2007-09-23 14:56+0200\n"
-"Last-Translator: bittor from open7x0.org, 2007\n"
+"Last-Translator: bittor from open7x0.org\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: game.cpp:190
+#: game.cpp:256
 msgid "Only complete suits are allowed to remove"
 msgstr "Sólo puede eliminar los palos completos"
 
-#: game.cpp:216
+#: game.cpp:293
 msgid "No cards left"
 msgstr "No dejó cartas"
 
-#: game.cpp:218
+#: game.cpp:295
 msgid "Deal not allowed with empty piles"
 msgstr "Reparto no permitido con montones vacíos"
 
-#: game.cpp:229
+#: game.cpp:312
 msgid ""
 "Congratulations!\n"
 "Press OK to start a new game"
@@ -37,22 +37,85 @@ msgstr ""
 "¡Felicidades!\n"
 "Pulse OK para iniciar un nuevo juego"
 
-#: setup.cpp:62
+#: setup.cpp:89
 msgid "Mini (one deck)"
 msgstr "Mini (una baraja)"
 
-#: setup.cpp:63
+#: setup.cpp:90
 msgid "Normal"
 msgstr "Normal"
 
-#: setup.cpp:64
+#: setup.cpp:91
+msgid "Custom"
+msgstr ""
+
+#: setup.cpp:92
+msgid "Shrink height"
+msgstr ""
+
+#: setup.cpp:93
+msgid "Shrink width"
+msgstr ""
+
+#: setup.cpp:94
+msgid "Shrink width and height"
+msgstr ""
+
+#: setup.cpp:95
+msgid "Reduce colors"
+msgstr ""
+
+#: setup.cpp:96
+msgid "Reset"
+msgstr ""
+
+#: setup.cpp:106
 msgid "Variation"
 msgstr "Variación"
 
-#: spider.cpp:40
+#. TRANSLATORS: note the leading blank!
+#: setup.cpp:112
+msgid " Deck count"
+msgstr ""
+
+#. TRANSLATORS: note the leading blank!
+#: setup.cpp:114
+msgid " Pile count"
+msgstr ""
+
+#. TRANSLATORS: note the leading blank!
+#: setup.cpp:116
+msgid " Deal count"
+msgstr ""
+
+#: setup.cpp:119
+msgid "OSD position left"
+msgstr ""
+
+#: setup.cpp:120
+msgid "OSD position top"
+msgstr ""
+
+#: setup.cpp:121
+msgid "OSD width"
+msgstr ""
+
+#: setup.cpp:122
+msgid "OSD height"
+msgstr ""
+
+#: setup.cpp:123
+msgid "OSD error compensation"
+msgstr ""
+
+#: setup.cpp:126
+msgid "Hide top row"
+msgstr ""
+
+#: spider.cpp:41
 msgid "Spider Arachnid - the best patience game"
 msgstr "Spider Arachnid - mejor juego paciencia"
 
-#: spider.cpp:43
+#: spider.cpp:44
 msgid "Spider Arachnid"
 msgstr "Spider Arachnid"
diff --git a/spider.cpp b/spider.cpp
index 20f4fd0..cc96bce 100644
--- a/spider.cpp
+++ b/spider.cpp
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * $Id: spider.cpp 97 2007-09-24 22:29:48Z tom $
+ * $Id: spider.cpp 98 2007-09-26 00:05:32Z tom $
  */
 
 #include "spider.h"
@@ -34,7 +34,7 @@ namespace SpiderPlugin
 {
 
   /** Version number of the plugin */
-  static const char* VERSION = "0.1.4";
+  static const char* VERSION = "0.2.0";
 
   /** Short description of the plugin's purpose */
   static const char* DESCRIPTION =