[Scummvm-git-logs] scummvm master -> e9a1abb4f2ce7bd8a70e36958b0e9fd9652d5c8e
criezy
criezy at scummvm.org
Tue Nov 8 03:21:42 CET 2016
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
729264f116 I18N: Read language name preferably from custom 'X-Language-name' header
5e5bac2768 I18N: Fix language name for German translation
1f4494c0e6 I18N: Add 'X-Language-name' field to all translation files
7b44b9158b I18N: Update French translation
e9a1abb4f2 I18N: Regenerate translations data file
Commit: 729264f11608a953cf875e17deb0729d659e9846
https://github.com/scummvm/scummvm/commit/729264f11608a953cf875e17deb0729d659e9846
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-11-08T02:21:16Z
Commit Message:
I18N: Read language name preferably from custom 'X-Language-name' header
We have been abusing the 'Language' field to store the language name
that appears in the GUI for a translation. But this field is officially
supposed to store the language code, and most tools that edit po file
set it automatically. This has caused the language being changed by
mistake in the paste.
There is a provision for custom fields with a name starting with 'X-'
though. So Now, if defined, it will use the custom 'X-Language-name'
field, and fall back to 'Language' in case that custom field is not defined.
This should prevent the language being lost when not careful while
editing the translation.
Changed paths:
devtools/create_translations/po_parser.cpp
devtools/create_translations/po_parser.h
diff --git a/devtools/create_translations/po_parser.cpp b/devtools/create_translations/po_parser.cpp
index ecc3ba5..f1ad833 100644
--- a/devtools/create_translations/po_parser.cpp
+++ b/devtools/create_translations/po_parser.cpp
@@ -108,7 +108,7 @@ const char *PoMessageList::operator[](int index) const {
}
PoMessageEntryList::PoMessageEntryList(const char *lang) :
- _lang(NULL), _charset(NULL), _langName(NULL),
+ _lang(NULL), _charset(NULL), _langName(NULL), _langNameAlt(NULL),
_list(NULL), _size(0), _allocated(0)
{
_lang = new char[1 + strlen(lang)];
@@ -117,14 +117,15 @@ PoMessageEntryList::PoMessageEntryList(const char *lang) :
_charset = new char[1];
_charset[0] = '\0';
// Set default langName to lang
- _langName = new char[1 + strlen(lang)];
- strcpy(_langName, lang);
+ _langNameAlt = new char[1 + strlen(lang)];
+ strcpy(_langNameAlt, lang);
}
PoMessageEntryList::~PoMessageEntryList() {
delete[] _lang;
delete[] _charset;
delete[] _langName;
+ delete[] _langNameAlt;
for (int i = 0; i < _size; ++i)
delete _list[i];
delete[] _list;
@@ -134,11 +135,16 @@ void PoMessageEntryList::addMessageEntry(const char *translation, const char *me
if (*message == '\0') {
// This is the header.
// We get the charset and the language name from the translation string
- char *str = parseLine(translation, "Language:");
+ char *str = parseLine(translation, "X-Language-name:");
if (str != NULL) {
delete[] _langName;
_langName = str;
}
+ str = parseLine(translation, "Language:");
+ if (str != NULL) {
+ delete[] _langNameAlt;
+ _langNameAlt = str;
+ }
str = parseLine(translation, "charset=");
if (str != NULL) {
delete[] _charset;
@@ -236,7 +242,7 @@ const char *PoMessageEntryList::language() const {
}
const char *PoMessageEntryList::languageName() const {
- return _langName;
+ return _langName ? _langName : _langNameAlt;
}
const char *PoMessageEntryList::charset() const {
diff --git a/devtools/create_translations/po_parser.h b/devtools/create_translations/po_parser.h
index a3b1c9a..0c30517 100644
--- a/devtools/create_translations/po_parser.h
+++ b/devtools/create_translations/po_parser.h
@@ -96,6 +96,7 @@ private:
char *_lang;
char *_charset;
char *_langName;
+ char *_langNameAlt;
PoMessageEntry **_list;
int _size;
Commit: 5e5bac2768b65fc8ba18dd9c53b7f73662e6e7db
https://github.com/scummvm/scummvm/commit/5e5bac2768b65fc8ba18dd9c53b7f73662e6e7db
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-11-08T02:21:16Z
Commit Message:
I18N: Fix language name for German translation
The language name was recently changed to 'de' probably by
mistake. Instead of setting back the 'Language' field I used the
custom 'X-Language-name' field that is now used by the tool
to create the translation data file.
Changed paths:
po/de_DE.po
diff --git a/po/de_DE.po b/po/de_DE.po
index b3c4d16..747618d 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -18,6 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Poedit 1.8.11\n"
+"X-Language-name: Deutsch\n"
#: gui/about.cpp:94
#, c-format
Commit: 1f4494c0e60e83aafb49abbb1a298e6996150b83
https://github.com/scummvm/scummvm/commit/1f4494c0e60e83aafb49abbb1a298e6996150b83
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-11-08T02:21:16Z
Commit Message:
I18N: Add 'X-Language-name' field to all translation files
Changed paths:
po/be_BY.po
po/ca_ES.po
po/cs_CZ.po
po/da_DK.po
po/es_ES.po
po/eu.po
po/fi_FI.po
po/fr_FR.po
po/gl_ES.po
po/hu_HU.po
po/it_IT.po
po/nb_NO.po
po/nl_NL.po
po/nn_NO.po
po/pl_PL.po
po/pt_BR.po
po/ru_RU.po
po/sv_SE.po
po/uk_UA.po
po/zh-Latn_CN.po
diff --git a/po/be_BY.po b/po/be_BY.po
index b8a4a89..9cb16ce 100644
--- a/po/be_BY.po
+++ b/po/be_BY.po
@@ -18,6 +18,7 @@ msgstr ""
"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"
"X-Generator: Poedit 1.8.9\n"
+"X-Language-name: Belarusian\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/ca_ES.po b/po/ca_ES.po
index d488bcb..2e7341f 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -15,6 +15,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Language-name: Catalan\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 2a2c2ad..f01b440 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -19,6 +19,7 @@ msgstr ""
"X-Poedit-SourceCharset: iso-8859-2\n"
"X-Generator: Poedit 1.8.7.1\n"
"X-Poedit-Basepath: ..\n"
+"X-Language-name: Cesky\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/da_DK.po b/po/da_DK.po
index 7e29119..b5d42d3 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -17,6 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.6.6\n"
+"X-Language-name: Dansk\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/es_ES.po b/po/es_ES.po
index c7924d0..1e1d3f0 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -16,6 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.5\n"
+"X-Language-name: Espanol\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/eu.po b/po/eu.po
index 8b36bd1..9fdb54c 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -15,6 +15,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Language-name: Euskara\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/fi_FI.po b/po/fi_FI.po
index c0fd508..89aaf1c 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -16,6 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
+"X-Language-name: Suomi\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/fr_FR.po b/po/fr_FR.po
index c004943..ad1b148 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: ScummVM 1.8.0git\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.scummvm.org\n"
"POT-Creation-Date: 2016-11-05 12:43+0100\n"
-"PO-Revision-Date: 2016-09-05 21:34+0100\n"
+"PO-Revision-Date: 2016-11-08 02:08+0000\n"
"Last-Translator: Thierry Crozat <criezy at scummvm.org>\n"
"Language-Team: French <scummvm-devel at lists.scummvm.org>\n"
"Language: Francais\n"
@@ -17,6 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
"X-Generator: Poedit 1.8.6\n"
+"X-Language-name: Francais\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/gl_ES.po b/po/gl_ES.po
index 5b3acfb..c7c3051 100644
--- a/po/gl_ES.po
+++ b/po/gl_ES.po
@@ -16,6 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.6\n"
+"X-Language-name: Galego\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/hu_HU.po b/po/hu_HU.po
index c7dc2ba..59774fb 100755
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -17,6 +17,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Virtaal 0.7.1\n"
"X-Poedit-SourceCharset: iso-8859-1\n"
+"X-Language-name: Magyar\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/it_IT.po b/po/it_IT.po
index 0042ded..77448a0 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -15,6 +15,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Language-name: Italiano\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 3cfca37..7ebc23e 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -18,6 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-SourceCharset: iso-8859-1\n"
"X-Generator: Poedit 1.8.9\n"
+"X-Language-name: Norsk (bokmaal)\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 7d42702..2d46550 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -18,6 +18,7 @@ msgstr ""
"X-Generator: Poedit 1.8.11\n"
"X-Poedit-SourceCharset: iso-8859-1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Language-name: Nederlands\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 35b6f3f..43eec94 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -18,6 +18,7 @@ msgstr ""
"X-Poedit-SourceCharset: iso-8859-1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.8.7\n"
+"X-Language-name: Norsk (nynorsk)\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 67be97d..eda45ed 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -21,6 +21,7 @@ msgstr ""
"X-Poedit-Basepath: .\n"
"X-Poedit-Language: Polish\n"
"X-Poedit-Country: POLAND\n"
+"X-Language-name: Polski\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 08948b0..ef4cfd1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -19,6 +19,7 @@ msgstr ""
"X-Poedit-Language: Portuguese\n"
"X-Poedit-Country: BRAZIL\n"
"X-Poedit-SourceCharset: iso-8859-1\n"
+"X-Language-name: Portugues (Brasil)\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/ru_RU.po b/po/ru_RU.po
index df06a2c..ba31a8f 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -18,6 +18,7 @@ msgstr ""
"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"
"X-Generator: Poedit 1.8.9\n"
+"X-Language-name: Russian\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 7cbc144..cf3abd7 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -18,6 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-SourceCharset: iso-8859-1\n"
"X-Generator: Poedit 1.8.9\n"
+"X-Language-name: Svenska\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/uk_UA.po b/po/uk_UA.po
index a04dd6a..720ced6 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -18,6 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\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"
+"X-Language-name: Ukrainian\n"
#: gui/about.cpp:94
#, c-format
diff --git a/po/zh-Latn_CN.po b/po/zh-Latn_CN.po
index 9194e8c..ff9a1ce 100644
--- a/po/zh-Latn_CN.po
+++ b/po/zh-Latn_CN.po
@@ -16,6 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
+"X-Language-name: Chinese Pinyin (Mandarin)\n"
#: gui/about.cpp:94
#, c-format
Commit: 7b44b9158b5fa771495fe6309258674c8ed1f4f9
https://github.com/scummvm/scummvm/commit/7b44b9158b5fa771495fe6309258674c8ed1f4f9
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-11-08T02:21:16Z
Commit Message:
I18N: Update French translation
Changed paths:
po/fr_FR.po
diff --git a/po/fr_FR.po b/po/fr_FR.po
index ad1b148..95f258a 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: ScummVM 1.8.0git\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.scummvm.org\n"
"POT-Creation-Date: 2016-11-05 12:43+0100\n"
-"PO-Revision-Date: 2016-11-08 02:08+0000\n"
+"PO-Revision-Date: 2016-11-08 02:19+0000\n"
"Last-Translator: Thierry Crozat <criezy at scummvm.org>\n"
"Language-Team: French <scummvm-devel at lists.scummvm.org>\n"
-"Language: Francais\n"
+"Language: fr_FR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -845,9 +845,8 @@ msgid "the fullscreen setting could not be changed"
msgstr "le mode plein écran n'a pu être changé."
#: gui/options.cpp:486
-#, fuzzy
msgid "the filtering setting could not be changed"
-msgstr "le mode plein écran n'a pu être changé."
+msgstr "le mode de filtrage n'a pu être changé."
#: gui/options.cpp:809
msgid "Graphics mode:"
@@ -867,13 +866,14 @@ msgid "Fullscreen mode"
msgstr "Plein écran"
#: gui/options.cpp:838
-#, fuzzy
msgid "Filter graphics"
-msgstr "Utiliser les graphiques en couleurs"
+msgstr "Filtrer les graphiques"
#: gui/options.cpp:838
msgid "Use linear filtering when scaling graphics"
msgstr ""
+"Utiliser une interpolation bi-linéaire lors du changement d'échelle des "
+"graphiques"
#: gui/options.cpp:841
msgid "Aspect ratio correction"
@@ -1283,7 +1283,7 @@ msgstr ""
#: gui/options.cpp:1462
msgid "Apply"
-msgstr ""
+msgstr "Appliquer"
#: gui/options.cpp:1628
msgid "Failed to change cloud storage!"
@@ -1891,9 +1891,8 @@ msgid "Could not apply fullscreen setting."
msgstr "Impossible d'appliquer l'option plein écran."
#: engines/engine.cpp:373
-#, fuzzy
msgid "Could not apply filtering setting."
-msgstr "Impossible d'appliquer l'option plein écran."
+msgstr "Impossible d'appliquer l'option de filtrage."
#: engines/engine.cpp:473
msgid ""
@@ -2193,7 +2192,7 @@ msgstr "Mode Fen
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:710
#, c-format
msgid "Resolution: %dx%d"
-msgstr ""
+msgstr "Résolution : %dx%d"
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:731
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2338
@@ -2207,15 +2206,13 @@ msgstr "D
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2362
-#, fuzzy
msgid "Filtering enabled"
-msgstr "Clic Activé"
+msgstr "Filtrage Activé"
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:755
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2364
-#, fuzzy
msgid "Filtering disabled"
-msgstr "Clic Désactivé"
+msgstr "Filtrage Désactivé"
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:47
#: backends/graphics/wincesdl/wincesdl-graphics.cpp:88
@@ -3161,24 +3158,30 @@ msgid ""
"You're missing a Riven executable. The Windows executable is 'riven.exe' or "
"'rivendmo.exe'. "
msgstr ""
+"Il vous manque l'exécutable de Riven. L'exécutable pour Windows se nomme "
+"'rivent.exe' ou 'rivendmo.exe'."
#: engines/mohawk/riven.cpp:151
msgid ""
"Using the 'arcriven.z' installer file also works. In addition, you can use "
"the Mac 'Riven' executable."
msgstr ""
+"Utiliser le fichier archive 'arcriven.z' marche également. Vous pouvez "
+"également utiliser l'exécutable pour Mac qui se nomme 'Riven'."
#: engines/mohawk/riven.cpp:162
msgid ""
"You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
"works."
msgstr ""
+"Il vous manque le fichier 'extras.mhk'. Utiliser le fichier archive "
+"'arcriven.z' marche également."
#: engines/mohawk/riven_external.cpp:213
msgid ""
"Exploration beyond this point available only within the full version of\n"
"the game."
-msgstr ""
+msgstr "L'exploration au delà de ce point nécessite d'avoir le jeu complet."
#: engines/mohawk/riven_external.cpp:655
msgid ""
@@ -3188,6 +3191,12 @@ msgid ""
"the game. ScummVM cannot do that and\n"
"the site no longer exists."
msgstr ""
+"A ce point la démo de Riven vous\n"
+"demanderais si vous voulez ouvrir un\n"
+"navigateur web pour vous amener sur\n"
+"la page de Red Orb et acheter le jeu.\n"
+"ScummVM ne peut pas faire ça et le\n"
+"site n'existe plus."
#: engines/mohawk/mohawk.cpp:61
msgid "The game is paused. Press any key to continue."
Commit: e9a1abb4f2ce7bd8a70e36958b0e9fd9652d5c8e
https://github.com/scummvm/scummvm/commit/e9a1abb4f2ce7bd8a70e36958b0e9fd9652d5c8e
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-11-08T02:21:16Z
Commit Message:
I18N: Regenerate translations data file
Changed paths:
gui/themes/translations.dat
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 920ae5c..e57f42f 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
More information about the Scummvm-git-logs
mailing list