Merge branch 'terencehill/replicatevars_enhancements' into 'master'

ReplicateVars API improvements

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 0d8cd0829a84cb9ede460fd81562050b4d5274f4..db75f28e26052fff171396668d85b6f9acda87fe 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Feb  7 07:23:11 CET 2022
+Thu Feb 10 07:23:08 CET 2022

diff --git a/common.de.po b/common.de.po
index 1f2cef5f8711cc4702b49d81b3168549bb1f295d..f6b21506478ac9ff5787f3381319fcc690a24abc 100644 (file)
--- a/common.de.po
+++ b/common.de.po
@@ -15,7 +15,7 @@
 # Larson März <larson@protonmail.ch>, 2016
 # Larson März <larson@protonmail.ch>, 2016
 # afba88cf42cbdff57149d4a6d53a94f9, 2018
-# Mirio <opivy@hotmail.de>, 2014-2017,2019-2021
+# Mirio <opivy@hotmail.de>, 2014-2017,2019-2022
 # Robert Katzinsky <hbmctextures.unknown@gmail.com>, 2020
 # divVerent <divVerent@xonotic.org>, 2011
 # Sless <sless@gmx.net>, 2014
@@ -28,8 +28,8 @@ msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-02-06 07:22+0100\n"
-"PO-Revision-Date: 2022-02-06 06:22+0000\n"
-"Last-Translator: divVerent <divVerent@xonotic.org>\n"
+"PO-Revision-Date: 2022-02-09 19:19+0000\n"
+"Last-Translator: Mirio <opivy@hotmail.de>\n"
 "Language-Team: German (http://www.transifex.com/team-xonotic/xonotic/"
 "language/de/)\n"
 "Language: de\n"
@@ -7298,7 +7298,7 @@ msgstr "Verbinden!"
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:94
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:106
 msgid "No Terms of Service specified"
-msgstr ""
+msgstr "Keine Nutzungsbedingungen angegeben"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145
 #: qcsrc/menu/xonotic/serverlist.qc:1052
@@ -7361,7 +7361,7 @@ msgstr "Benutze die cvar `crypto_aeslevel`, um deine Einstellungen zu ändern"
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:204
 #: qcsrc/menu/xonotic/serverlist.qc:1056
 msgid "custom stats server"
-msgstr ""
+msgstr "benutzerdefinierter Statistiken server"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:204
 #: qcsrc/menu/xonotic/serverlist.qc:1056
@@ -7375,17 +7375,17 @@ msgstr "Statistiken aktiviert"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:215
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7
 #: qcsrc/menu/xonotic/dialog_termsofservice.qh:11
 msgid "Terms of Service"
-msgstr ""
+msgstr "Nutzungsbedingungen"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7
 msgid "Server Info"
-msgstr ""
+msgstr "Server Information"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24
 msgid "Hostname:"
@@ -7438,7 +7438,7 @@ msgstr "Schlüssel:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96
 msgid "Stats:"
-msgstr ""
+msgstr "Statistiken:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6
 msgid "Server Information"
@@ -9809,18 +9809,20 @@ msgstr "Teamauswahl"
 #: qcsrc/menu/xonotic/dialog_termsofservice.qc:78
 msgid "Terms of Service have been updated. Please read them before continuing:"
 msgstr ""
+"Die Nutzungsbedingungen wurde aktualisiert. Bitte lese sie, bevor du "
+"fortfährst:"
 
 #: qcsrc/menu/xonotic/dialog_termsofservice.qc:80
 msgid "Welcome to Xonotic! Please read the following Terms of Service:"
-msgstr ""
+msgstr "Willkommen bei Xonotic! Bitte lese die folgenden Nutzungsbedingungen"
 
 #: qcsrc/menu/xonotic/dialog_termsofservice.qc:94
 msgid "Accept"
-msgstr ""
+msgstr "Akzeptieren"
 
 #: qcsrc/menu/xonotic/dialog_termsofservice.qc:98
 msgid "Don't accept (quit the game)"
-msgstr ""
+msgstr "Nicht akzeptieren (das Spiel beenden)"
 
 #: qcsrc/menu/xonotic/dialog_uid2name.qc:10
 msgid "Allow player statistics to use your nickname?"

diff --git a/common.de_CH.po b/common.de_CH.po
index fc40c93c5537beac4b6a95b372fdee2ec39c2bca..761cdbca74573ddd7f234da18dbb7a93c2820cf1 100644 (file)
--- a/common.de_CH.po
+++ b/common.de_CH.po
@@ -15,7 +15,7 @@
 # Larson März <larson@protonmail.ch>, 2016
 # Larson März <larson@protonmail.ch>, 2016
 # afba88cf42cbdff57149d4a6d53a94f9, 2018
-# Mirio <opivy@hotmail.de>, 2014-2017,2019-2021
+# Mirio <opivy@hotmail.de>, 2014-2017,2019-2022
 # Robert Katzinsky <hbmctextures.unknown@gmail.com>, 2020
 # divVerent <divVerent@xonotic.org>, 2011
 # Sless <sless@gmx.net>, 2014
@@ -28,8 +28,8 @@ msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-02-06 07:22+0100\n"
-"PO-Revision-Date: 2022-02-06 06:22+0000\n"
-"Last-Translator: divVerent <divVerent@xonotic.org>\n"
+"PO-Revision-Date: 2022-02-09 19:19+0000\n"
+"Last-Translator: Mirio <opivy@hotmail.de>\n"
 "Language-Team: German (http://www.transifex.com/team-xonotic/xonotic/"
 "language/de/)\n"
 "Language: de\n"
@@ -7298,7 +7298,7 @@ msgstr "Verbinden!"
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:94
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:106
 msgid "No Terms of Service specified"
-msgstr ""
+msgstr "Keine Nutzungsbedingungen angegeben"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:145
 #: qcsrc/menu/xonotic/serverlist.qc:1052
@@ -7361,7 +7361,7 @@ msgstr "Benutze die cvar `crypto_aeslevel`, um deine Einstellungen zu ändern"
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:204
 #: qcsrc/menu/xonotic/serverlist.qc:1056
 msgid "custom stats server"
-msgstr ""
+msgstr "benutzerdefinierter Statistiken server"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:204
 #: qcsrc/menu/xonotic/serverlist.qc:1056
@@ -7375,17 +7375,17 @@ msgstr "Statistiken aktiviert"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:214
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:215
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh:7
 #: qcsrc/menu/xonotic/dialog_termsofservice.qh:11
 msgid "Terms of Service"
-msgstr ""
+msgstr "Nutzungsbedingungen"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh:7
 msgid "Server Info"
-msgstr ""
+msgstr "Server Information"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:24
 msgid "Hostname:"
@@ -7438,7 +7438,7 @@ msgstr "Schlüssel:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc:96
 msgid "Stats:"
-msgstr ""
+msgstr "Statistiken:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh:6
 msgid "Server Information"
@@ -9809,18 +9809,20 @@ msgstr "Teamauswahl"
 #: qcsrc/menu/xonotic/dialog_termsofservice.qc:78
 msgid "Terms of Service have been updated. Please read them before continuing:"
 msgstr ""
+"Die Nutzungsbedingungen wurde aktualisiert. Bitte lese sie, bevor du "
+"fortfährst:"
 
 #: qcsrc/menu/xonotic/dialog_termsofservice.qc:80
 msgid "Welcome to Xonotic! Please read the following Terms of Service:"
-msgstr ""
+msgstr "Willkommen bei Xonotic! Bitte lese die folgenden Nutzungsbedingungen"
 
 #: qcsrc/menu/xonotic/dialog_termsofservice.qc:94
 msgid "Accept"
-msgstr ""
+msgstr "Akzeptieren"
 
 #: qcsrc/menu/xonotic/dialog_termsofservice.qc:98
 msgid "Don't accept (quit the game)"
-msgstr ""
+msgstr "Nicht akzeptieren (das Spiel beenden)"
 
 #: qcsrc/menu/xonotic/dialog_uid2name.qc:10
 msgid "Allow player statistics to use your nickname?"

diff --git a/languages.txt b/languages.txt
index 872575013ff64f2c81856607eda40a1292d2cd1c..40d0cc18c50e30853c7dad2846d032877cad9cdc 100644 (file)
--- a/languages.txt
+++ b/languages.txt
@@ -1,6 +1,6 @@
 ast   "Asturian" "Asturianu" 77%
-de    "German" "Deutsch" 99%
-de_CH "German (Switzerland)" "Deutsch (Schweiz)" 99%
+de    "German" "Deutsch" 100%
+de_CH "German (Switzerland)" "Deutsch (Schweiz)" 100%
 en    "English" "English" 100%
 en_AU "English (Australia)" "English (Australia)" 72%
 es    "Spanish" "Español" 99%