From: Mario <zacjardine@y7mail.com>
Date: Mon, 24 Jun 2019 05:05:27 +0000 (+0000)
Subject: Merge branch 'sev/icon-teamkill' into 'master'
X-Git-Tag: xonotic-v0.8.5~1479
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=393b4baee3cfc687e529aa6377b4ce9776cb066b;hp=89577c88e40e44ac95c4ae2beaf73dbc815122b7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'sev/icon-teamkill' into 'master'

Change teamkill icon to symbolic shot in the back

Closes #2188

See merge request xonotic/xonotic-data.pk3dir!655
---

diff --git a/.tx/merge-base b/.tx/merge-base
index 5357d70b5..2f2960a4e 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Jun 20 07:24:19 CEST 2019
+Sun Jun 23 07:25:22 CEST 2019
diff --git a/common.en_AU.po b/common.en_AU.po
index 26f514a62..bc067da03 100644
--- a/common.en_AU.po
+++ b/common.en_AU.po
@@ -6,14 +6,15 @@
 # Laurene Albrand, 2015
 # Laurene Albrand, 2015
 # Laurene Albrand, 2015
+# Matthew Wu <matthewwu2003.1@gmail.com>, 2019
 # Stuart Young <cefiar@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-19 07:23+0200\n"
-"PO-Revision-Date: 2019-05-19 05:23+0000\n"
-"Last-Translator: divVerent <divVerent@xonotic.org>\n"
+"PO-Revision-Date: 2019-06-20 16:11+0000\n"
+"Last-Translator: Matthew Wu <matthewwu2003.1@gmail.com>\n"
 "Language-Team: English (Australia) (http://www.transifex.com/team-xonotic/"
 "xonotic/language/en_AU/)\n"
 "Language: en_AU\n"
@@ -89,12 +90,12 @@ msgstr "^1Press ^3%s^1 or ^3%s^1 for next or previous player"
 #: qcsrc/client/hud/panel/infomessages.qc:104
 #: qcsrc/client/hud/panel/infomessages.qc:108
 msgid "next weapon"
-msgstr ""
+msgstr "next weapon"
 
 #: qcsrc/client/hud/panel/infomessages.qc:104
 #: qcsrc/client/hud/panel/infomessages.qc:108
 msgid "previous weapon"
-msgstr ""
+msgstr "previous weapon"
 
 #: qcsrc/client/hud/panel/infomessages.qc:108
 #, c-format
@@ -594,7 +595,7 @@ msgstr ""
 
 #: qcsrc/client/hud/panel/scoreboard.qc:91
 msgid "Number of deaths"
-msgstr ""
+msgstr "Number of deaths"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:91
 msgid "SCO^deaths"
@@ -682,7 +683,7 @@ msgstr ""
 
 #: qcsrc/client/hud/panel/scoreboard.qc:102
 msgid "Number of goals scored"
-msgstr ""
+msgstr "Number of goals scored"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:102
 msgid "SCO^goals"
@@ -716,7 +717,7 @@ msgstr "SCO^kdratio"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:107
 msgid "Number of kills"
-msgstr ""
+msgstr "Number of kills"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:107
 msgid "SCO^kills"
diff --git a/common.ru.po b/common.ru.po
index d8fbf327d..b685a76c1 100644
--- a/common.ru.po
+++ b/common.ru.po
@@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-19 07:23+0200\n"
-"PO-Revision-Date: 2019-05-19 08:17+0000\n"
+"PO-Revision-Date: 2019-06-23 04:05+0000\n"
 "Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/team-xonotic/xonotic/"
 "language/ru/)\n"
@@ -7104,7 +7104,7 @@ msgstr "Требуется (будет шифрование)"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:161
 msgid "Use the `crypto_aeslevel` cvar to change your preferences"
-msgstr "Используйте cvar \"crypto_aeslevel\" для изменения настроек"
+msgstr "Используйте переменную \"crypto_aeslevel\" для изменения настроек"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:178
 msgid "Hostname:"
@@ -7307,7 +7307,7 @@ msgstr "Статистика"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:129
 msgid "Allow player statistics to track your client"
-msgstr "Разрешить статистке отслеживать клиента"
+msgstr "Разрешить статистике отслеживать клиента"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:133
 msgid "Allow player statistics to use your nickname"
@@ -8948,7 +8948,7 @@ msgstr "Компенсация ошибок движения"
 
 #: qcsrc/menu/xonotic/dialog_settings_misc.qc:82
 msgid "Use encryption (AES) when available"
-msgstr "Использовать шифрование (AES), если возможно"
+msgstr "Использовать шифрование AES по возможности"
 
 #: qcsrc/menu/xonotic/dialog_settings_misc.qc:85
 msgid "Framerate"
@@ -9772,7 +9772,7 @@ msgstr "Спортивный режим"
 
 #: qcsrc/menu/xonotic/serverlist.qh:157
 msgid "SLCAT^Modified Servers"
-msgstr "Модифицированные:"
+msgstr "Модифицированные"
 
 #: qcsrc/menu/xonotic/serverlist.qh:158
 msgid "SLCAT^Overkill"