diff options
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | commands.cpp | 4 | ||||
| -rw-r--r-- | i18n.cpp | 855 | ||||
| -rw-r--r-- | i18n.h | 43 | ||||
| -rw-r--r-- | list.cpp | 10 | ||||
| -rw-r--r-- | menu.cpp | 15 | ||||
| -rw-r--r-- | setup.cpp | 18 | ||||
| -rw-r--r-- | setup.h | 6 | ||||
| -rw-r--r-- | sudoku.cpp | 11 |
9 files changed, 16 insertions, 947 deletions
@@ -93,3 +93,4 @@ ____-__-__: Version 0.3.5 - Removed subversion keywords ($Id). - Added support for VDR >= 1.7.13 (Make.global). - Added method Pos::interacts_with. +- Removed compatibility to VDR < 1.6.0. diff --git a/commands.cpp b/commands.cpp index 82dca5d..c5c9c36 100644 --- a/commands.cpp +++ b/commands.cpp @@ -1,7 +1,7 @@ /* * Sudoku: A plug-in for the Video Disk Recorder * - * Copyright (C) 2008, Thomas Günther <tom@toms-cafe.de> + * Copyright (C) 2008-2010, Thomas Günther <tom@toms-cafe.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ #include "commands.h" #include "menu.h" -#include "i18n.h" +#include <vdr/i18n.h> #include <vdr/config.h> #include <vdr/osdbase.h> #include <vdr/osd.h> diff --git a/i18n.cpp b/i18n.cpp deleted file mode 100644 index 4b34ccf..0000000 --- a/i18n.cpp +++ /dev/null @@ -1,855 +0,0 @@ -/* - * Sudoku: A plug-in for the Video Disk Recorder - * - * Copyright (C) 2005-2008, Thomas Günther <tom@toms-cafe.de> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * - * Translations provided by: - * - * Italian Diego Pierotto <vdr-italian@tiscali.it> - * French Patrice Staudt <patr.staudt@laposte.net> - * NIVAL Michaël <mnival@vdrbox.lautre.net> - * Finnish Ville Skyttä <ville.skytta@iki.fi> - * Spanish Bittor Corl <bittor7x0 _at_ gmail.com> - * - */ - -#include "i18n.h" -#include <vdr/config.h> - - -#if VDRVERSNUM < 10507 - -const tI18nPhrase SudokuPlugin::Phrases[] = { - { "Sudoku", // English - "Sudoku", // Deutsch / German - "", // Slovenski / Slovenian - "Sudoku", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Sudoku", // Français / French - "", // Norsk / Norwegian - "Sudoku", // suomi / Finnish - "", // Polski / Polish - "Sudoku", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Sudoku - generate and solve Number Place puzzles", // English - "Sudoku - Erzeugen und Lösen von Zahlenpuzzles", // Deutsch / German - "", // Slovenski / Slovenian - "Sudoku - Genera e risolvi il rompicapo dei numeri", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Sudoku - créer et résoudre des puzzles de chiffres", // Français / French - "", // Norsk / Norwegian - "Sudoku-numeroristikot", // suomi / Finnish - "", // Polski / Polish - "Solucionar rompecabezas numérico", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Generate a new puzzle", // English - "Neues Puzzle erzeugen", // Deutsch / German - "", // Slovenski / Slovenian - "Genera nuova partita", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Créer un nouveau puzzle", // Français / French - "", // Norsk / Norwegian - "Uusi ristikko", // suomi / Finnish - "", // Polski / Polish - "Generar nuevo rompecabezas", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Load a puzzle", // English - "Puzzle laden", // Deutsch / German - "", // Slovenski / Slovenian - "Carica partita", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Charger un puzzle", // Français / French - "", // Norsk / Norwegian - "Lataa ristikko", // suomi / Finnish - "", // Polski / Polish - "Cargar un rompecabezas", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Save the puzzle", // English - "Puzzle speichern", // Deutsch / German - "", // Slovenski / Slovenian - "Salva partita", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Sauvegarder le puzzle", // Français / French - "", // Norsk / Norwegian - "Tallenna ristikko", // suomi / Finnish - "", // Polski / Polish - "Guardar rompecabezas", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Undo last action", // English - "Letzte Aktion zurücknehmen", // Deutsch / German - "", // Slovenski / Slovenian - "Annulla ultima azione", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Annuler la dernière action", // Français / French - "", // Norsk / Norwegian - "Peru viimeisin", // suomi / Finnish - "", // Polski / Polish - "Deshacer última acción", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Redo last action", // English - "Letzte Aktion wiederholen", // Deutsch / German - "", // Slovenski / Slovenian - "Ripeti ultima azione", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Répéter la dernière action", // Français / French - "", // Norsk / Norwegian - "Toista viimeisin", // suomi / Finnish - "", // Polski / Polish - "Rehacer última acción", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Mark/unmark", // English - "Markierung setzen/löschen", // Deutsch / German - "", // Slovenski / Slovenian - "Marca/Smarca", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Marquer/Démarquer", // Français / French - "", // Norsk / Norwegian - "Merkitse/poista merkintä", // suomi / Finnish - "", // Polski / Polish - "Marcar/desmarcar", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Next cell", // English - "Nächste Zelle", // Deutsch / German - "", // Slovenski / Slovenian - "Cella successiva", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Cellule suivante", // Français / French - "", // Norsk / Norwegian - "Seuraava ruutu", // suomi / Finnish - "", // Polski / Polish - "Celda siguiente", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Next number", // English - "Nächste Zahl", // Deutsch / German - "", // Slovenski / Slovenian - "Num. successivo", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Nombre suivant", // Français / French - "", // Norsk / Norwegian - "Seuraava numero", // suomi / Finnish - "", // Polski / Polish - "Número siguiente", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Reset the puzzle", // English - "Puzzle zurücksetzen", // Deutsch / German - "", // Slovenski / Slovenian - "Ricomincia partita", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Remise à zéro du puzzle", // Français / French - "", // Norsk / Norwegian - "Tyhjennä ristikko", // suomi / Finnish - "", // Polski / Polish - "Reiniciar el rompecabezas", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Open setup menu", // English - "Einstellungsmenü öffnen", // Deutsch / German - "", // Slovenski / Slovenian - "Apri menu opzioni", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Ouvrir le menu de configuration", // Français / French - "", // Norsk / Norwegian - "Asetukset", // suomi / Finnish - "", // Polski / Polish - "Abrir menú de opciones", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Exit", // English - "Beenden", // Deutsch / German - "", // Slovenski / Slovenian - "Esci", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Terminer", // Français / French - "", // Norsk / Norwegian - "Poistu", // suomi / Finnish - "", // Polski / Polish - "Salir", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Sudoku list", // English - "Sudoku-Liste", // Deutsch / German - "", // Slovenski / Slovenian - "Elenco Sudoku", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Liste Sudoku", // Français / French - "", // Norsk / Norwegian - "Tallennetut ristikot", // suomi / Finnish - "", // Polski / Polish - "Lista Sudoku", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Delete the puzzle?", // English - "Puzzle löschen?", // Deutsch / German - "", // Slovenski / Slovenian - "Eliminare la partita?", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Supprimer le puzzle ?", // Français / French - "", // Norsk / Norwegian - "Poistetaanko ristikko?", // suomi / Finnish - "", // Polski / Polish - "¿Borrar el rompecabezas?", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Button$Load", // English - "Laden", // Deutsch / German - "", // Slovenski / Slovenian - "Carica", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Charger", // Français / French - "", // Norsk / Norwegian - "Lataa", // suomi / Finnish - "", // Polski / Polish - "Cargar", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Button$Back", // English - "Zurück", // Deutsch / German - "", // Slovenski / Slovenian - "Indietro", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Retour", // Français / French - "", // Norsk / Norwegian - "Takaisin", // suomi / Finnish - "", // Polski / Polish - "Volver", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Edit sudoku list", // English - "Sudoku-Liste bearbeiten", // Deutsch / German - "", // Slovenski / Slovenian - "Modifica elenco Sudoku", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Editer la liste Sudoku", // Français / French - "", // Norsk / Norwegian - "Ristikon tiedot", // suomi / Finnish - "", // Polski / Polish - "Editar lista Sudoku", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Description", // English - "Beschreibung", // Deutsch / German - "", // Slovenski / Slovenian - "Descrizione", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Description", // Français / French - "", // Norsk / Norwegian - "Kuvaus", // suomi / Finnish - "", // Polski / Polish - "Descripción", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Givens count", // English - "Anzahl vorgegebener Zahlen", // Deutsch / German - "", // Slovenski / Slovenian - "Numero cifre assegnate", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Nombre de chiffre donné", // Français / French - "", // Norsk / Norwegian - "Annettujen numeroiden lukumäärä", // suomi / Finnish - "", // Polski / Polish - "Celdas rellenadas", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Symmetric givens", // English - "Vorgegebene Zahlen symmetrisch anordnen", // Deutsch / German - "", // Slovenski / Slovenian - "Cifre simmetriche assegnate", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Chiffre donné symétrique", // Français / French - "", // Norsk / Norwegian - "Järjestä annetut symmetrisesti", // suomi / Finnish - "", // Polski / Polish - "Números simétricos rellenados", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Mark errors", // English - "Fehler markieren", // Deutsch / German - "", // Slovenski / Slovenian - "Segna errori", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Marquer les erreurs", // Français / French - "", // Norsk / Norwegian - "Merkitse virheet", // suomi / Finnish - "", // Polski / Polish - "Marcar errores", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Mark ambiguous numbers", // English - "Unklare Zahlen markieren", // Deutsch / German - "", // Slovenski / Slovenian - "Segna numeri ambigui", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Marquer les chiffres anbigus", // Français / French - "", // Norsk / Norwegian - "Merkitse epävarmat", // suomi / Finnish - "", // Polski / Polish - "Marcar números ambiguos", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Show possible numbers as pattern", // English - "Mögliche Zahlen als Muster anzeigen", // Deutsch / German - "", // Slovenski / Slovenian - "Mostra num. possibili in valori", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Afficher les chiffres possible comme modèle", // Français / French - "", // Norsk / Norwegian - "Näytä mahdolliset kuviona", // suomi / Finnish - "", // Polski / Polish - "Mostrar posibles núm. como patrón", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Show possible numbers as digits", // English - "Mögliche Zahlen als Ziffern anzeigen", // Deutsch / German - "", // Slovenski / Slovenian - "Mostra num. possibili in cifre", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Afficher les chiffres possible comme chiffre", // Français / French - "", // Norsk / Norwegian - "Näytä mahdolliset numeroina", // suomi / Finnish - "", // Polski / Polish - "Mostrar posibles núm. como dígitos", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Clear marks on reset", // English - "Markierungen löschen beim Reset", // Deutsch / German - "", // Slovenski / Slovenian - "Pulisci segni al riavvio", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Effacer les marques lors de la mise à zéro", // Français / French - "", // Norsk / Norwegian - "Poista merkinnät aloitettaessa", // suomi / Finnish - "", // Polski / Polish - "Quitar marcas al reiniciar", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Key Red", // English - "Taste Rot", // Deutsch / German - "", // Slovenski / Slovenian - "Tasto Rosso", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Bouton rouge", // Français / French - "", // Norsk / Norwegian - "Punainen näppäin", // suomi / Finnish - "", // Polski / Polish - "Botón Rojo", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Key Green", // English - "Taste Grün", // Deutsch / German - "", // Slovenski / Slovenian - "Tasto Verde", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Bouton vert", // Français / French - "", // Norsk / Norwegian - "Vihreä näppäin", // suomi / Finnish - "", // Polski / Polish - "Botón Verde", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Key Yellow", // English - "Taste Gelb", // Deutsch / German - "", // Slovenski / Slovenian - "Tasto Giallo", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Bouton jaune", // Français / French - "", // Norsk / Norwegian - "Keltainen näppäin", // suomi / Finnish - "", // Polski / Polish - "Botón Amarillo", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Large font", // English - "Große Schriftart", // Deutsch / German - "", // Slovenski / Slovenian - "Caratteri grandi", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Grande police", // Français / French - "", // Norsk / Norwegian - "Suuri kirjasin", // suomi / Finnish - "", // Polski / Polish - "Fuente grande", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Large font height (pixel)", // English - "Große Schrifthöhe (pixel)", // Deutsch / German - "", // Slovenski / Slovenian - "Altezza car. grandi (pixel)", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Hauteur grande police (pixel)", // Français / French - "", // Norsk / Norwegian - "Suuren kirjasimen korkeus (pikseleitä)", // suomi / Finnish - "", // Polski / Polish - "Alto fuente grande (pixel)", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Large font width (pixel)", // English - "Große Schriftbreite (pixel)", // Deutsch / German - "", // Slovenski / Slovenian - "Larghezza car. grandi (pixel)", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Largeur grande police (pixel)", // Français / French - "", // Norsk / Norwegian - "Suuren kirjasimen leveys (pikseleitä)", // suomi / Finnish - "", // Polski / Polish - "Ancho fuente grande (pixel)", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Small font", // English - "Kleine Schriftart", // Deutsch / German - "", // Slovenski / Slovenian - "Caratteri piccoli", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Petite police", // Français / French - "", // Norsk / Norwegian - "Pieni kirjasin", // suomi / Finnish - "", // Polski / Polish - "Fuente pequeña", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Small font height (pixel)", // English - "Kleine Schrifthöhe (pixel)", // Deutsch / German - "", // Slovenski / Slovenian - "Altezza car. piccoli (pixel)", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Hauteur petite police (pixel)", // Français / French - "", // Norsk / Norwegian - "Pienen kirjasimen korkeus (pikseleitä)", // suomi / Finnish - "", // Polski / Polish - "Alto fuente pequeña (pixel)", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Small font width (pixel)", // English - "Kleine Schriftbreite (pixel)", // Deutsch / German - "", // Slovenski / Slovenian - "Larghezza car. piccoli (pixel)", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Largeur petite police (pixel)", // Français / French - "", // Norsk / Norwegian - "Pienen kirjasimen leveys (pikseleitä)", // suomi / Finnish - "", // Polski / Polish - "Ancho fuente pequeña (pixel)", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Transparency (%)", // English - "Transparenz (%)", // Deutsch / German - "", // Slovenski / Slovenian - "Trasparenza (%)", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Transparence (%)", // Français / French - "", // Norsk / Norwegian - "Läpinäkyvyys (%)", // suomi / Finnish - "", // Polski / Polish - "Transparencia (%)", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { "Congratulations!\nPress OK to start a new puzzle", // English - "Herzlichen Glückwunsch!\nOK startet ein neues Puzzle", // Deutsch / German - "", // Slovenski / Slovenian - "Complimenti!\nPremi OK per iniziare una nuova partita", // Italiano / Italian - "", // Nederlands / Dutch - "", // Português / Portuguese - "Félicitation!\nAvec OK vous lancez un nouveau puzzle", // Français / French - "", // Norsk / Norwegian - "Onnittelut!\nValitse 'OK' aloittaaksesi uuden ristikon", // suomi / Finnish - "", // Polski / Polish - "¡Enhorabuena!\nPulse OK para iniciar un nuevo rompecabezas", // Español / Spanish - "", // ÅëëçíéêÜ / Greek - "", // Svenska / Swedish - "", // Românã / Romanian - "", // Magyar / Hungarian - "", // Català / Catalanian - "", // ÀãááÚØÙ / Russian - "", // Hrvatski / Croatian - "", // Eesti / Estonian - "", // Dansk / Danish - "", // Èesky / Czech - }, - { NULL } -}; - -#endif @@ -1,43 +0,0 @@ -/* - * Sudoku: A plug-in for the Video Disk Recorder - * - * Copyright (C) 2005-2008, Thomas Günther <tom@toms-cafe.de> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef VDR_SUDOKU_I18N_H -#define VDR_SUDOKU_I18N_H - -#include "sudoku.h" -#include <vdr/i18n.h> -#include <vdr/config.h> - - -#if VDRVERSNUM < 10507 - -#define trNOOP(s) (s) -#define trVDR(s) tr(s) - -namespace SudokuPlugin -{ - - extern const tI18nPhrase Phrases[]; - -} // namespace SudokuPlugin - -#endif - -#endif // VDR_SUDOKU_I18N_H @@ -1,7 +1,7 @@ /* * Sudoku: A plug-in for the Video Disk Recorder * - * Copyright (C) 2008, Thomas Günther <tom@toms-cafe.de> + * Copyright (C) 2008-2010, Thomas Günther <tom@toms-cafe.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ */ #include "list.h" -#include "i18n.h" +#include <vdr/i18n.h> #include <vdr/config.h> #include <vdr/osdbase.h> #include <vdr/osd.h> @@ -27,12 +27,6 @@ #include <vdr/interface.h> #include <assert.h> -// Compatibility to older vdr versions -#if VDRVERSNUM < 10511 - #define cMenuEditStrItem(n, v, l) cMenuEditStrItem((n), (v), (l),\ - trVDR(FileNameChars)) -#endif - using namespace SudokuPlugin; @@ -1,7 +1,7 @@ /* * Sudoku: A plug-in for the Video Disk Recorder * - * Copyright (C) 2005-2008, Thomas Günther <tom@toms-cafe.de> + * Copyright (C) 2005-2010, Thomas Günther <tom@toms-cafe.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,7 +24,7 @@ #include "bitmap.h" #include "commands.h" #include "list.h" -#include "i18n.h" +#include <vdr/i18n.h> #include <vdr/config.h> #include <vdr/osdbase.h> #include <vdr/osd.h> @@ -74,15 +74,10 @@ Menu::Menu(cPlugin* plugin, const SetupData& setup, PuzzleGame*& puzzle) : info = NULL; infoText = NULL; new_puzzle_request = false; -#if VDRVERSNUM >= 10504 maxi_font = cFont::CreateFont(setup.maxi_font, setup.maxi_font_height, setup.maxi_font_width); mini_font = cFont::CreateFont(setup.mini_font, setup.mini_font_height, setup.mini_font_width); -#else - maxi_font = cFont::GetFont(fontFix); - mini_font = NULL; -#endif command_menu = NULL; list_menu = NULL; setup_menu = NULL; @@ -95,10 +90,8 @@ Menu::~Menu() delete setup_menu; delete list_menu; delete command_menu; -#if VDRVERSNUM >= 10504 delete maxi_font; delete mini_font; -#endif delete info; delete osd; } @@ -163,14 +156,12 @@ eOSState Menu::ProcessKey(eKeys key) if (key == kOk) Setup.Save(); DELETENULL(setup_menu); -#if VDRVERSNUM >= 10504 DELETENULL(maxi_font); DELETENULL(mini_font); maxi_font = cFont::CreateFont(setup.maxi_font, setup.maxi_font_height, setup.maxi_font_width); mini_font = cFont::CreateFont(setup.mini_font, setup.mini_font_height, setup.mini_font_width); -#endif Show(); } return state; @@ -401,14 +392,12 @@ void Menu::paint() osd->DrawRectangle(x3, y3, x4, y4, bg); } -#if VDRVERSNUM >= 10504 if (setup.show_possibles_digits) { char txt[2] = { '0' + n, 0 }; osd->DrawText(x3, y3, txt, fg, bg, mini_font, CELL_SIZE / RDIM, CELL_SIZE / RDIM, taCenter); } -#endif } } } @@ -1,7 +1,7 @@ /* * Sudoku: A plug-in for the Video Disk Recorder * - * Copyright (C) 2005-2008, Thomas Günther <tom@toms-cafe.de> + * Copyright (C) 2005-2010, Thomas Günther <tom@toms-cafe.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ #include "setup.h" #include "commands.h" -#include "i18n.h" +#include <vdr/i18n.h> #include <strings.h> using namespace SudokuPlugin; @@ -44,14 +44,12 @@ SetupData::SetupData() key_red = CommandList::key_red_default_index(); key_green = CommandList::key_green_default_index(); key_yellow = CommandList::key_yellow_default_index(); -#if VDRVERSNUM >= 10504 strcpy(maxi_font, DefaultFontOsd); maxi_font_height = 31; maxi_font_width = 42; strcpy(mini_font, DefaultFontOsd); mini_font_height = 10; mini_font_width = 14; -#endif transparency = 50; } @@ -83,7 +81,6 @@ bool SetupData::parse(const char* name, const char* value) key_green = cl.id_to_index(atoi(value), cl.key_green_default_index()); else if (!strcasecmp(name, "KeyYellow")) key_yellow = cl.id_to_index(atoi(value), cl.key_yellow_default_index()); -#if VDRVERSNUM >= 10504 else if (!strcasecmp(name, "MaxiFont")) Utf8Strn0Cpy(maxi_font, value, MAXFONTNAME); else if (!strcasecmp(name, "MaxiFontHeight")) @@ -96,7 +93,6 @@ bool SetupData::parse(const char* name, const char* value) mini_font_height = atoi(value); else if (!strcasecmp(name, "MiniFontWidth")) mini_font_width = atoi(value); -#endif else if (!strcasecmp(name, "Transparency")) transparency = atoi(value); else @@ -111,14 +107,12 @@ bool SetupData::parse(const char* name, const char* value) SetupPage::SetupPage(SetupData& setup) : setup(setup), data(setup) { -#if VDRVERSNUM >= 10504 cFont::GetAvailableFontNames(&maxi_font_names); cFont::GetAvailableFontNames(&mini_font_names); maxi_font_names.Insert(strdup(DefaultFontOsd)); mini_font_names.Insert(strdup(DefaultFontOsd)); maxi_font_index = max(0, maxi_font_names.Find(data.maxi_font)); mini_font_index = max(0, mini_font_names.Find(data.mini_font)); -#endif Add(new cMenuEditIntItem(tr("Givens count"), &data.givens_count, 26, 81)); Add(new cMenuEditBoolItem(tr("Symmetric givens"), &data.symmetric)); @@ -127,10 +121,8 @@ SetupPage::SetupPage(SetupData& setup) : &data.mark_ambiguous)); Add(new cMenuEditBoolItem(tr("Show possible numbers as pattern"), &data.show_possibles_pattern)); -#if VDRVERSNUM >= 10504 Add(new cMenuEditBoolItem(tr("Show possible numbers as digits"), &data.show_possibles_digits)); -#endif Add(new cMenuEditBoolItem(tr("Clear marks on reset"), &data.clear_marks)); Add(new cMenuEditStraItem(tr("Key Red"), &data.key_red, CommandList::count(), CommandList::texts())); @@ -138,7 +130,6 @@ SetupPage::SetupPage(SetupData& setup) : CommandList::count(), CommandList::texts())); Add(new cMenuEditStraItem(tr("Key Yellow"), &data.key_yellow, CommandList::count(), CommandList::texts())); -#if VDRVERSNUM >= 10504 Add(new cMenuEditStraItem(tr("Large font"), &maxi_font_index, maxi_font_names.Size(), &maxi_font_names[0])); Add(new cMenuEditIntItem(tr("Large font height (pixel)"), @@ -151,7 +142,6 @@ SetupPage::SetupPage(SetupData& setup) : &data.mini_font_height, 10, MAXFONTSIZE)); Add(new cMenuEditIntItem(tr("Small font width (pixel)"), &data.mini_font_width, 10, MAXFONTSIZE)); -#endif Add(new cMenuEditIntItem(tr("Transparency (%)"), &data.transparency, 0, 100)); } @@ -162,12 +152,10 @@ SetupPage::SetupPage(SetupData& setup) : */ void SetupPage::Store() { -#if VDRVERSNUM >= 10504 Utf8Strn0Cpy(data.maxi_font, maxi_font_names[maxi_font_index], sizeof(data.maxi_font)); Utf8Strn0Cpy(data.mini_font, mini_font_names[mini_font_index], sizeof(data.mini_font)); -#endif setup = data; SetupStore("GivensCount", setup.givens_count); @@ -180,13 +168,11 @@ void SetupPage::Store() SetupStore("KeyRed", CommandList::id(setup.key_red)); SetupStore("KeyGreen", CommandList::id(setup.key_green)); SetupStore("KeyYellow", CommandList::id(setup.key_yellow)); -#if VDRVERSNUM >= 10504 SetupStore("MaxiFont", setup.maxi_font); SetupStore("MaxiFontHeight", setup.maxi_font_height); SetupStore("MaxiFontWidth", setup.maxi_font_width); SetupStore("MiniFont", setup.mini_font); SetupStore("MiniFontHeight", setup.mini_font_height); SetupStore("MiniFontWidth", setup.mini_font_width); -#endif SetupStore("Transparency", setup.transparency); } @@ -1,7 +1,7 @@ /* * Sudoku: A plug-in for the Video Disk Recorder * - * Copyright (C) 2005-2008, Thomas Günther <tom@toms-cafe.de> + * Copyright (C) 2005-2010, Thomas Günther <tom@toms-cafe.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -46,14 +46,12 @@ namespace SudokuPlugin int key_red; int key_green; int key_yellow; -#if VDRVERSNUM >= 10504 char maxi_font[MAXFONTNAME]; int maxi_font_height; int maxi_font_width; char mini_font[MAXFONTNAME]; int mini_font_height; int mini_font_width; -#endif int transparency; /** Constructor */ @@ -71,10 +69,8 @@ namespace SudokuPlugin { SetupData& setup; SetupData data; -#if VDRVERSNUM >= 10504 cStringList maxi_font_names, mini_font_names; int maxi_font_index, mini_font_index; -#endif public: @@ -1,7 +1,7 @@ /* * Sudoku: A plug-in for the Video Disk Recorder * - * Copyright (C) 2005-2008, Thomas Günther <tom@toms-cafe.de> + * Copyright (C) 2005-2010, Thomas Günther <tom@toms-cafe.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,10 +22,14 @@ namespace Sudoku { class PuzzleGame; } #include "menu.h" #include "setup.h" -#include "i18n.h" +#include <vdr/i18n.h> #include <vdr/plugin.h> #include <vdr/config.h> +#if APIVERSNUM < 10600 +#error "VDR-1.6.0 API version or greater is required!" +#endif + /** 'Sudoku' is a VDR plugin to generate and solve Number Place puzzles. */ namespace SudokuPlugin @@ -88,9 +92,6 @@ using namespace SudokuPlugin; */ bool Plugin::Start() { -#if VDRVERSNUM < 10507 - RegisterI18n(Phrases); -#endif puzzle = NULL; return true; } |