[Scummvm-cvs-logs] SF.net SVN: scummvm:[52969] scummvm/trunk
criezy at users.sourceforge.net
criezy at users.sourceforge.net
Fri Oct 1 23:41:40 CEST 2010
Revision: 52969
http://scummvm.svn.sourceforge.net/scummvm/?rev=52969&view=rev
Author: criezy
Date: 2010-10-01 21:41:40 +0000 (Fri, 01 Oct 2010)
Log Message:
-----------
GUI: Fix bug #3075649 (Fonts not found with built-in theme)
When switching to a theme that do not have the fonts needed to properly
display the current language, it now revert to the previously used theme
and display an error message telling the user to change the language
first if he wants to use the theme he selected.
Modified Paths:
--------------
scummvm/trunk/common/translation.cpp
scummvm/trunk/common/translation.h
scummvm/trunk/gui/options.cpp
scummvm/trunk/gui/themes/translations.dat
scummvm/trunk/po/ca_ES.po
scummvm/trunk/po/de_DE.po
scummvm/trunk/po/es_ES.po
scummvm/trunk/po/fr_FR.po
scummvm/trunk/po/hu_HU.po
scummvm/trunk/po/it_IT.po
scummvm/trunk/po/ru_RU.po
scummvm/trunk/po/scummvm.pot
scummvm/trunk/po/uk_UA.po
Modified: scummvm/trunk/common/translation.cpp
===================================================================
--- scummvm/trunk/common/translation.cpp 2010-10-01 20:44:58 UTC (rev 52968)
+++ scummvm/trunk/common/translation.cpp 2010-10-01 21:41:40 UTC (rev 52969)
@@ -213,6 +213,12 @@
return _currentCharset.c_str();
}
+const char *TranslationManager::getCurrentLanguage() {
+ if (_currentLang == -1)
+ return "C";
+ return _langs[_currentLang].c_str();
+}
+
String TranslationManager::getTranslation(const String &message) {
return getTranslation(message.c_str());
}
@@ -471,6 +477,10 @@
const char *TranslationManager::getCurrentCharset() {
return "ASCII";
}
+
+const char *TranslationManager::getCurrentLanguage() {
+ return "C";
+}
#endif // USE_TRANSLATION
Modified: scummvm/trunk/common/translation.h
===================================================================
--- scummvm/trunk/common/translation.h 2010-10-01 20:44:58 UTC (rev 52968)
+++ scummvm/trunk/common/translation.h 2010-10-01 21:41:40 UTC (rev 52969)
@@ -151,6 +151,11 @@
*/
const char *getCurrentCharset();
+ /**
+ * Returns currently selected translation language
+ */
+ const char *getCurrentLanguage();
+
private:
#ifdef USE_TRANSLATION
/**
Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp 2010-10-01 20:44:58 UTC (rev 52968)
+++ scummvm/trunk/gui/options.cpp 2010-10-01 21:41:40 UTC (rev 52969)
@@ -1281,19 +1281,20 @@
Common::String theme = browser.getSelected();
// FIXME: Actually, any changes (including the theme change) should
// only become active *after* the options dialog has closed.
- Common::String charset = TransMan.getCurrentCharset();
+ Common::String lang = TransMan.getCurrentLanguage();
+ Common::String oldTheme = g_gui.theme()->getThemeId();
if (g_gui.loadNewTheme(theme)) {
- _curTheme->setLabel(g_gui.theme()->getThemeName());
- ConfMan.set("gui_theme", theme);
// If the charset has changed, it means the font were not found for the
// new theme. Since for the moment we do not support change of translation
// language without restarting, we let the user know about this.
- if (charset != TransMan.getCurrentCharset()) {
- MessageDialog error(
- "The theme you selected does not support your current language. You need to close "
- "ScummVM and when you start it again it will be using this new theme and english language."
- );
+ if (lang != TransMan.getCurrentLanguage()) {
+ TransMan.setLanguage(lang.c_str());
+ g_gui.loadNewTheme(oldTheme);
+ MessageDialog error(_("The theme you selected does not support your current language. If you want to use this theme you need to switch to another language first."));
error.runModal();
+ } else {
+ _curTheme->setLabel(g_gui.theme()->getThemeName());
+ ConfMan.set("gui_theme", theme);
}
}
draw();
Modified: scummvm/trunk/gui/themes/translations.dat
===================================================================
(Binary files differ)
Modified: scummvm/trunk/po/ca_ES.po
===================================================================
--- scummvm/trunk/po/ca_ES.po 2010-10-01 20:44:58 UTC (rev 52968)
+++ scummvm/trunk/po/ca_ES.po 2010-10-01 21:41:40 UTC (rev 52969)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ScummVM 1.3.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:02+0100\n"
+"POT-Creation-Date: 2010-10-01 22:28+0100\n"
"PO-Revision-Date: 2010-09-21 23:12+0100\n"
"Last-Translator: Jordi Vilalta Prat <jvprat at jvprat.com>\n"
"Language-Team: Catalan <scummvm-devel at lists.sf.net>\n"
@@ -877,6 +877,12 @@
msgid "Select directory for plugins"
msgstr "Seleccioneu el directori dels connectors"
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr "No hi ha data desada"
@@ -917,28 +923,28 @@
msgid "Select a Theme"
msgstr "Seleccioneu un Tema"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgid "Disabled GFX"
msgstr "GFX desactivats"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "GFX desactivats"
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard Renderer (16bpp)"
msgstr "Pintat est\xE0ndard (16bpp)"
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard (16bpp)"
msgstr "Est\xE0ndard (16bpp)"
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased Renderer (16bpp)"
msgstr "Pintat amb antialias (16bpp)"
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased (16bpp)"
msgstr "Amb antialias (16bpp)"
@@ -1312,11 +1318,11 @@
msgid "Disable power off"
msgstr "Desactiva l'apagat autom\xE0tic"
-#: backends/platform/iphone/osys_events.cpp:339
+#: backends/platform/iphone/osys_events.cpp:357
msgid "Touchpad mode enabled."
msgstr "Mode Touchpad activat."
-#: backends/platform/iphone/osys_events.cpp:341
+#: backends/platform/iphone/osys_events.cpp:359
msgid "Touchpad mode disabled."
msgstr "Mode Touchpad desactivat."
Modified: scummvm/trunk/po/de_DE.po
===================================================================
--- scummvm/trunk/po/de_DE.po 2010-10-01 20:44:58 UTC (rev 52968)
+++ scummvm/trunk/po/de_DE.po 2010-10-01 21:41:40 UTC (rev 52969)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ScummVM 1.2.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:02+0100\n"
+"POT-Creation-Date: 2010-10-01 22:28+0100\n"
"PO-Revision-Date: 2010-09-17 08:05+0100\n"
"Last-Translator: Simon Sawatzki <SimSaw at gmx.de>\n"
"Language-Team: Lothar Serra Mari <Lothar at Windowsbase.de> & Simon Sawatzki "
@@ -881,6 +881,12 @@
msgid "Select directory for plugins"
msgstr "Verzeichnis f\xFCr Erweiterungen ausw\xE4hlen"
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr "Kein Datum gespeichert"
@@ -921,28 +927,28 @@
msgid "Select a Theme"
msgstr "Thema ausw\xE4hlen"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgid "Disabled GFX"
msgstr "GFX ausgeschaltet"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "GFX ausgeschaltet"
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard Renderer (16bpp)"
msgstr "Standard-Renderer (16bpp)"
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard (16bpp)"
msgstr "Standard (16bpp)"
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased Renderer (16bpp)"
msgstr "Kantengl\xE4ttung (16bpp)"
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased (16bpp)"
msgstr "Kantengl\xE4ttung (16bpp)"
@@ -1316,11 +1322,11 @@
msgid "Disable power off"
msgstr "Stromsparmodus abschalten"
-#: backends/platform/iphone/osys_events.cpp:339
+#: backends/platform/iphone/osys_events.cpp:357
msgid "Touchpad mode enabled."
msgstr "Touchpad-Modus aktiviert."
-#: backends/platform/iphone/osys_events.cpp:341
+#: backends/platform/iphone/osys_events.cpp:359
msgid "Touchpad mode disabled."
msgstr "Touchpad-Modus ausgeschaltet."
Modified: scummvm/trunk/po/es_ES.po
===================================================================
--- scummvm/trunk/po/es_ES.po 2010-10-01 20:44:58 UTC (rev 52968)
+++ scummvm/trunk/po/es_ES.po 2010-10-01 21:41:40 UTC (rev 52969)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ScummVM 1.2.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:02+0100\n"
+"POT-Creation-Date: 2010-10-01 22:28+0100\n"
"PO-Revision-Date: 2010-09-25 17:11+0100\n"
"Last-Translator: Tom\xE1s Maidagan\n"
"Language-Team: \n"
@@ -873,6 +873,12 @@
msgid "Select directory for plugins"
msgstr "Selecciona el directorio de plugins"
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr "No hay fecha guardada"
@@ -913,28 +919,28 @@
msgid "Select a Theme"
msgstr "Selecciona un tema"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgid "Disabled GFX"
msgstr "GFX desactivados"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "GFX desactivados"
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard Renderer (16bpp)"
msgstr "Est\xE1ndar (16bpp)"
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard (16bpp)"
msgstr "Est\xE1ndar (16bpp)"
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased Renderer (16bpp)"
msgstr "Suavizado (16bpp)"
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased (16bpp)"
msgstr "Suavizado (16bpp)"
@@ -1308,11 +1314,11 @@
msgid "Disable power off"
msgstr "Desactivar apagado"
-#: backends/platform/iphone/osys_events.cpp:339
+#: backends/platform/iphone/osys_events.cpp:357
msgid "Touchpad mode enabled."
msgstr "Modo Touchpad activado."
-#: backends/platform/iphone/osys_events.cpp:341
+#: backends/platform/iphone/osys_events.cpp:359
msgid "Touchpad mode disabled."
msgstr "Modo Touchpad desactivado."
Modified: scummvm/trunk/po/fr_FR.po
===================================================================
--- scummvm/trunk/po/fr_FR.po 2010-10-01 20:44:58 UTC (rev 52968)
+++ scummvm/trunk/po/fr_FR.po 2010-10-01 21:41:40 UTC (rev 52969)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: ScummVM 1.2.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:02+0100\n"
-"PO-Revision-Date: 2010-09-19 23:54+0100\n"
+"POT-Creation-Date: 2010-10-01 22:28+0100\n"
+"PO-Revision-Date: 2010-10-01 22:12+0100\n"
"Last-Translator: Thierry Crozat <criezy at scummvm.org>\n"
"Language-Team: French <scummvm-devel at lists.sf.net>\n"
"Language: Francais\n"
@@ -878,6 +878,14 @@
msgid "Select directory for plugins"
msgstr "S\xE9lectionner le r\xE9pertoire des plugins"
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+"Le th\xE8me que vous avez s\xE9lection\xE9 ne support pas la langue fran\xE7aise. Si "
+"vous voulez l'utiliser vous devez d'abord changer de langue."
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr "Date inconnue"
@@ -918,28 +926,28 @@
msgid "Select a Theme"
msgstr "S\xE9lectionnez un Th\xE8me"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgid "Disabled GFX"
msgstr "GFX d\xE9sactiv\xE9"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "GFX d\xE9sactiv\xE9"
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard Renderer (16bpp)"
msgstr "Rendu Standard (16bpp)"
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard (16bpp)"
msgstr "Standard (16bpp)"
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased Renderer (16bpp)"
msgstr "Rendu Anti-cr\xE9nel\xE9 (16 bpp)"
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased (16bpp)"
msgstr "Anti-cr\xE9nel\xE9 (16 bpp)"
@@ -1313,11 +1321,11 @@
msgid "Disable power off"
msgstr "D\xE9sactiv\xE9 l'extinction"
-#: backends/platform/iphone/osys_events.cpp:339
+#: backends/platform/iphone/osys_events.cpp:357
msgid "Touchpad mode enabled."
msgstr "Mode touchpad activ\xE9"
-#: backends/platform/iphone/osys_events.cpp:341
+#: backends/platform/iphone/osys_events.cpp:359
msgid "Touchpad mode disabled."
msgstr "Mode touchpad d\xE9sactiv\xE9"
@@ -1625,34 +1633,39 @@
msgstr "Voulez-vous ex\xE9cuter une recherche automatique?"
#: backends/platform/wince/wince-sdl.cpp:990
-#, fuzzy
msgid "Map right click action"
-msgstr "Clic droit"
+msgstr "Affecter l'action 'Clic Droit'"
#: backends/platform/wince/wince-sdl.cpp:994
msgid "You must map a key to the 'Right Click' action to play this game"
msgstr ""
+"Vous devez affecter une touche \xE0 l'action de 'Clic Droit' pour pouvoir jouer "
+"\xE0 ce jeu"
#: backends/platform/wince/wince-sdl.cpp:1003
msgid "Map hide toolbar action"
-msgstr ""
+msgstr "Affecter l'action 'Cacher Bar d'Outils'"
#: backends/platform/wince/wince-sdl.cpp:1007
msgid "You must map a key to the 'Hide toolbar' action to play this game"
msgstr ""
+"Vous devez affecter une touche \xE0 l'action 'Cacher Bar d'Outils' pour pouvoir "
+"jouer \xE0 ce jeu"
#: backends/platform/wince/wince-sdl.cpp:1016
msgid "Map Zoom Up action (optional)"
-msgstr ""
+msgstr "Affecter l'action 'D\xE9zoomer' (optionnelle)"
#: backends/platform/wince/wince-sdl.cpp:1019
msgid "Map Zoom Down action (optional)"
-msgstr ""
+msgstr "Affecter l'action 'Zoomer' (optionnelle)"
#: backends/platform/wince/wince-sdl.cpp:1027
msgid ""
"Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory"
msgstr ""
+"Noubliez pas d'affecter une touche \xE0 l'action 'Cacher Bar d'Outils' pour "
+"pouvoir voir enti\xE8rement l'inventaire"
#~ msgid "Save Path: "
#~ msgstr "Sauvegardes:"
Modified: scummvm/trunk/po/hu_HU.po
===================================================================
--- scummvm/trunk/po/hu_HU.po 2010-10-01 20:44:58 UTC (rev 52968)
+++ scummvm/trunk/po/hu_HU.po 2010-10-01 21:41:40 UTC (rev 52969)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ScummVM VERSION\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:02+0100\n"
+"POT-Creation-Date: 2010-10-01 22:28+0100\n"
"PO-Revision-Date: 2009-11-25 07:42-0500\n"
"Last-Translator: Alex Bevilacqua <alexbevi at gmail.com>\n"
"Language-Team: Hungarian\n"
@@ -879,6 +879,12 @@
msgid "Select directory for plugins"
msgstr ""
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr ""
@@ -920,28 +926,28 @@
msgid "Select a Theme"
msgstr ""
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgid "Disabled GFX"
msgstr ""
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgctxt "lowres"
msgid "Disabled GFX"
msgstr ""
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard Renderer (16bpp)"
msgstr ""
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard (16bpp)"
msgstr ""
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased Renderer (16bpp)"
msgstr ""
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased (16bpp)"
msgstr ""
@@ -1314,11 +1320,11 @@
msgid "Disable power off"
msgstr ""
-#: backends/platform/iphone/osys_events.cpp:339
+#: backends/platform/iphone/osys_events.cpp:357
msgid "Touchpad mode enabled."
msgstr ""
-#: backends/platform/iphone/osys_events.cpp:341
+#: backends/platform/iphone/osys_events.cpp:359
msgid "Touchpad mode disabled."
msgstr ""
Modified: scummvm/trunk/po/it_IT.po
===================================================================
--- scummvm/trunk/po/it_IT.po 2010-10-01 20:44:58 UTC (rev 52968)
+++ scummvm/trunk/po/it_IT.po 2010-10-01 21:41:40 UTC (rev 52969)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ScummVM 1.2.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:02+0100\n"
+"POT-Creation-Date: 2010-10-01 22:28+0100\n"
"PO-Revision-Date: 2010-09-21 19:33+0100\n"
"Last-Translator: Matteo 'Maff' Angelino <matteo.maff at gmail dot com>\n"
"Language-Team: Italian\n"
@@ -873,6 +873,12 @@
msgid "Select directory for plugins"
msgstr "Seleziona la cartella dei plugin"
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr "Nessuna data salvata"
@@ -913,28 +919,28 @@
msgid "Select a Theme"
msgstr "Seleziona un tema"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgid "Disabled GFX"
msgstr "Grafica disattivata"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "Grafica disattivata"
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard Renderer (16bpp)"
msgstr "Renderer standard (16bpp)"
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard (16bpp)"
msgstr "Standard (16bpp)"
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased Renderer (16bpp)"
msgstr "Renderer con antialiasing (16bpp)"
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased (16bpp)"
msgstr "Con antialiasing (16bpp)"
@@ -1309,11 +1315,11 @@
msgid "Disable power off"
msgstr "Disattiva spegnimento in chiusura"
-#: backends/platform/iphone/osys_events.cpp:339
+#: backends/platform/iphone/osys_events.cpp:357
msgid "Touchpad mode enabled."
msgstr "Modalit\xE0 touchpad attivata."
-#: backends/platform/iphone/osys_events.cpp:341
+#: backends/platform/iphone/osys_events.cpp:359
msgid "Touchpad mode disabled."
msgstr "Modalit\xE0 touchpad disattivata."
Modified: scummvm/trunk/po/ru_RU.po
===================================================================
--- scummvm/trunk/po/ru_RU.po 2010-10-01 20:44:58 UTC (rev 52968)
+++ scummvm/trunk/po/ru_RU.po 2010-10-01 21:41:40 UTC (rev 52969)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ScummVM VERSION\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:02+0100\n"
+"POT-Creation-Date: 2010-10-01 22:28+0100\n"
"PO-Revision-Date: 2010-06-13 20:55+0300\n"
"Last-Translator: Eugene Sandulenko <sev at scummvm.org>\n"
"Language-Team: Russian\n"
@@ -883,6 +883,12 @@
msgid "Select directory for plugins"
msgstr "\xB2\xEB\xD1\xD5\xE0\xD8\xE2\xD5 \xD4\xD8\xE0\xD5\xDA\xE2\xDE\xE0\xD8\xEE \xE1 \xDF\xDB\xD0\xD3\xD8\xDD\xD0\xDC\xD8"
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr "\xB4\xD0\xE2\xD0 \xDD\xD5 \xD7\xD0\xDF\xD8\xE1\xD0\xDD\xD0"
@@ -923,30 +929,30 @@
msgid "Select a Theme"
msgstr "\xB2\xEB\xD1\xD5\xE0\xD8\xE2\xD5 \xE2\xD5\xDC\xE3"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgid "Disabled GFX"
msgstr "\xB1\xD5\xD7 \xD3\xE0\xD0\xE4\xD8\xDA\xD8"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
#, fuzzy
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "\xB1\xD5\xD7 \xD3\xE0\xD0\xE4\xD8\xDA\xD8"
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard Renderer (16bpp)"
msgstr "\xC1\xE2\xD0\xDD\xD4\xD0\xE0\xE2\xDD\xEB\xD9 \xE0\xD0\xE1\xE2\xD5\xE0\xD8\xD7\xD0\xE2\xDE\xE0 (16bpp)"
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
#, fuzzy
msgid "Standard (16bpp)"
msgstr "\xC1\xE2\xD0\xDD\xD4\xD0\xE0\xE2\xDD\xEB\xD9 \xE0\xD0\xE1\xE2\xD5\xE0\xD8\xD7\xD0\xE2\xDE\xE0 (16bpp)"
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased Renderer (16bpp)"
msgstr "\xC0\xD0\xE1\xE2\xD5\xE0\xD8\xD7\xD0\xE2\xDE\xE0 \xE1\xDE \xE1\xD3\xDB\xD0\xD6\xD8\xD2\xD0\xDD\xD8\xD5\xDC (16bpp)"
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
#, fuzzy
msgid "Antialiased (16bpp)"
msgstr "\xC0\xD0\xE1\xE2\xD5\xE0\xD8\xD7\xD0\xE2\xDE\xE0 \xE1\xDE \xE1\xD3\xDB\xD0\xD6\xD8\xD2\xD0\xDD\xD8\xD5\xDC (16bpp)"
@@ -1313,11 +1319,11 @@
msgid "Disable power off"
msgstr "\xB7\xD0\xDF\xE0\xD5\xE2\xD8\xE2\xEC \xD2\xEB\xDA\xDB\xEE\xE7\xD5\xDD\xD8\xD5"
-#: backends/platform/iphone/osys_events.cpp:339
+#: backends/platform/iphone/osys_events.cpp:357
msgid "Touchpad mode enabled."
msgstr "\xC0\xD5\xD6\xD8\xDC \xE2\xD0\xE7\xDF\xD0\xD4\xD0 \xD2\xDA\xDB\xEE\xE7\xD5\xDD."
-#: backends/platform/iphone/osys_events.cpp:341
+#: backends/platform/iphone/osys_events.cpp:359
msgid "Touchpad mode disabled."
msgstr "\xC0\xD5\xD6\xD8\xDC \xE2\xD0\xE7\xDF\xD0\xD4\xD0 \xD2\xEB\xDA\xDB\xEE\xE7\xD5\xDD."
Modified: scummvm/trunk/po/scummvm.pot
===================================================================
--- scummvm/trunk/po/scummvm.pot 2010-10-01 20:44:58 UTC (rev 52968)
+++ scummvm/trunk/po/scummvm.pot 2010-10-01 21:41:40 UTC (rev 52969)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: ScummVM 1.3.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:02+0100\n"
+"POT-Creation-Date: 2010-10-01 22:28+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -855,6 +855,12 @@
msgid "Select directory for plugins"
msgstr ""
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr ""
@@ -895,28 +901,28 @@
msgid "Select a Theme"
msgstr ""
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgid "Disabled GFX"
msgstr ""
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgctxt "lowres"
msgid "Disabled GFX"
msgstr ""
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard Renderer (16bpp)"
msgstr ""
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard (16bpp)"
msgstr ""
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased Renderer (16bpp)"
msgstr ""
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased (16bpp)"
msgstr ""
@@ -1281,11 +1287,11 @@
msgid "Disable power off"
msgstr ""
-#: backends/platform/iphone/osys_events.cpp:339
+#: backends/platform/iphone/osys_events.cpp:357
msgid "Touchpad mode enabled."
msgstr ""
-#: backends/platform/iphone/osys_events.cpp:341
+#: backends/platform/iphone/osys_events.cpp:359
msgid "Touchpad mode disabled."
msgstr ""
Modified: scummvm/trunk/po/uk_UA.po
===================================================================
--- scummvm/trunk/po/uk_UA.po 2010-10-01 20:44:58 UTC (rev 52968)
+++ scummvm/trunk/po/uk_UA.po 2010-10-01 21:41:40 UTC (rev 52969)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ScummVM VERSION\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-09-26 22:02+0100\n"
+"POT-Creation-Date: 2010-10-01 22:28+0100\n"
"PO-Revision-Date: 2010-09-21 18:46+0200\n"
"Last-Translator: Lubomyr Lisen\n"
"Language-Team: Ukrainian\n"
@@ -872,6 +872,12 @@
msgid "Select directory for plugins"
msgstr "\xB2\xD8\xD1\xD5\xE0\xF6\xE2\xEC \xDF\xD0\xDF\xDA\xE3 \xD7 \xDF\xDB\xD0\xD3\xD8\xDD\xD0\xDC\xD8"
+#: gui/options.cpp:1293
+msgid ""
+"The theme you selected does not support your current language. If you want "
+"to use this theme you need to switch to another language first."
+msgstr ""
+
#: gui/saveload.cpp:60 gui/saveload.cpp:241
msgid "No date saved"
msgstr "\xB4\xD0\xE2\xD0 \xDD\xD5 \xD7\xD0\xDF\xD8\xE1\xD0\xDD\xD0"
@@ -912,28 +918,28 @@
msgid "Select a Theme"
msgstr "\xB2\xD8\xD1\xD5\xE0\xF6\xE2\xEC \xE2\xD5\xDC\xE3"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgid "Disabled GFX"
msgstr "\xB1\xD5\xD7 \xD3\xE0\xD0\xE4\xF6\xDA\xD8"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:332
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "\xB1\xD5\xD7 \xD3\xE0\xD0\xE4\xF6\xDA\xD8"
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard Renderer (16bpp)"
msgstr "\xC1\xE2\xD0\xDD\xD4\xD0\xE0\xE2\xDD\xD8\xD9 \xE0\xD0\xE1\xE2\xD5\xE0\xD8\xD7\xD0\xE2\xDE\xE0 (16bpp)"
-#: gui/ThemeEngine.cpp:335
+#: gui/ThemeEngine.cpp:333
msgid "Standard (16bpp)"
msgstr "\xC1\xE2\xD0\xDD\xD4\xD0\xE0\xE2\xDD\xD8\xD9 \xE0\xD0\xE1\xE2\xD5\xE0\xD8\xD7\xD0\xE2\xDE\xE0 (16bpp)"
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased Renderer (16bpp)"
msgstr "\xC0\xD0\xE1\xE2\xD5\xE0\xD8\xD7\xD0\xE2\xDE\xE0 \xD7\xF6 \xD7\xD3\xDB\xD0\xD4\xD6\xE3\xD2\xD0\xDD\xDD\xEF\xDC (16bpp)"
-#: gui/ThemeEngine.cpp:337
+#: gui/ThemeEngine.cpp:335
msgid "Antialiased (16bpp)"
msgstr "\xC0\xD0\xE1\xE2\xD5\xE0\xD8\xD7\xD0\xE2\xDE\xE0 \xD7\xF6 \xD7\xD3\xDB\xD0\xD4\xD6\xE3\xD2\xD0\xDD\xDD\xEF\xDC (16bpp)"
@@ -1307,11 +1313,11 @@
msgid "Disable power off"
msgstr "\xB7\xD0\xD1\xDE\xE0\xDE\xDD\xD8\xE2\xD8 \xD2\xD8\xDC\xDA\xDD\xD5\xDD\xDD\xEF"
-#: backends/platform/iphone/osys_events.cpp:339
+#: backends/platform/iphone/osys_events.cpp:357
msgid "Touchpad mode enabled."
msgstr "\xC0\xD5\xD6\xD8\xDC \xE2\xD0\xE7\xDF\xD0\xD4\xE3 \xE3\xD2\xF6\xDC\xDA\xDD\xD5\xDD\xD8\xD9."
-#: backends/platform/iphone/osys_events.cpp:341
+#: backends/platform/iphone/osys_events.cpp:359
msgid "Touchpad mode disabled."
msgstr "\xC0\xD5\xD6\xD8\xDC \xE2\xD0\xE7\xDF\xD0\xD4\xE3 \xD2\xD8\xDC\xDA\xDD\xD5\xDD\xD8\xD9."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list