Merge branch 'release/3.13.0'

.tx/config

@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = sq:albanian, ar:arabic, eu:basque, be:belarusian, bn:bengali, bg:bulgarian, ca:catalan, zh_CN:chinese-china, zh_TW:chinese-taiwan, cs:czech, da:danish, nl:dutch, eo:esperanto, et:estonian, fi:finnish, fr:french, gd:gaelic, gl:galician, de:german, el:greek, he:hebrew, hi:hindi, hi_IN:hindi-india, hu:hungarian, id:indonesian, it:italian, ja:japanese, jv:javanese, ko:korean, lv:latvian, lt:lithuanian, jbo:lojban, ms:malay, mr:marathi, nqo:nko, no:norwegian, pa:punjabi, fa:persian, pl:polish, pt:portuguese, pt_BR:portuguese-brazil, ro:romanian, ru:russian, sk:slovak, sl:slovenian, es:spanish, es_MX:spanish-mexico, sw:swahili, sv:swedish, tl:tagalog, ta:tamil, te:telugu, th:thai, tr:turkish, uk:ukrainian, ur:urdu, uz:uzbek, vi:vietnamese, cy:welsh
+lang_map = sq:albanian, ar:arabic, eu:basque, be:belarusian, bn:bengali, bg:bulgarian, ca:catalan, zh_CN:chinese-china, zh_TW:chinese-taiwan, hr:croatian, cs:czech, da:danish, nl:dutch, eo:esperanto, et:estonian, fi:finnish, fr:french, gd:gaelic, gl:galician, de:german, el:greek, he:hebrew, hi:hindi, hi_IN:hindi-india, hu:hungarian, id:indonesian, ga:irish, it:italian, ja:japanese, jv:javanese, ko:korean, lv:latvian, lt:lithuanian, jbo:lojban, ms:malay, mr:marathi, nqo:nko, no:norwegian, pa:punjabi, fa:persian, pl:polish, pt:portuguese, pt_BR:portuguese-brazil, ro:romanian, ru:russian, sk:slovak, sl:slovenian, es:spanish, es_MX:spanish-mexico, sw:swahili, sv:swedish, tl:tagalog, ta:tamil, te:telugu, th:thai, tr:turkish, uk:ukrainian, ur:urdu, uz:uzbek, vi:vietnamese, cy:welsh
 ; alphabetical list ^ of supported languages, in more complicated names you should use "-"
 type = INI
 minimum_perc = 70
@@ -42,6 +42,18 @@ source_file = tutorials/3_advanced_tutorial/3_advanced_tutorial_english.lng
 source_lang = en
 minimum_perc = 73
 
+[megaglest.lobby-access]
+file_filter = scenarios/lobby_access/lobby_access_<lang>.lng
+source_file = scenarios/lobby_access/lobby_access_english.lng
+source_lang = en
+minimum_perc = 70
+
+[megaglest.scenarios-amazones-pro]
+file_filter = scenarios/amazones_pro/amazones_pro_<lang>.lng
+source_file = scenarios/amazones_pro/amazones_pro_english.lng
+source_lang = en
+minimum_perc = 70
+
 [megaglest.scenarios-amazones]
 file_filter = scenarios/amazones/amazones_<lang>.lng
 source_file = scenarios/amazones/amazones_english.lng

.tx/no-duplicate-strings-in-techs.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+# Use this script to remove duplicate lines from default language files in tech trees,
+# e.g. megapack_default.lng. Basically script is usefull only (once) with freshly produced
+# default lng (--translate-techtrees=x).
+#
+# How to use: Execute this script with one parameter, which should be an absolute path
+# to default lng file.
+# ----------------------------------------------------------------------------
+# 2016 Written by filux <heross(@@)o2.pl>
+# Copyright (c) 2016 under GNU GPL v3.0+
+LANG=C
+
+CURRENTDIR="$(dirname "$(readlink -f "$0")")"
+cd "$CURRENTDIR"
+
+awk -i inplace '!/^UnitTypeName_/ {print;next};{print;print}' "$1"; sleep 0.5s
+sed -z -i -e 's/\n/|||/g' "$1"; sleep 0.5s
+sed -i -e 's/; Unit|||UnitTypeName_[^=]*=/; Unit > /g' "$1"; sleep 0.5s
+sed -z -i -e 's/|||/\n/g' "$1"; sleep 0.5s
+awk -i inplace '/^; / { print; next; }; !a[$0]++' "$1"; sleep 0.5s
+sed -z -i -e 's/\n/|||/g' "$1"; sleep 0.5s
+sed -i -e 's/; Levels for this Unit|||; -*|||//g' -e 's/; Types of Commands for this Unit|||; -/; -/g' \
+-e 's/; Levels for this Unit|||//g' -e 's/; Types of Commands for this Unit|||//g' \
+-e 's/; Unit > [^|]*|||UnitTypeName_/UnitTypeName_/g' -e 's/; -*|||; -/; -/g' \
+-e 's/; Unit > [^|]*|||; -------------------------------------|||//g' \
+-e 's/; Unit > [^|]*|||; --------------------------------------*/; -----------------------------------------------------------------------------/g' \
+-e 's/; -*|||; -/; -/g' "$1"; sleep 0.5s
+sed -z -i -e 's/|||/\n/g' "$1"

.tx/tx.sh

@@ -2,7 +2,7 @@
 # Use this script to facilitate most common jobs related with transifex-client.
 # ----------------------------------------------------------------------------
 # 2014 Written by filux <heross(@@)o2.pl>
-# Copyright (c) 2014-2015 under GNU GPL v3.0+
+# Copyright (c) 2014-2016 under GNU GPL v3.0+
 
 CURRENTDIR="$(dirname "$(readlink -f "$0")")"
 cd $CURRENTDIR/..
@@ -20,7 +20,7 @@ echo -e "\n Use this script to facilitate most common jobs related with transife
     '... --help'      - this text.\n"
     exit 0
 elif [ "$1" = "--release" ]; then
-    find . -name "*.lng" -type f -not -name "english.lng" -not -name "*_english.lng" \
+    find . -maxdepth 4 -name "*.lng" -type f -not -name "english.lng" -not -name "*_english.lng" \
 	    -not -name "*_default.lng" | xargs rm -f
 fi
 
@@ -37,13 +37,13 @@ elif [ "$1" = "" ] || [ "$1" = "--release" ]; then
 
     lang_list1="$(find ./data/lang/hint/ -maxdepth 1 -name "*.lng" -type f -not -name "*english.lng" \
 		-not -name "*default.lng")"
-    lang_list2="$(find . -name "*.lng" -type f -not -name "*english.lng" -not -name "*default.lng" \
-		-not -wholename "./data/lang/*.lng")"
+    lang_list2="$(find . -maxdepth 4 -name "*.lng" -type f -not -name "*english.lng" \
+		-not -name "*default.lng" -not -wholename "./data/lang/*.lng")"
     lang_list="$(echo -e "$lang_list1\n$lang_list2" | awk -F "/" '{ print $NF }' \
 		| awk -F "_" '{ print $NF }' | awk '!a[$0]++' | xargs echo)"
     for s_lang in $lang_list; do
 		main_lang="$(find ./data/lang/ -maxdepth 1 -name "$s_lang" -type f | xargs echo)"
-		if [ "$main_lang" = "" ]; then find . -name "*$s_lang" | xargs rm -f; fi
+		if [ "$main_lang" = "" ]; then find . -maxdepth 4 -name "*$s_lang" | xargs rm -f; fi
     done
 
     main_lang2="$(find ./data/lang/ -maxdepth 1 -name "*.lng" -type f -not -name "*english.lng" \
@@ -57,13 +57,17 @@ elif [ "$1" = "" ] || [ "$1" = "--release" ]; then
     # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     # this part has sed rules from the script Written by Tom Reynolds <tomreyn@megaglest.org>
     # with Copyright (c) 2012 Tom Reynolds under GNU GPL v3.0
-    files="$(find . -type f -name *.lng | sort -u | xargs)"
+    files="$(find . -maxdepth 4 -type f -name "*.lng" | sort -u | xargs)"
 	for file in $files; do
 		sed -i -e 's/&quot;/"/g' -e 's/&bdquo;/„/g' -e 's/&ldquo;/“/g' -e 's/[ \t]*$//' -e 's/^\([^=]*\)=\s*/\1=/' \
 			-e 's/  */ /g' -e 's/ \\n/\\n/g' -e 's/\\n /\\n/g' -e 's/\\n\\n\\n/\\n\\n/g' -e 's/\\n\\n$/\\n/g' "$file"
+	done
+	# -^V- a tiny bit more time between edits
+	for file in $files; do
 		sed -i -e '$a\' "$file"
 	done
     # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    "$CURRENTDIR/../others/appdata/estimate-the-translations.sh"; echo
 fi
 
 exit 0

data/defaultGameSetup.mgg

@@ -20,7 +20,7 @@ NetworkPauseGameForLaggedClients=0
 FactionThisFactionIndex=0
 FactionCount=2
 FactionControlForIndex0=7
-ResourceMultiplierIndex0=1
+ResourceMultiplierIndex0=5
 FactionTeamForIndex0=0
 FactionStartLocationForIndex0=0
 FactionTypeNameForIndex0=indian

data/defaultNetworkGameSetup.mgg

@@ -20,7 +20,7 @@ NetworkPauseGameForLaggedClients=0
 FactionThisFactionIndex=0
 FactionCount=4
 FactionControlForIndex0=7
-ResourceMultiplierIndex0=1
+ResourceMultiplierIndex0=5
 FactionTeamForIndex0=0
 FactionStartLocationForIndex0=0
 FactionTypeNameForIndex0=indian

data/lang/albanian.lng

@@ -153,6 +153,7 @@ Exit=Dalja
 # ExitGameMenu=Exit Current Game
 # ExitBattleQuestion=Exit current game?
 # ExitBattleServerQuestion=Exit current game? (this will end the game for all other connected players)
+# ExitToRootMenu=Would you like to return to the main menu?
 Explored=E hulumtuar
 Faction=Grupi
 FallbackCpuMultiplier=AI shumezimi i ndryshuar
@@ -194,6 +195,7 @@ HarvestSpeed=Shpejtesia e korrjes
 HeadlessAdminRequiresMorePlayers=Ju duhet te keni se paku %d lojtar te lidhur per te filluar lojen!
 HeadlessServerDoesNotHaveMap=Headless server nuk e ka këtë hart dhe ndërroi në hartën e ardhshme
 Healthbar=Vija e shëndetit
+Healthbar2=Vija e shëndetit
 HealthbarsAlways=Përherë
 HealthbarsFactionDefault=E paracaktuar
 HealthbarsOff=Ndalur
@@ -503,10 +505,12 @@ TechTitle2=Grupet
 Textures3D=3D Pëlhurat:
 Tileset=Kutizat
 TilesetTitle1=Kutizat
+# Time=Time
 TimeDisplay=Shfaq kohen e vërtet dhe kohën e lojës
 TimeoutWaitingForClients=Shkëputje duke pritur per lojtare.
 TimeoutWaitingForServer=Shkëputje duke pritur serverin.
 TimeoutWaitingForMessage=Shkëputje duke pritur mesazhin.
+# TimeSteps=Time steps
 Tip=Keshille
 ToSwitchOffMusicPress=Për të e ndaluar muzikën shtypni në tastierë
 

data/lang/arabic.lng

@@ -153,6 +153,7 @@ ExitGameQuestion=هل ترغب في إنهاء اللعبة؟
 ExitGameMenu=إنهاء اللعبة الحالية
 ExitBattleQuestion=إنهاء اللعبة الحالية؟
 ExitBattleServerQuestion=إنهاء اللعبة الحالية؟ (هذا سينهي اللعبة لدى جميع اللاعبين المتصلين)
+# ExitToRootMenu=Would you like to return to the main menu?
 Explored=مستكشفة
 Faction=قبيلة
 FallbackCpuMultiplier=إستبدال مضاعف
@@ -194,6 +195,7 @@ HarvestSpeed=سرعة الحصاد
 HeadlessAdminRequiresMorePlayers=يجب أن يكون لديك على الأقل%d لاعب(ين) متصل(ين) لبدء هذه اللعبة!
 # HeadlessServerDoesNotHaveMap=Headless server does not have map and switched to next map.
 Healthbar=الحالة الصحية:
+Healthbar2=الحالة الصحية
 HealthbarsAlways=دائما
 HealthbarsFactionDefault=الفصيلة الافتراضية
 HealthbarsOff=معطل
@@ -503,10 +505,12 @@ TechTitle2=فصائل
 Textures3D=ملامس ثلاثية الأبعاد:
 Tileset=نوع الأرضية
 TilesetTitle1=أرضيات
+# Time=Time
 TimeDisplay=عرض الوقت الحقيقي واللعبة
 TimeoutWaitingForClients=انتهت مهلة انتضار الزبائن.
 TimeoutWaitingForServer=انتهت مهلة انتظار الخادم.
 TimeoutWaitingForMessage=انتهت مهلة انتظار الرسالة.
+# TimeSteps=Time steps
 Tip=نصيحة
 ToSwitchOffMusicPress=لإيقاف الموسيقى في حين انتظار اللاعبين اضغط على
 

data/lang/chinese-china.lng

@@ -153,6 +153,7 @@ ExitGameQuestion=你想要关闭游戏吗？
 ExitGameMenu=退出当前游戏
 ExitBattleQuestion=退出当前游戏吗？
 ExitBattleServerQuestion=退出当前游戏吗？（这会终止所有已连接玩家的游戏）
+ExitToRootMenu=回到游戏主页？
 Explored=已探测
 Faction=种族
 FallbackCpuMultiplier=AI 替换倍数
@@ -194,6 +195,7 @@ HarvestSpeed=收获速度
 HeadlessAdminRequiresMorePlayers=至少需要 %d 玩家，方可进入游戏！
 HeadlessServerDoesNotHaveMap=无头服务器没有此地图并切换到下一个地图。
 Healthbar=生命条
+Healthbar2=生命条
 HealthbarsAlways=总是
 HealthbarsFactionDefault=默认种族
 HealthbarsOff=关闭
@@ -503,10 +505,12 @@ TechTitle2=种族
 Textures3D=3D 结构
 Tileset=地图样式
 TilesetTitle1=地图样式
+# Time=Time
 TimeDisplay=显示现实时间和游戏时间
 TimeoutWaitingForClients=等待客户端超时。
 TimeoutWaitingForServer=等待服务器超时。
 TimeoutWaitingForMessage=等待消息超时。
+# TimeSteps=Time steps
 Tip=提示
 ToSwitchOffMusicPress=关闭声音按
 
@@ -528,7 +532,7 @@ UnitReady=单位准备好了
 UnitsProduced=生产的单位总数
 UnitType=单位类型：
 Upgrade=升级
-# UpgradeFinished=Upgrade finished
+UpgradeFinished=完成升级
 UpgradeNoReqs=不满足升级条件
 UpgradeNoRes=无足够资源升级
 UpgradeSpeed=升级速度

data/lang/chinese-taiwan.lng

@@ -153,6 +153,7 @@ Exit=結束
 # ExitGameMenu=Exit Current Game
 # ExitBattleQuestion=Exit current game?
 # ExitBattleServerQuestion=Exit current game? (this will end the game for all other connected players)
+# ExitToRootMenu=Would you like to return to the main menu?
 Explored=已探測
 Faction=種族
 FallbackCpuMultiplier=AI 置換倍數
@@ -194,6 +195,7 @@ HarvestSpeed=採集速度
 HeadlessAdminRequiresMorePlayers=至少需要 %d 玩家，方可進入游戲!
 # HeadlessServerDoesNotHaveMap=Headless server does not have map and switched to next map.
 # Healthbar=Health bar:
+# Healthbar2=Health bar
 # HealthbarsAlways=Always
 # HealthbarsFactionDefault=Faction default
 # HealthbarsOff=Off
@@ -503,10 +505,12 @@ TechTitle2=種族
 Textures3D=3D 架構
 Tileset=場景
 TilesetTitle1=場景
+# Time=Time
 TimeDisplay=顯示實際時間和遊戲時間
 TimeoutWaitingForClients=等待用戶端逾時
 TimeoutWaitingForServer=等待伺服器逾時
 TimeoutWaitingForMessage=等待訊息逾時
+# TimeSteps=Time steps
 Tip=意見
 ToSwitchOffMusicPress=關閉音響按
 

data/lang/czech.lng

@@ -153,6 +153,7 @@ ExitGameQuestion=Odejít ze hry?
 ExitGameMenu=Ukončit současnou hru
 ExitBattleQuestion=Ukončit současnou hru?
 ExitBattleServerQuestion=Ukončit současnou hru? (to ukončí hru i všem ostatním připojeným hráčům)
+ExitToRootMenu=Chtěli byste se vrátit do hlavního menu?
 Explored=Ano, ukázat prozkoumané
 Faction=Frakce
 FallbackCpuMultiplier=Násobitel nahrazující UI
@@ -194,6 +195,7 @@ HarvestSpeed=Rychlost těžby
 HeadlessAdminRequiresMorePlayers=Musíte mít nejméně %d připojených hráč(ů), abyste mohli spustit hru!
 HeadlessServerDoesNotHaveMap=Bezobslužný (headless) server nemá mapu a přepnul na další mapu.
 Healthbar=Ukazatel zdraví
+Healthbar2=Ukazatel zdraví
 HealthbarsAlways=Vždy
 HealthbarsFactionDefault=Výchozí dle frakce
 HealthbarsOff=Vypnutý
@@ -503,10 +505,12 @@ TechTitle2=Frakce
 Textures3D=3D textury:
 Tileset=Prostředí
 TilesetTitle1=Prostředí
+Time=Čas
 TimeDisplay=Zobrazit reálný a herní čas
 TimeoutWaitingForClients=Čekání na klienty kvůli vypršení času.
 TimeoutWaitingForServer=Čekání na server kvůli vypršení času.
 TimeoutWaitingForMessage=Čekání na zprávu kvůli vypršení času.
+TimeSteps=Časové kroky
 Tip=Tip
 ToSwitchOffMusicPress=Pro vypnutí hudby během čekání na hráče stiskněte
 

data/lang/danish.lng

@@ -38,12 +38,12 @@ AttackSpeed=Angrebs Hastighed
 AttackStopped=Angreb stoppet
 AttackStrenght=Skade
 Audio=Audio
-AutoConfig=Auto konfiguration
+AutoConfig=Auto konfigurer
 AutoRefreshRate=Automatisk genopfrisknings hastighed
 AvailableServers=tilgængelige servere
 BattleOver=Kampen er over
 BlockPlayer=Bloker spiller
-BlockPlayerClear=Clear Blocked Players Fjern blokering af blokerede spiller(e)
+BlockPlayerClear=Fjern blokering af blokerede spiller(e)
 BlockPlayerServerMsg=Serveren har midlertidigt blokeret din ipadresse [%s] fra dette spil
 Build=Byg
 BuildSpeed=Bygge Hastighed
@@ -153,6 +153,7 @@ ExitGameQuestion=Ønsker du at lukke spillet?
 ExitGameMenu=Afslut spil
 ExitBattleQuestion=Afslut spillet?
 ExitBattleServerQuestion=Afslut spillet? (dette vil stoppe spillet for alle forbundne spillere)
+ExitToRootMenu=Ønsker du at gå til hovedmenu?
 Explored=Udforsket
 Faction=Faktion
 FallbackCpuMultiplier=KI udskiftnings multiplikator
@@ -188,12 +189,13 @@ GameSwitchPlayerObserverToAI=Spiller #%d [%s] har afbrudt, men spilleren var kun
 GameTime=Spil:
 GammaCorrection=Lysstyrke
 GettingModlistFromMasterserver=Henter mod liste fra mesterserveren
-# GroupAssignFailed=Couldn't assign unit(s) to Group!
+GroupAssignFailed=Kunne ikke tildele enheder til gruppe!
 Harvest=Høst
 HarvestSpeed=Høst hastighed
 HeadlessAdminRequiresMorePlayers=Du skal have mindst %d (spillere) for at starte et dette spil
 HeadlessServerDoesNotHaveMap=Hovedløs server har ikke kort og skiftede til næste kort.
 Healthbar=Helbredsbjælke
+Healthbar2=Helbredsbjælke
 HealthbarsAlways=Altid
 HealthbarsFactionDefault=Fraktion standard
 HealthbarsOff=Fra
@@ -503,10 +505,12 @@ TechTitle2=Faktioner
 Textures3D=3D Textures:
 Tileset=Tileset
 TilesetTitle1=Kortdekorationssæt
+# Time=Time
 TimeDisplay=Vis tid og spiltid
 TimeoutWaitingForClients=Tiden udløb mens der blev ventet på klienten.
 TimeoutWaitingForServer=Tiden udløb mens der blev ventet på serveren.
 TimeoutWaitingForMessage=Tiden udløb mens der blev ventet på besked.
+# TimeSteps=Time steps
 Tip=Tip
 ToSwitchOffMusicPress=For at slukke musik mens du venter tryk
 
@@ -528,7 +532,7 @@ UnitReady=Enhed klar
 UnitsProduced=Enheder producerede
 UnitType=Enheds type:
 Upgrade=Opgrader
-# UpgradeFinished=Upgrade finished
+UpgradeFinished=Opgradering færdig
 UpgradeNoReqs=Opgradering opfylder ikke krav
 UpgradeNoRes=Ikke nok Resourcer til at producere opgradering
 UpgradeSpeed=Opgraderings Hastighed