Remove support for translation of console messages.
In recent discussions on -devel it turned out, that this feature is rather superfluous and instead we should rather implement a proper error reporting in our GUI. I also removed the dependency on iconv along with this. svn-id: r50335
This commit is contained in:
Johannes Schickel
parent
9a0e2e9c46
commit
58fcda82f3
13 changed files with 1706 additions and 1982 deletions
|
|
@ -103,20 +103,20 @@ static const EnginePlugin *detectPlugin() {
|
|||
ConfMan.set("gameid", gameid);
|
||||
|
||||
// Query the plugins and find one that will handle the specified gameid
|
||||
printf(_t("User picked target '%s' (gameid '%s')...\n"), ConfMan.getActiveDomainName().c_str(), gameid.c_str());
|
||||
printf("%s", _t(" Looking for a plugin supporting this gameid... "));
|
||||
printf("User picked target '%s' (gameid '%s')...\n", ConfMan.getActiveDomainName().c_str(), gameid.c_str());
|
||||
printf("%s", " Looking for a plugin supporting this gameid... ");
|
||||
GameDescriptor game = EngineMan.findGame(gameid, &plugin);
|
||||
|
||||
if (plugin == 0) {
|
||||
printf("%s", _t("failed\n"));
|
||||
warning(_t("%s is an invalid gameid. Use the --list-games option to list supported gameid"), gameid.c_str());
|
||||
printf("failed\n");
|
||||
warning("%s is an invalid gameid. Use the --list-games option to list supported gameid", gameid.c_str());
|
||||
return 0;
|
||||
} else {
|
||||
printf("%s\n", plugin->getName());
|
||||
}
|
||||
|
||||
// FIXME: Do we really need this one?
|
||||
printf(_t(" Starting '%s'\n"), game.description().c_str());
|
||||
printf(" Starting '%s'\n", game.description().c_str());
|
||||
|
||||
return plugin;
|
||||
}
|
||||
|
|
@ -145,7 +145,7 @@ static Common::Error runGame(const EnginePlugin *plugin, OSystem &system, const
|
|||
//GUI::displayErrorDialog("ScummVM could not find any game in the specified directory!");
|
||||
const char *errMsg = _(Common::errorToString(err));
|
||||
|
||||
warning(_t("%s failed to instantiate engine: %s (target '%s', path '%s')"),
|
||||
warning("%s failed to instantiate engine: %s (target '%s', path '%s')",
|
||||
plugin->getName(),
|
||||
errMsg,
|
||||
ConfMan.getActiveDomainName().c_str(),
|
||||
|
|
|
|||
3181
common/messages.cpp
3181
common/messages.cpp
File diff suppressed because it is too large
Load diff
|
|
@ -30,10 +30,6 @@ DECLARE_SINGLETON(Common::TranslationManager)
|
|||
#include <locale.h>
|
||||
#endif
|
||||
|
||||
#ifdef USE_TERMCONV
|
||||
#include <langinfo.h>
|
||||
#endif
|
||||
|
||||
#ifdef USE_TRANSLATION
|
||||
#include "messages.cpp"
|
||||
#endif
|
||||
|
|
@ -45,7 +41,6 @@ namespace Common {
|
|||
|
||||
// Translation enabled
|
||||
|
||||
|
||||
TranslationManager::TranslationManager() {
|
||||
#ifdef USE_DETECTLANG
|
||||
// Activating current locale settings
|
||||
|
|
@ -78,20 +73,11 @@ TranslationManager::TranslationManager() {
|
|||
_syslang = "C";
|
||||
#endif // USE_DETECTLANG
|
||||
|
||||
#ifdef USE_TERMCONV
|
||||
_convmsg = NULL;
|
||||
_conversion = NULL;
|
||||
#endif // USE_TERMCONV
|
||||
|
||||
// Set the default language
|
||||
setLanguage("");
|
||||
}
|
||||
|
||||
TranslationManager::~TranslationManager() {
|
||||
#ifdef USE_TERMCONV
|
||||
iconv_close(_conversion);
|
||||
delete[] _convmsg;
|
||||
#endif // USE_TERMCONV
|
||||
}
|
||||
|
||||
void TranslationManager::setLanguage(const char *lang) {
|
||||
|
|
@ -99,21 +85,6 @@ void TranslationManager::setLanguage(const char *lang) {
|
|||
po2c_setlang(_syslang.c_str());
|
||||
else
|
||||
po2c_setlang(lang);
|
||||
|
||||
#ifdef USE_TERMCONV
|
||||
// Get the locale character set (for terminal output)
|
||||
const char *charset_term = nl_langinfo(CODESET);
|
||||
|
||||
// Get the messages character set
|
||||
const char *charset_po = po2c_getcharset();
|
||||
|
||||
// Delete previous conversion
|
||||
if (_conversion)
|
||||
iconv_close(_conversion);
|
||||
|
||||
// Initialize the conversion
|
||||
_conversion = iconv_open(charset_term, charset_po);
|
||||
#endif // USE_TERMCONV
|
||||
}
|
||||
|
||||
const char *TranslationManager::getTranslation(const char *message) {
|
||||
|
|
@ -124,63 +95,6 @@ String TranslationManager::getTranslation(const String &message) {
|
|||
return po2c_gettext(message.c_str());
|
||||
}
|
||||
|
||||
#ifdef USE_TERMCONV
|
||||
bool TranslationManager::convert(const char *message) {
|
||||
// Preparing conversion origin
|
||||
size_t len = strlen(message) + 1;
|
||||
#ifdef ICONV_USES_CONST
|
||||
const char **pmsg = &message;
|
||||
#else
|
||||
char *msgcpy = new char[len];
|
||||
strcpy(msgcpy, message);
|
||||
char *msg = msgcpy;
|
||||
char **pmsg = &msg;
|
||||
#endif
|
||||
|
||||
// Preparing conversion destination
|
||||
size_t len2 = _sizeconv;
|
||||
char *conv = _convmsg;
|
||||
|
||||
// Clean previous conversions
|
||||
iconv(_conversion, NULL, NULL, &conv, &len2);
|
||||
|
||||
// Do the real conversion
|
||||
size_t result = iconv(_conversion, pmsg, &len, &conv, &len2);
|
||||
|
||||
#ifndef ICONV_USES_CONST
|
||||
delete[] msgcpy;
|
||||
#endif
|
||||
|
||||
return result != ((size_t)-1);
|
||||
}
|
||||
#endif // USE_TERMCONV
|
||||
|
||||
const char *TranslationManager::convertTerm(const char *message) {
|
||||
#ifdef USE_TERMCONV
|
||||
size_t len = strlen(message) + 1;
|
||||
if (!_convmsg) {
|
||||
_sizeconv = len * 2;
|
||||
_convmsg = new char[_sizeconv];
|
||||
}
|
||||
|
||||
if (!convert(message)) {
|
||||
// Resizing the buffer
|
||||
delete[] _convmsg;
|
||||
_sizeconv = len * 2;
|
||||
_convmsg = new char[_sizeconv];
|
||||
|
||||
if (!convert(message)) {
|
||||
printf("Error while converting character sets\n");
|
||||
return "Error while converting character sets";
|
||||
}
|
||||
}
|
||||
|
||||
return _convmsg;
|
||||
#else // USE_TERMCONV
|
||||
return message;
|
||||
#endif // USE_TERMCONV
|
||||
}
|
||||
|
||||
const TLangArray TranslationManager::getSupportedLanguages() const {
|
||||
TLangArray languages;
|
||||
|
||||
|
|
@ -251,10 +165,6 @@ String TranslationManager::getTranslation(const String &message) {
|
|||
return message;
|
||||
}
|
||||
|
||||
const char *TranslationManager::convertTerm(const char *message) {
|
||||
return message;
|
||||
}
|
||||
|
||||
const TLangArray TranslationManager::getSupportedLanguages() const {
|
||||
return TLangArray();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,10 +28,6 @@
|
|||
#include "common/singleton.h"
|
||||
#include "common/str-array.h"
|
||||
|
||||
#ifdef USE_TERMCONV
|
||||
#include <iconv.h>
|
||||
#endif
|
||||
|
||||
namespace Common {
|
||||
|
||||
enum TranslationIDs {
|
||||
|
|
@ -60,17 +56,6 @@ typedef Array<TLanguage> TLangArray;
|
|||
* Message translation manager.
|
||||
*/
|
||||
class TranslationManager : public Singleton<TranslationManager> {
|
||||
private:
|
||||
Common::String _syslang;
|
||||
|
||||
#ifdef USE_TERMCONV
|
||||
iconv_t _conversion;
|
||||
char *_convmsg;
|
||||
int _sizeconv;
|
||||
|
||||
bool convert(const char *message);
|
||||
#endif // USE_TERMCONV
|
||||
|
||||
public:
|
||||
/**
|
||||
* The constructor detects the system language and sets default
|
||||
|
|
@ -129,30 +114,25 @@ public:
|
|||
*/
|
||||
String getTranslation(const String &message);
|
||||
|
||||
/**
|
||||
* Converts the message into the terminal character set (which may be
|
||||
* different than the GUI's "native" one).
|
||||
*/
|
||||
const char *convertTerm(const char *message);
|
||||
|
||||
/**
|
||||
* Returns a list of supported languages.
|
||||
*
|
||||
* @return The list of supported languages.
|
||||
*/
|
||||
const TLangArray getSupportedLanguages() const;
|
||||
|
||||
private:
|
||||
Common::String _syslang;
|
||||
};
|
||||
|
||||
} // End of namespace Common
|
||||
} // End of namespace Common
|
||||
|
||||
#define TransMan Common::TranslationManager::instance()
|
||||
|
||||
#ifdef USE_TRANSLATION
|
||||
#define _(str) TransMan.getTranslation(str)
|
||||
#define _t(str) TransMan.convertTerm(_(str))
|
||||
#else
|
||||
#define _(str) str
|
||||
#define _t(str) str
|
||||
#endif
|
||||
|
||||
#define _s(str) str
|
||||
|
|
|
|||
31
configure
vendored
31
configure
vendored
|
|
@ -2342,36 +2342,7 @@ EOF
|
|||
|
||||
add_to_config_h_if_yes $_detectlang '#define USE_DETECTLANG'
|
||||
if test "$_detectlang" = yes ; then
|
||||
echo_n "with runtime language detection, "
|
||||
|
||||
cat > $TMPC << EOF
|
||||
#include <langinfo.h>
|
||||
#include <iconv.h>
|
||||
int main(void) { nl_langinfo(CODESET); iconv_open(0, 0); return 0; }
|
||||
EOF
|
||||
_termconv=no
|
||||
cc_check_no_clean $LDFLAGS $CXXFLAGS && _termconv=yes
|
||||
cc_check $LDFLAGS $CXXFLAGS -liconv && LIBS="$LIBS -liconv" && _termconv=yes
|
||||
|
||||
add_to_config_mk_if_yes $_termconv 'USE_TERMCONV = 1'
|
||||
add_to_config_h_if_yes $_termconv '#define USE_TERMCONV'
|
||||
if test "$_termconv" = yes ; then
|
||||
uses_const=no
|
||||
cat > $TMPC << EOF
|
||||
#include <iconv.h>
|
||||
int main(int argc, char **argv) {
|
||||
iconv_t iconvP;
|
||||
const char **inbuf = 0;
|
||||
iconv(iconvP, inbuf, 0, 0, 0);
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
cc_check $LDFLAGS $LIBS $CXXFLAGS && uses_const=yes
|
||||
add_to_config_h_if_yes $uses_const '#define ICONV_USES_CONST'
|
||||
echo "with terminal conversion)"
|
||||
else
|
||||
echo "without terminal conversion)"
|
||||
fi
|
||||
echo_n "with runtime language detection)"
|
||||
else
|
||||
echo "without runtime language detection)"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ GuiManager::GuiManager() : _redrawStatus(kRedrawDisabled),
|
|||
// Loading the theme failed, try to load the built-in theme
|
||||
if (!loadNewTheme("builtin", gfxMode)) {
|
||||
// Loading the built-in theme failed as well. Bail out
|
||||
error("%s", _t("Failed to load any GUI theme, aborting"));
|
||||
error("Failed to load any GUI theme, aborting");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
68
po/ca_ES.po
68
po/ca_ES.po
|
|
@ -7,14 +7,14 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ScummVM 1.2.0svn\n"
|
||||
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
|
||||
"POT-Creation-Date: 2010-06-26 18:15+0200\n"
|
||||
"POT-Creation-Date: 2010-06-26 20:02+0200\n"
|
||||
"PO-Revision-Date: 2010-06-26 16:45+0100\n"
|
||||
"Last-Translator: Jordi Vilalta Prat <jvprat@gmail.com>\n"
|
||||
"Language-Team: Catalan <scummvm-devel@lists.sf.net>\n"
|
||||
"Language: Catalan\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=iso-8859-1\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: Catalan\n"
|
||||
|
||||
#: gui/about.cpp:96
|
||||
#, c-format
|
||||
|
|
@ -48,10 +48,6 @@ msgstr "Cancel
|
|||
msgid "Choose"
|
||||
msgstr "Escull"
|
||||
|
||||
#: gui/GuiManager.cpp:76
|
||||
msgid "Failed to load any GUI theme, aborting"
|
||||
msgstr "No s'ha pogut carregar cap tema de la interfície d'usuari, avortant"
|
||||
|
||||
#: gui/GuiManager.cpp:102 backends/keymapper/remap-dialog.cpp:54
|
||||
msgid "Close"
|
||||
msgstr "Tanca"
|
||||
|
|
@ -757,38 +753,6 @@ msgstr "Pintat est
|
|||
msgid "Antialiased Renderer (16bpp)"
|
||||
msgstr "Pintat amb antialias (16bpp)"
|
||||
|
||||
#: base/main.cpp:106
|
||||
#, fuzzy, c-format
|
||||
msgid "User picked target '%s' (gameid '%s')...\n"
|
||||
msgstr ""
|
||||
"L'usuari ha seleccionat el target '%s' (identificador de joc '%s')...\n"
|
||||
|
||||
#: base/main.cpp:107
|
||||
msgid " Looking for a plugin supporting this gameid... "
|
||||
msgstr " Cercant un connector que suporti aquest identificador de joc... "
|
||||
|
||||
#: base/main.cpp:111
|
||||
msgid "failed\n"
|
||||
msgstr "ha fallat\n"
|
||||
|
||||
#: base/main.cpp:112
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s is an invalid gameid. Use the --list-games option to list supported gameid"
|
||||
msgstr ""
|
||||
"%s és un identificador de joc invàlid. Utilitzeu l'opció --list-games per "
|
||||
"llistar els identificadors de joc suportats"
|
||||
|
||||
#: base/main.cpp:119
|
||||
#, c-format
|
||||
msgid " Starting '%s'\n"
|
||||
msgstr " Iniciant '%s'\n"
|
||||
|
||||
#: base/main.cpp:148
|
||||
#, fuzzy, c-format
|
||||
msgid "%s failed to instantiate engine: %s (target '%s', path '%s')"
|
||||
msgstr "%s ha fallat l'iniciat del motor: %s (target '%s', camí '%s')"
|
||||
|
||||
#: base/main.cpp:205
|
||||
#, c-format
|
||||
msgid "Engine does not support debug level '%s'"
|
||||
|
|
@ -1394,6 +1358,34 @@ msgstr "Pantalla"
|
|||
msgid "Do you want to perform an automatic scan ?"
|
||||
msgstr "Voleu fer una cerca automàtica?"
|
||||
|
||||
#~ msgid "Failed to load any GUI theme, aborting"
|
||||
#~ msgstr "No s'ha pogut carregar cap tema de la interfície d'usuari, avortant"
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "User picked target '%s' (gameid '%s')...\n"
|
||||
#~ msgstr ""
|
||||
#~ "L'usuari ha seleccionat el target '%s' (identificador de joc '%s')...\n"
|
||||
|
||||
#~ msgid " Looking for a plugin supporting this gameid... "
|
||||
#~ msgstr " Cercant un connector que suporti aquest identificador de joc... "
|
||||
|
||||
#~ msgid "failed\n"
|
||||
#~ msgstr "ha fallat\n"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "%s is an invalid gameid. Use the --list-games option to list supported "
|
||||
#~ "gameid"
|
||||
#~ msgstr ""
|
||||
#~ "%s és un identificador de joc invàlid. Utilitzeu l'opció --list-games per "
|
||||
#~ "llistar els identificadors de joc suportats"
|
||||
|
||||
#~ msgid " Starting '%s'\n"
|
||||
#~ msgstr " Iniciant '%s'\n"
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "%s failed to instantiate engine: %s (target '%s', path '%s')"
|
||||
#~ msgstr "%s ha fallat l'iniciat del motor: %s (target '%s', camí '%s')"
|
||||
|
||||
#~ msgid "Chinese (Taiwan)"
|
||||
#~ msgstr "Xinès (Taiwan)"
|
||||
|
||||
|
|
|
|||
65
po/de_DE.po
65
po/de_DE.po
|
|
@ -7,15 +7,15 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ScummVM 1.2.0svn\n"
|
||||
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
|
||||
"POT-Creation-Date: 2010-06-26 18:15+0200\n"
|
||||
"POT-Creation-Date: 2010-06-26 20:02+0200\n"
|
||||
"PO-Revision-Date: 2010-06-23 19:30+0100\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: Lothar Serra Mari <Lothar@Windowsbase.de> & Simon Sawatzki "
|
||||
"<SimSaw@gmx.de>\n"
|
||||
"Language: Deutsch\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=iso-8859-1\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: Deutsch\n"
|
||||
"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
|
||||
#: gui/about.cpp:96
|
||||
|
|
@ -52,10 +52,6 @@ msgstr "Abbrechen"
|
|||
msgid "Choose"
|
||||
msgstr "Auswählen"
|
||||
|
||||
#: gui/GuiManager.cpp:76
|
||||
msgid "Failed to load any GUI theme, aborting"
|
||||
msgstr "Fehler: Konnte kein Benutzeroberflächen-Thema laden. Abbruch..."
|
||||
|
||||
#: gui/GuiManager.cpp:102 backends/keymapper/remap-dialog.cpp:54
|
||||
msgid "Close"
|
||||
msgstr "Schließen"
|
||||
|
|
@ -761,37 +757,6 @@ msgstr "Standard-Renderer (16bpp)"
|
|||
msgid "Antialiased Renderer (16bpp)"
|
||||
msgstr "Kantenglättung (16bpp)"
|
||||
|
||||
#: base/main.cpp:106
|
||||
#, c-format
|
||||
msgid "User picked target '%s' (gameid '%s')...\n"
|
||||
msgstr "Gewähltes Ziel: \"%s\" (Spielkennung \"%s\")...\n"
|
||||
|
||||
#: base/main.cpp:107
|
||||
msgid " Looking for a plugin supporting this gameid... "
|
||||
msgstr " Suche nach einer Erweiterung, die diese Spielkennung unterstützt..."
|
||||
|
||||
#: base/main.cpp:111
|
||||
msgid "failed\n"
|
||||
msgstr "fehlgeschlagen\n"
|
||||
|
||||
#: base/main.cpp:112
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s is an invalid gameid. Use the --list-games option to list supported gameid"
|
||||
msgstr ""
|
||||
"%s ist eine ungültige Spielkennung. Benutzen Sie die Option --list-games zum "
|
||||
"Anzeigen der unterstützten Spielkennungen."
|
||||
|
||||
#: base/main.cpp:119
|
||||
#, c-format
|
||||
msgid " Starting '%s'\n"
|
||||
msgstr " Starte \"%s\"\n"
|
||||
|
||||
#: base/main.cpp:148
|
||||
#, c-format
|
||||
msgid "%s failed to instantiate engine: %s (target '%s', path '%s')"
|
||||
msgstr "%s konnte Engine nicht starten: %s (Ziel \"%s\", Pfad \"%s\")"
|
||||
|
||||
#: base/main.cpp:205
|
||||
#, c-format
|
||||
msgid "Engine does not support debug level '%s'"
|
||||
|
|
@ -1404,6 +1369,32 @@ msgstr "Anzeige"
|
|||
msgid "Do you want to perform an automatic scan ?"
|
||||
msgstr "Möchten Sie eine automatische Durchsuchung vornehmen?"
|
||||
|
||||
#~ msgid "Failed to load any GUI theme, aborting"
|
||||
#~ msgstr "Fehler: Konnte kein Benutzeroberflächen-Thema laden. Abbruch..."
|
||||
|
||||
#~ msgid "User picked target '%s' (gameid '%s')...\n"
|
||||
#~ msgstr "Gewähltes Ziel: \"%s\" (Spielkennung \"%s\")...\n"
|
||||
|
||||
#~ msgid " Looking for a plugin supporting this gameid... "
|
||||
#~ msgstr ""
|
||||
#~ " Suche nach einer Erweiterung, die diese Spielkennung unterstützt..."
|
||||
|
||||
#~ msgid "failed\n"
|
||||
#~ msgstr "fehlgeschlagen\n"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "%s is an invalid gameid. Use the --list-games option to list supported "
|
||||
#~ "gameid"
|
||||
#~ msgstr ""
|
||||
#~ "%s ist eine ungültige Spielkennung. Benutzen Sie die Option --list-games "
|
||||
#~ "zum Anzeigen der unterstützten Spielkennungen."
|
||||
|
||||
#~ msgid " Starting '%s'\n"
|
||||
#~ msgstr " Starte \"%s\"\n"
|
||||
|
||||
#~ msgid "%s failed to instantiate engine: %s (target '%s', path '%s')"
|
||||
#~ msgstr "%s konnte Engine nicht starten: %s (Ziel \"%s\", Pfad \"%s\")"
|
||||
|
||||
#~ msgid "Ok"
|
||||
#~ msgstr "OK"
|
||||
|
||||
|
|
|
|||
68
po/fr_FR.po
68
po/fr_FR.po
|
|
@ -7,14 +7,14 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ScummVM 1.2.0svn\n"
|
||||
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
|
||||
"POT-Creation-Date: 2010-06-26 18:15+0200\n"
|
||||
"POT-Creation-Date: 2010-06-26 20:02+0200\n"
|
||||
"PO-Revision-Date: 2010-06-19 23:43+0100\n"
|
||||
"Last-Translator: Thierry Crozat <criezy@scummvm.org>\n"
|
||||
"Language-Team: French <scummvm-devel@lists.sf.net>\n"
|
||||
"Language: Francais\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=iso-8859-1\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: Francais\n"
|
||||
"Plural-Forms: nplurals=2; plural=n>1;\n"
|
||||
|
||||
#: gui/about.cpp:96
|
||||
|
|
@ -51,10 +51,6 @@ msgstr "Annuler"
|
|||
msgid "Choose"
|
||||
msgstr "Choisir"
|
||||
|
||||
#: gui/GuiManager.cpp:76
|
||||
msgid "Failed to load any GUI theme, aborting"
|
||||
msgstr "Aucun thème GUI n'a pu être chargé; abandon"
|
||||
|
||||
#: gui/GuiManager.cpp:102 backends/keymapper/remap-dialog.cpp:54
|
||||
msgid "Close"
|
||||
msgstr "Fermer"
|
||||
|
|
@ -758,39 +754,6 @@ msgstr "Standard (16bpp)"
|
|||
msgid "Antialiased Renderer (16bpp)"
|
||||
msgstr "Anti-crénelé (16 bpp)"
|
||||
|
||||
#: base/main.cpp:106
|
||||
#, c-format
|
||||
msgid "User picked target '%s' (gameid '%s')...\n"
|
||||
msgstr "L'utilisateur a choisi la cible '%s' (ID '%s')...\n"
|
||||
|
||||
#: base/main.cpp:107
|
||||
msgid " Looking for a plugin supporting this gameid... "
|
||||
msgstr "Recherche d'un plugin supportant cet ID..."
|
||||
|
||||
#: base/main.cpp:111
|
||||
msgid "failed\n"
|
||||
msgstr "Echec\n"
|
||||
|
||||
#: base/main.cpp:112
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s is an invalid gameid. Use the --list-games option to list supported gameid"
|
||||
msgstr ""
|
||||
"%s n'est pas un ID de jeu valide. Utilisez l'option --list-games pour "
|
||||
"obtenir la liste des ID reconnus"
|
||||
|
||||
#: base/main.cpp:119
|
||||
#, c-format
|
||||
msgid " Starting '%s'\n"
|
||||
msgstr "Démarrage de '%s'\n"
|
||||
|
||||
#: base/main.cpp:148
|
||||
#, c-format
|
||||
msgid "%s failed to instantiate engine: %s (target '%s', path '%s')"
|
||||
msgstr ""
|
||||
"Le plugin %s a échoué dans l'instanciation du moteur de jeu: %s (cible '%s', "
|
||||
"chemin '%s')"
|
||||
|
||||
#: base/main.cpp:205
|
||||
#, c-format
|
||||
msgid "Engine does not support debug level '%s'"
|
||||
|
|
@ -1417,6 +1380,33 @@ msgstr "Affichage"
|
|||
msgid "Do you want to perform an automatic scan ?"
|
||||
msgstr "Voulez-vous exécuter une recherche automatique?"
|
||||
|
||||
#~ msgid "Failed to load any GUI theme, aborting"
|
||||
#~ msgstr "Aucun thème GUI n'a pu être chargé; abandon"
|
||||
|
||||
#~ msgid "User picked target '%s' (gameid '%s')...\n"
|
||||
#~ msgstr "L'utilisateur a choisi la cible '%s' (ID '%s')...\n"
|
||||
|
||||
#~ msgid " Looking for a plugin supporting this gameid... "
|
||||
#~ msgstr "Recherche d'un plugin supportant cet ID..."
|
||||
|
||||
#~ msgid "failed\n"
|
||||
#~ msgstr "Echec\n"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "%s is an invalid gameid. Use the --list-games option to list supported "
|
||||
#~ "gameid"
|
||||
#~ msgstr ""
|
||||
#~ "%s n'est pas un ID de jeu valide. Utilisez l'option --list-games pour "
|
||||
#~ "obtenir la liste des ID reconnus"
|
||||
|
||||
#~ msgid " Starting '%s'\n"
|
||||
#~ msgstr "Démarrage de '%s'\n"
|
||||
|
||||
#~ msgid "%s failed to instantiate engine: %s (target '%s', path '%s')"
|
||||
#~ msgstr ""
|
||||
#~ "Le plugin %s a échoué dans l'instanciation du moteur de jeu: %s (cible "
|
||||
#~ "'%s', chemin '%s')"
|
||||
|
||||
#~ msgid "Ok"
|
||||
#~ msgstr "Ok"
|
||||
|
||||
|
|
|
|||
37
po/hu_HU.po
37
po/hu_HU.po
|
|
@ -7,14 +7,14 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ScummVM VERSION\n"
|
||||
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
|
||||
"POT-Creation-Date: 2010-06-26 18:15+0200\n"
|
||||
"POT-Creation-Date: 2010-06-26 20:02+0200\n"
|
||||
"PO-Revision-Date: 2009-11-25 07:42-0500\n"
|
||||
"Last-Translator: Alex Bevilacqua <alexbevi@gmail.com>\n"
|
||||
"Language-Team: Hungarian\n"
|
||||
"Language: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=cp1250\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: \n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
|
||||
#: gui/about.cpp:96
|
||||
|
|
@ -49,10 +49,6 @@ msgstr ""
|
|||
msgid "Choose"
|
||||
msgstr ""
|
||||
|
||||
#: gui/GuiManager.cpp:76
|
||||
msgid "Failed to load any GUI theme, aborting"
|
||||
msgstr ""
|
||||
|
||||
#: gui/GuiManager.cpp:102 backends/keymapper/remap-dialog.cpp:54
|
||||
msgid "Close"
|
||||
msgstr ""
|
||||
|
|
@ -742,35 +738,6 @@ msgstr ""
|
|||
msgid "Antialiased Renderer (16bpp)"
|
||||
msgstr ""
|
||||
|
||||
#: base/main.cpp:106
|
||||
#, c-format
|
||||
msgid "User picked target '%s' (gameid '%s')...\n"
|
||||
msgstr ""
|
||||
|
||||
#: base/main.cpp:107
|
||||
msgid " Looking for a plugin supporting this gameid... "
|
||||
msgstr ""
|
||||
|
||||
#: base/main.cpp:111
|
||||
msgid "failed\n"
|
||||
msgstr ""
|
||||
|
||||
#: base/main.cpp:112
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s is an invalid gameid. Use the --list-games option to list supported gameid"
|
||||
msgstr ""
|
||||
|
||||
#: base/main.cpp:119
|
||||
#, c-format
|
||||
msgid " Starting '%s'\n"
|
||||
msgstr ""
|
||||
|
||||
#: base/main.cpp:148
|
||||
#, c-format
|
||||
msgid "%s failed to instantiate engine: %s (target '%s', path '%s')"
|
||||
msgstr ""
|
||||
|
||||
#: base/main.cpp:205
|
||||
#, c-format
|
||||
msgid "Engine does not support debug level '%s'"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ POTFILE := $(srcdir)/po/scummvm.pot
|
|||
POFILES := $(wildcard $(srcdir)/po/*.po)
|
||||
|
||||
updatepot:
|
||||
xgettext -f $(srcdir)/po/POTFILES -D $(srcdir) -d scummvm --c++ -k_ -k_t -k_s -o $(POTFILE) \
|
||||
xgettext -f $(srcdir)/po/POTFILES -D $(srcdir) -d scummvm --c++ -k_ -k_s -o $(POTFILE) \
|
||||
"--copyright-holder=ScummVM Team" --package-name=ScummVM \
|
||||
--package-version=$(VERSION) --msgid-bugs-address=scummvm-devel@lists.sf.net -o $(POTFILE)_
|
||||
|
||||
|
|
|
|||
68
po/ru_RU.po
68
po/ru_RU.po
|
|
@ -7,16 +7,16 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ScummVM VERSION\n"
|
||||
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
|
||||
"POT-Creation-Date: 2010-06-26 18:15+0200\n"
|
||||
"POT-Creation-Date: 2010-06-26 20:02+0200\n"
|
||||
"PO-Revision-Date: 2010-06-13 20:55+0300\n"
|
||||
"Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n"
|
||||
"Language-Team: Russian\n"
|
||||
"Language: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=cp1251\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: \n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%"
|
||||
"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n"
|
||||
"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
|
||||
#: gui/about.cpp:96
|
||||
#, fuzzy, c-format
|
||||
|
|
@ -52,10 +52,6 @@ msgstr "
|
|||
msgid "Choose"
|
||||
msgstr "Âûáðàòü"
|
||||
|
||||
#: gui/GuiManager.cpp:76
|
||||
msgid "Failed to load any GUI theme, aborting"
|
||||
msgstr "Íå óäàëîñü çàãðóçèòü òåìó GUI, ïðåêðàùàþ ðàáîòó"
|
||||
|
||||
#: gui/GuiManager.cpp:102 backends/keymapper/remap-dialog.cpp:54
|
||||
msgid "Close"
|
||||
msgstr "Çàêðûòü"
|
||||
|
|
@ -755,37 +751,6 @@ msgstr "
|
|||
msgid "Antialiased Renderer (16bpp)"
|
||||
msgstr "Ðàñòåðèçàòîð ñî ñãëàæèâàíèåì (16bpp)"
|
||||
|
||||
#: base/main.cpp:106
|
||||
#, c-format
|
||||
msgid "User picked target '%s' (gameid '%s')...\n"
|
||||
msgstr "Ïîëüçîâàòåëü âûáðàë öåëü'%s' (gameid '%s')...\n"
|
||||
|
||||
#: base/main.cpp:107
|
||||
msgid " Looking for a plugin supporting this gameid... "
|
||||
msgstr " Èùó ïëàãèí ñ ïîääåðæêîé ýòîãî gameid... "
|
||||
|
||||
#: base/main.cpp:111
|
||||
msgid "failed\n"
|
||||
msgstr "íå óäàëîñü\n"
|
||||
|
||||
#: base/main.cpp:112
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s is an invalid gameid. Use the --list-games option to list supported gameid"
|
||||
msgstr ""
|
||||
"Íåâåðíûé gameid %s. Èñïîëüçóéòå îïöèþ --list-games äëÿ ïðîñìîòðà ñïèñêà "
|
||||
"ïîääåðæèâàåìûõ gameid"
|
||||
|
||||
#: base/main.cpp:119
|
||||
#, c-format
|
||||
msgid " Starting '%s'\n"
|
||||
msgstr " Çàïóñêàþ '%s'\n"
|
||||
|
||||
#: base/main.cpp:148
|
||||
#, c-format
|
||||
msgid "%s failed to instantiate engine: %s (target '%s', path '%s')"
|
||||
msgstr "%s íå ñìîã çàïóñòèòü äâèæîê: %s (öåëü '%s', ïóòü '%s')"
|
||||
|
||||
#: base/main.cpp:205
|
||||
#, c-format
|
||||
msgid "Engine does not support debug level '%s'"
|
||||
|
|
@ -1398,6 +1363,31 @@ msgstr "
|
|||
msgid "Do you want to perform an automatic scan ?"
|
||||
msgstr "Âû õîòèòå ïðîèçâåñòè àâòîìàòè÷åñêèé ïîèñê?"
|
||||
|
||||
#~ msgid "Failed to load any GUI theme, aborting"
|
||||
#~ msgstr "Íå óäàëîñü çàãðóçèòü òåìó GUI, ïðåêðàùàþ ðàáîòó"
|
||||
|
||||
#~ msgid "User picked target '%s' (gameid '%s')...\n"
|
||||
#~ msgstr "Ïîëüçîâàòåëü âûáðàë öåëü'%s' (gameid '%s')...\n"
|
||||
|
||||
#~ msgid " Looking for a plugin supporting this gameid... "
|
||||
#~ msgstr " Èùó ïëàãèí ñ ïîääåðæêîé ýòîãî gameid... "
|
||||
|
||||
#~ msgid "failed\n"
|
||||
#~ msgstr "íå óäàëîñü\n"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "%s is an invalid gameid. Use the --list-games option to list supported "
|
||||
#~ "gameid"
|
||||
#~ msgstr ""
|
||||
#~ "Íåâåðíûé gameid %s. Èñïîëüçóéòå îïöèþ --list-games äëÿ ïðîñìîòðà ñïèñêà "
|
||||
#~ "ïîääåðæèâàåìûõ gameid"
|
||||
|
||||
#~ msgid " Starting '%s'\n"
|
||||
#~ msgstr " Çàïóñêàþ '%s'\n"
|
||||
|
||||
#~ msgid "%s failed to instantiate engine: %s (target '%s', path '%s')"
|
||||
#~ msgstr "%s íå ñìîã çàïóñòèòü äâèæîê: %s (öåëü '%s', ïóòü '%s')"
|
||||
|
||||
#~ msgid "Ok"
|
||||
#~ msgstr "Ok"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,10 +8,11 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ScummVM 1.2.0svn\n"
|
||||
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
|
||||
"POT-Creation-Date: 2010-06-26 18:15+0200\n"
|
||||
"POT-Creation-Date: 2010-06-26 20:02+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=CHARSET\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
@ -48,10 +49,6 @@ msgstr ""
|
|||
msgid "Choose"
|
||||
msgstr ""
|
||||
|
||||
#: gui/GuiManager.cpp:76
|
||||
msgid "Failed to load any GUI theme, aborting"
|
||||
msgstr ""
|
||||
|
||||
#: gui/GuiManager.cpp:102 backends/keymapper/remap-dialog.cpp:54
|
||||
msgid "Close"
|
||||
msgstr ""
|
||||
|
|
@ -734,35 +731,6 @@ msgstr ""
|
|||
msgid "Antialiased Renderer (16bpp)"
|
||||
msgstr ""
|
||||
|
||||
#: base/main.cpp:106
|
||||
#, c-format
|
||||
msgid "User picked target '%s' (gameid '%s')...\n"
|
||||
msgstr ""
|
||||
|
||||
#: base/main.cpp:107
|
||||
msgid " Looking for a plugin supporting this gameid... "
|
||||
msgstr ""
|
||||
|
||||
#: base/main.cpp:111
|
||||
msgid "failed\n"
|
||||
msgstr ""
|
||||
|
||||
#: base/main.cpp:112
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s is an invalid gameid. Use the --list-games option to list supported gameid"
|
||||
msgstr ""
|
||||
|
||||
#: base/main.cpp:119
|
||||
#, c-format
|
||||
msgid " Starting '%s'\n"
|
||||
msgstr ""
|
||||
|
||||
#: base/main.cpp:148
|
||||
#, c-format
|
||||
msgid "%s failed to instantiate engine: %s (target '%s', path '%s')"
|
||||
msgstr ""
|
||||
|
||||
#: base/main.cpp:205
|
||||
#, c-format
|
||||
msgid "Engine does not support debug level '%s'"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue