GunChleoc has proposed merging lp:~widelands-dev/widelands/fix-po-headers into lp:widelands.
Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix-po-headers/+merge/236365 This fixes language mismatches in a few po files. NOTE: Merge this before the next translations merge! I also noticed that "Report-Msgid-Bugs-To" in the .pot files is set to "[email protected]" We are allowed to specify an URL there instead; shall I replace this with "https://bugs.launchpad.net/widelands";? -- https://code.launchpad.net/~widelands-dev/widelands/fix-po-headers/+merge/236365 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-po-headers into lp:widelands.
=== modified file 'po/map_plateau.wmf/en_CA.po' --- po/map_plateau.wmf/en_CA.po 2014-09-19 06:02:41 +0000 +++ po/map_plateau.wmf/en_CA.po 2014-09-29 15:09:02 +0000 @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2014-09-19 06:00+0000\n" "X-Generator: Launchpad (build 17196)\n" -"Language: en\n" +"Language: en_CA\n" #: ../../maps/Plateau.wmf/scripting/texts.lua:28 #: ../../maps/Plateau.wmf/scripting/texts.lua:85 === modified file 'po/scenario_t01.wmf/sk.po' --- po/scenario_t01.wmf/sk.po 2014-09-19 06:02:41 +0000 +++ po/scenario_t01.wmf/sk.po 2014-09-29 15:09:02 +0000 @@ -16,9 +16,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" "X-Launchpad-Export-Date: 2014-09-19 05:48+0000\n" "X-Generator: Launchpad (build 17196)\n" -"X-Poedit-Country: czech republic\n" "Language: sk\n" -"X-Poedit-Language: czech\n" #: ../../campaigns/t01.wmf/scripting/initial_messages.lua:15 msgid "The Story Begins" === modified file 'po/scenario_t02.wmf/sk.po' --- po/scenario_t02.wmf/sk.po 2014-09-19 06:02:41 +0000 +++ po/scenario_t02.wmf/sk.po 2014-09-29 15:09:02 +0000 @@ -16,9 +16,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" "X-Launchpad-Export-Date: 2014-09-19 05:49+0000\n" "X-Generator: Launchpad (build 17196)\n" -"X-Poedit-Country: czech republic\n" "Language: sk\n" -"X-Poedit-Language: czech\n" #: ../../campaigns/t02.wmf/scripting/mission_thread_texts.lua:23 msgid "Expand north-east and build a quarry" === modified file 'po/tribe_barbarians/ru.po' --- po/tribe_barbarians/ru.po 2014-09-19 06:02:41 +0000 +++ po/tribe_barbarians/ru.po 2014-09-29 15:09:02 +0000 @@ -17,7 +17,7 @@ "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Launchpad-Export-Date: 2014-09-19 05:53+0000\n" "X-Generator: Launchpad (build 17196)\n" -"Language: ru_RU\n" +"Language: ru\n" #: ../../global/militarysites/barracks.empire/conf:8 msgid "Your barracks discovered an aggressor." === modified file 'po/tribe_empire/sk.po' --- po/tribe_empire/sk.po 2014-09-19 06:02:41 +0000 +++ po/tribe_empire/sk.po 2014-09-29 15:09:02 +0000 @@ -16,9 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2014-09-19 05:54+0000\n" "X-Generator: Launchpad (build 17196)\n" -"X-Poedit-Country: Czech Republic\n" "Language: sk\n" -"X-Poedit-Language: czech\n" #: ../../global/militarysites/barracks.empire/conf:8 #: ../../tribes/empire/barracks/conf:8 === modified file 'po/widelands/es.po' --- po/widelands/es.po 2014-09-20 05:48:09 +0000 +++ po/widelands/es.po 2014-09-29 15:09:02 +0000 @@ -17,8 +17,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Launchpad-Export-Date: 2014-09-20 05:47+0000\n" "X-Generator: Launchpad (build 17196)\n" -"Language: es_ES\n" -"X-Poedit-SourceCharset: utf-8\n" +"Language: es\n" #: ../../src/ai/computer_player.cc:39 msgid "None" === modified file 'po/world/sk.po' --- po/world/sk.po 2014-09-19 06:02:41 +0000 +++ po/world/sk.po 2014-09-29 15:09:02 +0000 @@ -28,7 +28,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2014-09-19 06:02+0000\n" "X-Generator: Launchpad (build 17196)\n" -"Language: cs\n" +"Language: sk\n" #: ../../world/critters/badger/init.lua:14 msgid "Badger"
_______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
