Skip to content

Commit

Permalink
Merge pull request #621 from Wedge009/bug_24357_fix
Browse files Browse the repository at this point in the history
Resolve translated logo images not being used (bug #24357)
  • Loading branch information
Vultraz committed Mar 19, 2016
2 parents df6bc83 + 6e83696 commit c36b96a
Show file tree
Hide file tree
Showing 27 changed files with 28 additions and 26 deletions.
2 changes: 2 additions & 0 deletions changelog
Expand Up @@ -92,6 +92,8 @@ Version 1.13.4+dev:
still work, but any future code should use wfl/wflend instead.
Use of the .fai file extension is still fine for FormulaAI code;
for other formula code in a separate file, .wfl is recommended instead.
* Miscellaneous and bug fixes:
* Resolve translated logo images not being used (bug #24357)

Version 1.13.4:
* Language and i18n:
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/af.po
Expand Up @@ -6156,7 +6156,7 @@ msgstr "Druk verlangde Kortpadsleutel"
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "af"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/ang.po
Expand Up @@ -5738,7 +5738,7 @@ msgstr ""
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "ang"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/ar.po
Expand Up @@ -6223,7 +6223,7 @@ msgstr "اضغط على المفتاح المُراد"
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "ar"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/ast.po
Expand Up @@ -5739,7 +5739,7 @@ msgstr ""
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "ast"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/bg.po
Expand Up @@ -6206,7 +6206,7 @@ msgstr "Натиснете желаният клавиш"
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "bg"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/ca.po
Expand Up @@ -6237,7 +6237,7 @@ msgstr "Premeu la tecla desitjada (o cancel·leu amb la tecla d'escapada)"
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "ca"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/ca_ES@valencia.po
Expand Up @@ -6235,7 +6235,7 @@ msgstr "Premeu la tecla desitjada (o cancel·leu amb la tecla d'escapada)"
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "ca@valencia,ca"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/da.po
Expand Up @@ -6234,7 +6234,7 @@ msgstr "Tryk ønsket genvejstast"
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "da,sv"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/el.po
Expand Up @@ -6078,7 +6078,7 @@ msgstr "Πατήστε τη Συντόμευση Πληκτρολογίου πο
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "el"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/eo.po
Expand Up @@ -6219,7 +6219,7 @@ msgstr "Premu klavon, kiun vi volas uzi"
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "eo"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/et.po
Expand Up @@ -6109,7 +6109,7 @@ msgstr "Vajuta soovitud kiirklahvi (Esc tühistab)"
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr "et_EE"
msgstr "et_EE,et"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/eu.po
Expand Up @@ -6147,7 +6147,7 @@ msgstr "Hautatutako lasterbidea sakatu"
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "eu"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/fur_IT.po
Expand Up @@ -5737,7 +5737,7 @@ msgstr ""
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "fur"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/ga.po
Expand Up @@ -6094,7 +6094,7 @@ msgstr ""
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr "ga_IE"
msgstr "ga_IE,ga"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/hr.po
Expand Up @@ -5739,7 +5739,7 @@ msgstr ""
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "hr"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/id.po
Expand Up @@ -6104,7 +6104,7 @@ msgstr "Tekan hotkey yang diinginkan (Esc membatalkan)"
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr "kode bahasa untuk sumber daya yang dilokalisir"
msgstr "id"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/is.po
Expand Up @@ -6254,7 +6254,7 @@ msgstr "Ýttu á ósksaðan flýtilykil (Esc hættir við)"
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "is"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/ko.po
Expand Up @@ -6100,7 +6100,7 @@ msgstr "원하는 단축키를 누르세요 (Esc는 취소)"
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "ko"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/lv.po
Expand Up @@ -6113,7 +6113,7 @@ msgstr "Nospied vēlamo karsto taustiņu (Esc atceļ)"
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr "lv_LV"
msgstr "lv_LV,lv"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/mk.po
Expand Up @@ -5813,7 +5813,7 @@ msgstr ""
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "mk"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/mr.po
Expand Up @@ -5737,7 +5737,7 @@ msgstr ""
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "mr"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/nb_NO.po
Expand Up @@ -6251,7 +6251,7 @@ msgstr "Trykk ønsket hurtigtast (Esc avbryter)"
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "nb,no"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/racv.po
Expand Up @@ -6228,7 +6228,7 @@ msgstr "Pulsa la tecla desijada"
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "racv"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/ro.po
Expand Up @@ -5870,7 +5870,7 @@ msgstr ""
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "ro"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/tl.po
Expand Up @@ -6023,7 +6023,7 @@ msgstr ""
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "tl"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down
2 changes: 1 addition & 1 deletion po/wesnoth-lib/tr.po
Expand Up @@ -6258,7 +6258,7 @@ msgstr "Klavye kısayolunu gir (Esc iptal eder)"
#. translate this message as "sv,da", while Danish as "da,sv".
#: src/image.cpp:452
msgid "language code for localized resources^en_US"
msgstr ""
msgstr "tr"

#: src/marked-up_text.cpp:443
msgid "The maximum text width is less than 1."
Expand Down

0 comments on commit c36b96a

Please sign in to comment.