Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

Makefile

@@ -1000,6 +1000,7 @@ ifeq ($(TARGETSYSTEM), LINUX)
 DATA_PREFIX=$(DESTDIR)$(PREFIX)/share/cataclysm-dda/
 BIN_PREFIX=$(DESTDIR)$(PREFIX)/bin
 LOCALE_DIR=$(DESTDIR)$(PREFIX)/share/locale
+SHARE_DIR=$(DESTDIR)$(PREFIX)/share
 install: version $(TARGET)
 	mkdir -p $(DATA_PREFIX)
 	mkdir -p $(BIN_PREFIX)
@@ -1016,6 +1017,9 @@ install: version $(TARGET)
 	cp -R --no-preserve=ownership data/help $(DATA_PREFIX)
 ifeq ($(TILES), 1)
 	cp -R --no-preserve=ownership gfx $(DATA_PREFIX)
+	install -Dm755 -t $(SHARE_DIR)/applications/ data/xdg/org.cataclysmdda.CataclysmDDA.desktop
+	install -Dm644 -t $(SHARE_DIR)/metainfo/ data/xdg/org.cataclysmdda.CataclysmDDA.appdata.xml
+	install -Dm644 -t $(SHARE_DIR)/icons/hicolor/scalable/apps/ data/xdg/org.cataclysmdda.CataclysmDDA.svg
 endif
 ifeq ($(SOUND), 1)
 	cp -R --no-preserve=ownership data/sound $(DATA_PREFIX)
@@ -1032,6 +1036,7 @@ ifeq ($(TARGETSYSTEM), CYGWIN)
 DATA_PREFIX=$(DESTDIR)$(PREFIX)/share/cataclysm-dda/
 BIN_PREFIX=$(DESTDIR)$(PREFIX)/bin
 LOCALE_DIR=$(DESTDIR)$(PREFIX)/share/locale
+SHARE_DIR=$(DESTDIR)$(PREFIX)/share
 install: version $(TARGET)
 	mkdir -p $(DATA_PREFIX)
 	mkdir -p $(BIN_PREFIX)
@@ -1048,6 +1053,9 @@ install: version $(TARGET)
 	cp -R --no-preserve=ownership data/help $(DATA_PREFIX)
 ifeq ($(TILES), 1)
 	cp -R --no-preserve=ownership gfx $(DATA_PREFIX)
+	install -Dm755 -t $(SHARE_DIR)/applications/ data/xdg/org.cataclysmdda.CataclysmDDA.desktop
+	install -Dm644 -t $(SHARE_DIR)/metainfo/ data/xdg/org.cataclysmdda.CataclysmDDA.appdata.xml
+	install -Dm644 -t $(SHARE_DIR)/icons/hicolor/scalable/apps/ data/xdg/org.cataclysmdda.CataclysmDDA.svg
 endif
 ifeq ($(SOUND), 1)
 	cp -R --no-preserve=ownership data/sound $(DATA_PREFIX)

android/app/src/main/res/values-de/strings.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="installTitle">Installiere Spieldaten...</string>
+    <string name="upgradeTitle">Aktualisiere Spieldaten...</string>
+    <string name="helpTitle">Hilfe &amp; Steuerung</string>
+    <string name="helpMessage">\"Wischen\" für Richtungsbewegung (Halten für virtuellen Joystick). \"Tippen\" um Auswahl in Menüs zu bestätigen oder pausiere einen Zug In-Game (Halten zum pausieren mehrerer Züge). \"Doppel Tippen\" zum Abbrechen oder Zurück in Menüs (Wie ESC auf Tastatur). \"Zusammenkneifen\" zum Rein/Raus zoomen (In-Game). Drücke Hardware \"Zurück\" Knopf fürs Umschalten der virtuellen Tastaur (Halten zum Umschalten der Tastatur Shortcuts).</string>
+    <string name="softwareRendering">Software-Rendering</string>
+    <string name="forceFullscreen">Erwzinge Vollbild</string>
+    <string name="trapBackButton">Verstecke Zurück Knopf</string>
+    <string name="settings">Einstellungen</string>
+    <string name="startGame">Starte Spiel</string>
+    <string name="showHelp">Zeige Hilfe</string>
+    <string name="crashAlert">Das Spiel wurde beim letzten Mal nicht richtig beendet</string>
+    <string name="crashMessage">Der Crash Report der sich in ./config/crash.log befindet könnten den Entwicklern helfen Programmfehler zu beheben.</string>
+</resources>

android/app/src/main/res/values-it-rIT/strings.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="installTitle">Sto installando i dati di gioco...</string>
+    <string name="upgradeTitle">Sto aggiornando i dati di gioco...</string>
+    <string name="helpTitle">Aiuto &amp; Controlli</string>
+    <string name="helpMessage">Fai \"swipe\" per il controllo direzionale (tieni premuto per il joystick virtuale). Tocca lo schermo per dare conferma nei menù contestuali o per passare un turno nel gioco (tieni premuto per passare più turni). Tocca due volte lo schermo per annullare o tornare indietro nei menù (funziona come il tasto ESC). Fai un \"pinch\" per zoommare vicino o lontano (dentro al gioco). Usa il tasto \"Indietro\" del tuo dispositivo per attivare la tastiera virtuale (tieni premuto per attivare le scorciatoie della tastiera).</string>
+    <string name="softwareRendering">Modalità software</string>
+    <string name="forceFullscreen">Forza schermo intero</string>
+    <string name="trapBackButton">Blocca il tasto Indietro</string>
+    <string name="settings">Impostazioni</string>
+    <string name="startGame">Avvia gioco</string>
+    <string name="showHelp">Mostra aiuto</string>
+    <string name="crashAlert">Il gioco non è stato chiuso correttamente l\'ultima volta</string>
+    <string name="crashMessage">Il crash report localizzato in ./config/crash.log può aiutare gli sviluppatori a comprendere gli errori di programmazione.</string>
+</resources>

android/app/src/main/res/values-pt-rBR/strings.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="installTitle">Instalando dados do jogo...</string>
+    <string name="upgradeTitle">Melhorando dados do jogo...</string>
+    <string name="helpTitle">Controles</string>
+    <string name="helpMessage">\"Deslize\" para movimento direcional (mantenha pressionado para joystick virtual). \"Toque\" para confirmar a seleção no menu, ou Pausar um turno em jogo (mantenha pressionado para Pausar diversos turnos em jogo). \"Toque duas vezes\" para cancelar, ou voltar em menus (funciona como tecla Esc). \"Pince\" para aumentar e diminuir o zoom (em jogo). Use o botão de \"Voltar\" do dispositivo para ativar o teclado virtual (mantenha pressionado para alternar atalhos de teclado).</string>
+    <string name="softwareRendering">Renderização de software</string>
+    <string name="forceFullscreen">Forçar tela cheia</string>
+    <string name="trapBackButton">Manter botão de voltar </string>
+    <string name="settings">Configurações</string>
+    <string name="startGame">Iniciar jogo</string>
+    <string name="showHelp">Mostrar ajuda</string>
+    <string name="crashAlert">O jogo não foi encerrado corretamente na última vez</string>
+    <string name="crashMessage">O relatório de erro localizado em ./config/crash.log pode ajudar desenvolvedores a solucionarem erros no programa.</string>
+</resources>

android/app/src/main/res/values-tr/strings.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="installTitle">Oyun verileri yükleniyor...</string>
+    <string name="upgradeTitle">Oyun verileri güncelleniyor...</string>
+    <string name="helpTitle">Yardım &amp; Kontroller</string>
+    <string name="helpMessage">Yönlü hareket için \"Kaydırın\" (sanal joystick için basılı tutun). Menüde seçimi onaylamak veya oyunda bir turu atlamak için \"Dokunun\" (birkaç Tur Atlamak için basılı tutun). İptal etmek veya menülere geri dönmek için \"Çift dokunun\" (ESC tuşu gibi çalışır). (Oyun İçinde) yakınlaştırmak/uzaklaştırmak için \"Sıkıştırın\". Sanal klavyeyi açmak için telefonun \"Geri\" tuşunu kullanın (klavye kısayollarını değiştirmek için basılı tutun).</string>
+    <string name="softwareRendering">Software rendering</string>
+    <string name="forceFullscreen">Tam ekrana zorla</string>
+    <string name="trapBackButton">Geri düğmesi</string>
+    <string name="settings">Ayarlar</string>
+    <string name="startGame">Oyunu başlat</string>
+    <string name="showHelp">Yardımı göster</string>
+    <string name="crashAlert">Oyun geçen sefer düzgün şekilde kapatılmadı</string>
+    <string name="crashMessage">\"./config/crash.log\" \'taki çökme raporu geliştiricilerin program hatalarını gidermelerine yardımcı olabilir.</string>
+</resources>

android/app/src/main/res/values-zh-rCN/strings.xml

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="installTitle">正在解压游戏数据…</string>
-    <string name="upgradeTitle">正在合并游戏数据…</string>
-    <string name="helpTitle">游戏控制帮助</string>
-    <string name="helpMessage">[屏幕上滑动]可定向移动([按住]可显示虚拟操纵杆，可在设置中选择关闭)。
-[轻触屏幕]可确认菜单中的选项\'或\'在游戏中等待一个回合([长按]可等待几个回合)。
-[双击屏幕]可取消当前操作\'或\'返回菜单(类似于Escape键)。
-游戏中[双指并拢手势]可放大/缩小视图当前分辨率(仅限开启贴图包状态下)。
-[点击系统后退键(手机上的小于号键，在菜单键旁边)]可切出虚拟键盘,按住直至弹窗出现可隐藏/显示下方快捷键栏。
-*设置中可绑定四个双指方向滑动快捷键；例双指向下滑动绑定键为\"i\"，即可游戏内双指向下滑动打开物品栏。</string>
+    <string name="installTitle">正在安装游戏数据……</string>
+    <string name="upgradeTitle">正在合并游戏数据……</string>
+    <string name="helpTitle">帮助及设置</string>
+    <string name="helpMessage">[滑动] 按方向移动（[长按] 显示虚拟手柄）。
+[短按] 确认菜单选项 或 等待一回合（[长按] 等待多回合）。
+[双击] 取消当前操作 或 返回菜单 （等同于 Esc 键）。
+[双指内缩] 放大/缩小视野（游戏中）。
+[系统返回键] 切出虚拟键盘（[长按] 隐藏/显示快捷键栏）。
+*设置中可设置四个双指方向滑动快捷键；例：[双指向下滑动] 设置为 \"i\"，即可游戏内双指向下滑动打开物品栏。</string>
     <string name="softwareRendering">软件渲染
-(不可开启)</string>
+（仅在硬件渲染失效时尝试使用）</string>
     <string name="forceFullscreen">强制全屏
-(开启后不显示通知栏与虚拟键)</string>
+（隐藏通知栏与虚拟键）</string>
     <string name="trapBackButton">限制返回
-(禁止返回按键退出APP)</string>
+（返回按键不会退出游戏）</string>
     <string name="settings">预设
-（进入游戏后请到 设置-图形 中修改终端宽高比）</string>
-    <string name="startGame">载入游戏</string>
+（首次启动建议进入 设置-图形 调整终端宽高比）</string>
+    <string name="startGame">开始游戏</string>
     <string name="showHelp">查看帮助</string>
-    <string name="crashAlert">上一次游戏遇到错误异常退出</string>
-    <string name="crashMessage">日志文件位于Android/data/CataclysmDDA/files/config/crash.log，可有助于开发者解决程序错误。</string>
+    <string name="crashAlert">检测到上次游戏未正常退出</string>
+    <string name="crashMessage">崩溃日志已保存至安装目录 ./config/debug.log，上传至官方论坛协助开发者解决游戏异常提供帮助。</string>
 </resources>

data/credits/en.credits

@@ -6,10 +6,34 @@
 
 <color_white>Current Main Developers:</color>
 <color_yellow>mlangsdorf</color> - Vehicles, boats, basecamps and modding guides.
+<color_yellow>I-am-Erk</color> - Ultica legacy lives on.
+<color_yellow>KorGgenT</color> - Not letting me know where to put my two-by-fours.
+
+<color_white>Special thanks to:</color>
+<color_yellow>Aivean</color> - For outstanding performance.
+<color_yellow>anothersimulacrum</color> - For making me weary.
+<color_yellow>jbytheway</color> - For making me achieve things.
+<color_yellow>BrettDong</color> - For translations and more.
+<color_yellow>Qrox</color> - For showing location of error messages.
+<color_yellow>LyleSY</color> - For dinosaurrrs.
+
+<color_white>Special thanks for art contributions:</color>
+<color_yellow>acepleiades</color>, <color_yellow>barsoosayque</color>, <color_yellow>Fris0uman</color>, <color_yellow>int-ua</color>, and many more.
+
+<color_white>For a full list of contributors please see:</color>
+<color_cyan>https://github.com/CleverRaven/Cataclysm-DDA/contributors</color>
+
+<color_light_cyan>Cataclysm</color>: <color_light_blue>Dark Days Ahead</color> is released under <color_white>CC-BY-SA 3.0</color>:
+<color_cyan>https://creativecommons.org/licenses/by-sa/3.0/</color>
+
+******************************************************************************
+
+<color_white>Main Developers (<color_cyan>0.E</color>):</color>
+<color_yellow>mlangsdorf</color> - Vehicles, boats, basecamps and modding guides.
 <color_yellow>I-am-Erk</color> - Ultica, dialogs, NPCs and clutter in the kitchens.
 <color_yellow>KorGgenT</color> - Magiclysm and stomach aches.
 
-<color_white>Special thanks to:</color>
+<color_white>Special thanks to (<color_cyan>0.E</color>):</color>
 <color_yellow>Narc</color> - For maintaining the automatic Jenkins build-bot.
 <color_yellow>Rivet-the-Zombie</color> - For merging a PR a day.
 <color_yellow>BevapDin</color> - For code reviews and refactoring efforts.
@@ -24,5 +48,69 @@
 <color_white>For a full list of contributors please see the git repo:</color>
 <color_cyan>https://github.com/CleverRaven/Cataclysm-DDA</color>
 
-<color_light_cyan>Cataclysm</color>: <color_light_blue>Dark Days Ahead</color> is released under <color_white>CC-BY-SA 3.0</color>:
-<color_cyan>https://creativecommons.org/licenses/by-sa/3.0/</color>
+******************************************************************************
+
+<color_white>Main Developers (<color_cyan>0.D</color>):</color>
+<color_yellow>KevinGranade</color>, <color_yellow>Rivet-the-Zombie</color>, <color_yellow>BevapDin</color>, <color_yellow>Coolthulu</color>, <color_yellow>i2amroy</color>
+
+<color_white>Special thanks to:</color>
+<color_yellow>Narc</color> - For setting up the automatic Jenkins build-bot.
+<color_yellow>Acidia</color> - For wonderful NPC, Quest and Location contributions.
+<color_yellow>Wuzzy</color> and <color_yellow>VlasovVitaly</color> - For herculean translation efforts.
+<color_yellow>HuXTUS</color> - For a huge amount of amazing content.
+
+******************************************************************************
+
+<color_white>Main Developers (<color_cyan>0.C</color>):</color>
+<color_yellow>KevinGranade</color>, <color_yellow>Rivet-the-Zombie</color>, <color_yellow>KA101</color>, <color_yellow>BevapDin</color>, <color_yellow>Coolthulu</color>, <color_yellow>i2amroy</color>
+
+<color_white>Special thanks to (<color_cyan>0.C</color>):</color>
+<color_yellow>Narc</color> - For setting up the automatic Jenkins build-bot.
+<color_yellow>Acidia</color> - For wonderful NPC, Quest and Location contributions.
+<color_yellow>Wuzzy</color> and <color_yellow>VlasovVitaly</color> - For herculean translation efforts.
+<color_yellow>HuXTUS</color> - For a huge amount of amazing content.
+
+******************************************************************************
+
+<color_white>Main Developers (<color_cyan>0.B</color>):</color>
+<color_yellow>KevinGranade</color>, <color_yellow>Rivet-the-Zombie</color>, <color_yellow>KA101</color>, <color_yellow>BevapDin</color>
+
+<color_white>Special thanks to (<color_cyan>0.B</color>):</color>
+<color_yellow>Narc</color> - For setting up the automatic Jenkins build-bot.
+<color_yellow>Acidia</color> - For wonderful NPC, Quest and Location contributions.
+<color_yellow>Wuzzy</color> and <color_yellow>VlasovVitaly</color> - For herculean translation efforts.
+<color_yellow>i2amroy</color> - For several large infrastructural overhauls.
+<color_yellow>HuXTUS</color> - For a huge amount of amazing content.
+
+******************************************************************************
+
+<color_white>Main Developers (<color_cyan>0.A</color>):</color>
+<color_yellow>KevinGranade</color>, <color_yellow>i2amroy</color>, <color_yellow>Rivet-the-Zombie</color>, <color_yellow>KA101</color>, <color_yellow>BevapDin</color>
+
+<color_white>Special thanks to (<color_cyan>0.A</color>):</color>
+<color_yellow>TheDarklingWolf</color> - For creating Cataclysm:DDA as we know it.
+<color_yellow>Narc</color> - For setting up the automatic Jenkins build-bot.
+<color_yellow>BevapDin</color> - For tireless bugfixing efforts.
+<color_yellow>dwarfkoala</color> - For a plethora of bug triage.
+<color_yellow>Ill-kun</color> - For countless UI cleanups.
+
+******************************************************************************
+
+<color_white>Main Developers (<color_cyan>0.9</color>):</color>
+<color_yellow>KevinGranade</color>, <color_yellow>GalenEvil</color>, <color_yellow>i2amroy</color>, <color_yellow>AtomicDryad</color>, <color_yellow>Ianestrachan</color>
+
+<color_white>Special thanks to (<color_cyan>0.9</color>):</color>
+<color_yellow>TheDarklingWolf</color> - For creating Cataclysm:DDA as we know it
+<color_yellow>Narc</color> - For setting up the automatic Jenkins build-bot
+<color_yellow>yobbobanana</color> - For working as liason between translators and github
+<color_yellow>Angela 'Rivet' Graves</color>, Constant Creator of Cataclysmic Content
+
+******************************************************************************
+
+<color_white>Main Developers (<color_cyan>0.8</color>):</color>
+<color_yellow>Kevingranade</color>, <color_yellow>GalenEvil</color>, <color_yellow>i2amroy</color>, <color_yellow>AtomicDryad</color>, <color_yellow>Ozone</color>
+
+<color_white>Special thanks to (<color_cyan>0.8</color>):</color>
+<color_yellow>TheDarklingWolf</color> - For creating Cataclysm:DDA as we know it
+<color_yellow>Narc</color> - For setting up the automatic Jenkins build-bot
+<color_yellow>yobbobanana</color> - For working as liason between translators and github