Another transifex sync.

diff --git a/.tx/merge-base b/.tx/merge-base
index cad503c676ba8cb5f25690658c44072d37cd01ef..a517ba03f14a4147d472872428ddb4e51b1b68fe 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  4 16:01:46 CEST 2014
+Wed Jun  4 16:12:08 CEST 2014

diff --git a/common.ast.po b/common.ast.po
index 23b7bb1695be8b89d9ef820135870045b9d51ce0..89e4680d301a3183718c37d98d3214d120a710f0 100644 (file)
--- a/common.ast.po
+++ b/common.ast.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.

-# 
+#

 # Translators:
 msgid ""
 msgstr ""
 # Translators:
 msgid ""
 msgstr ""


@@ -10,11 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-06-04 15:59+0200\n"
 "PO-Revision-Date: 2014-06-04 13:59+0000\n"
 "Last-Translator: divVerent <divVerent@xonotic.org>\n"
 "POT-Creation-Date: 2014-06-04 15:59+0200\n"
 "PO-Revision-Date: 2014-06-04 13:59+0000\n"
 "Last-Translator: divVerent <divVerent@xonotic.org>\n"

-"Language-Team: Asturian (http://www.transifex.com/projects/p/xonotic/language/ast/)\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/xonotic/"
+"language/ast/)\n"
+"Language: ast\n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"Language: ast\n"

 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: qcsrc/client/Main.qc:21
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: qcsrc/client/Main.qc:21


@@ -321,7 +322,8 @@ msgid "%d seconds left"
 msgstr ""
 
 #: qcsrc/client/mapvoting.qc:273
 msgstr ""
 
 #: qcsrc/client/mapvoting.qc:273

-msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!\n"
+msgid ""
+"mv_mapdownload: ^3You're not supposed to use this command on your own!\n"

 msgstr ""
 
 #: qcsrc/client/mapvoting.qc:283
 msgstr ""
 
 #: qcsrc/client/mapvoting.qc:283


@@ -1338,8 +1340,8 @@ msgstr ""
 #: qcsrc/common/notifications.qh:344
 #, c-format
 msgid ""
 #: qcsrc/common/notifications.qh:344
 #, c-format
 msgid ""

-"^BG%s^BG captured the ^TC^TT^BG flag in ^F1%s^BG seconds, breaking "
-"^BG%s^BG's previous record of ^F2%s^BG seconds"
+"^BG%s^BG captured the ^TC^TT^BG flag in ^F1%s^BG seconds, breaking ^BG"
+"%s^BG's previous record of ^F2%s^BG seconds"

 msgstr ""
 
 #: qcsrc/common/notifications.qh:345
 msgstr ""
 
 #: qcsrc/common/notifications.qh:345


@@ -1375,8 +1377,8 @@ msgstr ""
 #: qcsrc/common/notifications.qh:351
 #, c-format
 msgid ""
 #: qcsrc/common/notifications.qh:351
 #, c-format
 msgid ""

-"^BGThe ^TC^TT^BG flag became impatient after ^F1%.2f^BG seconds and returned"
-" itself"
+"^BGThe ^TC^TT^BG flag became impatient after ^F1%.2f^BG seconds and returned "
+"itself"

 msgstr ""
 
 #: qcsrc/common/notifications.qh:352
 msgstr ""
 
 #: qcsrc/common/notifications.qh:352

diff --git a/common.ca.po b/common.ca.po
index 2f03af858c2c7edf7cedc02f1ebd44d460a0c814..b47984f4493aa84959ca791360f5378039142df2 100644 (file)
--- a/common.ca.po
+++ b/common.ca.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.

-# 
+#

 # Translators:
 msgid ""
 msgstr ""
 # Translators:
 msgid ""
 msgstr ""


@@ -10,11 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-06-04 15:59+0200\n"
 "PO-Revision-Date: 2014-06-04 13:59+0000\n"
 "Last-Translator: divVerent <divVerent@xonotic.org>\n"
 "POT-Creation-Date: 2014-06-04 15:59+0200\n"
 "PO-Revision-Date: 2014-06-04 13:59+0000\n"
 "Last-Translator: divVerent <divVerent@xonotic.org>\n"

-"Language-Team: Catalan (http://www.transifex.com/projects/p/xonotic/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/xonotic/language/"
+"ca/)\n"
+"Language: ca\n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"Language: ca\n"

 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: qcsrc/client/Main.qc:21
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: qcsrc/client/Main.qc:21


@@ -321,7 +322,8 @@ msgid "%d seconds left"
 msgstr ""
 
 #: qcsrc/client/mapvoting.qc:273
 msgstr ""
 
 #: qcsrc/client/mapvoting.qc:273

-msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!\n"
+msgid ""
+"mv_mapdownload: ^3You're not supposed to use this command on your own!\n"

 msgstr ""
 
 #: qcsrc/client/mapvoting.qc:283
 msgstr ""
 
 #: qcsrc/client/mapvoting.qc:283


@@ -1338,8 +1340,8 @@ msgstr ""
 #: qcsrc/common/notifications.qh:344
 #, c-format
 msgid ""
 #: qcsrc/common/notifications.qh:344
 #, c-format
 msgid ""

-"^BG%s^BG captured the ^TC^TT^BG flag in ^F1%s^BG seconds, breaking "
-"^BG%s^BG's previous record of ^F2%s^BG seconds"
+"^BG%s^BG captured the ^TC^TT^BG flag in ^F1%s^BG seconds, breaking ^BG"
+"%s^BG's previous record of ^F2%s^BG seconds"

 msgstr ""
 
 #: qcsrc/common/notifications.qh:345
 msgstr ""
 
 #: qcsrc/common/notifications.qh:345


@@ -1375,8 +1377,8 @@ msgstr ""
 #: qcsrc/common/notifications.qh:351
 #, c-format
 msgid ""
 #: qcsrc/common/notifications.qh:351
 #, c-format
 msgid ""

-"^BGThe ^TC^TT^BG flag became impatient after ^F1%.2f^BG seconds and returned"
-" itself"
+"^BGThe ^TC^TT^BG flag became impatient after ^F1%.2f^BG seconds and returned "
+"itself"

 msgstr ""
 
 #: qcsrc/common/notifications.qh:352
 msgstr ""
 
 #: qcsrc/common/notifications.qh:352

diff --git a/common.de.po b/common.de.po
index e6e584bcf121368c555c43db7694d46a61fed1d9..b51d4170e98ead256944ee64f596cf60da700fc0 100644 (file)
--- a/common.de.po
+++ b/common.de.po
@@ -10,14 +10,15 @@
 # Yepoleb <huberg18@gmail.com>, 2013
 # divVerent <divVerent@xonotic.org>, 2011
 # Sless <sless@gmx.net>, 2014
 # Yepoleb <huberg18@gmail.com>, 2013
 # divVerent <divVerent@xonotic.org>, 2011
 # Sless <sless@gmx.net>, 2014

+# Sless <sless@gmx.net>, 2014

 # Yepoleb <huberg18@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-04 15:59+0200\n"
 # Yepoleb <huberg18@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-04 15:59+0200\n"

-"PO-Revision-Date: 2014-06-04 13:59+0000\n"
-"Last-Translator: divVerent <divVerent@xonotic.org>\n"
+"PO-Revision-Date: 2014-06-04 14:09+0000\n"
+"Last-Translator: Sless <sless@gmx.net>\n"

 "Language-Team: German (http://www.transifex.com/projects/p/xonotic/language/"
 "de/)\n"
 "Language: de\n"
 "Language-Team: German (http://www.transifex.com/projects/p/xonotic/language/"
 "de/)\n"
 "Language: de\n"


@@ -774,7 +775,7 @@ msgstr "Zuschauer"
 #: qcsrc/client/scoreboard.qc:1352
 #, c-format
 msgid "playing ^3%s^7 on ^2%s^7"
 #: qcsrc/client/scoreboard.qc:1352
 #, c-format
 msgid "playing ^3%s^7 on ^2%s^7"

-msgstr ""
+msgstr "spielend ^3%s^7 auf ^2%s^7"

 
 #: qcsrc/client/scoreboard.qc:1359 qcsrc/client/scoreboard.qc:1364
 #, c-format
 
 #: qcsrc/client/scoreboard.qc:1359 qcsrc/client/scoreboard.qc:1364
 #, c-format


@@ -933,7 +934,7 @@ msgstr "Start"
 
 #: qcsrc/client/waypointsprites.qc:280
 msgid "Goal"
 
 #: qcsrc/client/waypointsprites.qc:280
 msgid "Goal"

-msgstr ""
+msgstr "Tor"

 
 #: qcsrc/client/waypointsprites.qc:281 qcsrc/client/waypointsprites.qc:282
 msgid "Ball"
 
 #: qcsrc/client/waypointsprites.qc:281 qcsrc/client/waypointsprites.qc:282
 msgid "Ball"


@@ -2883,7 +2884,7 @@ msgstr ""
 
 #: qcsrc/common/notifications.qh:640
 msgid "^BGYou picked up the ball"
 
 #: qcsrc/common/notifications.qh:640
 msgid "^BGYou picked up the ball"

-msgstr ""
+msgstr "^BGDu hast den Ball aufgenommen"

 
 #: qcsrc/common/notifications.qh:641
 msgid "^BGKilling people while you don't have the ball gives no points!"
 
 #: qcsrc/common/notifications.qh:641
 msgid "^BGKilling people while you don't have the ball gives no points!"


@@ -5938,23 +5939,24 @@ msgstr "Verwendung des Spielernamens für Spielerstatistiken erlauben"
 
 #: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.c:4
 msgid "Warning"
 
 #: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.c:4
 msgid "Warning"

-msgstr ""
+msgstr "Warnung"

 
 #: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.c:17
 msgid "While connected language changes will be applied only to the menu,"
 msgstr ""
 
 #: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.c:17
 msgid "While connected language changes will be applied only to the menu,"
 msgstr ""

+"Während du verbunden bist werden Sprachänderungen nur auf das Menü angewandt"

 
 #: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.c:19
 msgid "full language changes will take effect starting from the next game"
 
 #: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.c:19
 msgid "full language changes will take effect starting from the next game"

-msgstr ""
+msgstr "volle Sprachänderungen finden erst nach dem Neustart des Spiels statt"

 
 #: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.c:23
 msgid "Disconnect now"
 
 #: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.c:23
 msgid "Disconnect now"

-msgstr ""
+msgstr "Verbindung jetzt unterbrechen"

 
 #: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.c:24
 msgid "Switch language"
 
 #: qcsrc/menu/xonotic/dialog_settings_user_languagewarning.c:24
 msgid "Switch language"

-msgstr ""
+msgstr "Sprache ändern"

 
 #: qcsrc/menu/xonotic/dialog_settings_video.c:26
 msgid "Resolution:"
 
 #: qcsrc/menu/xonotic/dialog_settings_video.c:26
 msgid "Resolution:"

diff --git a/common.fr.po b/common.fr.po
index a7334f2d0748ec05c8306e987028d5639172f56a..a8909ffab136879ba8fb58c29ce38e2efd0dbe3a 100644 (file)
--- a/common.fr.po
+++ b/common.fr.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:

-# Calinou, 2013
+# Calinou, 2013-2014

 # Calinou <calinou9999@gmail.com>, 2012
 # Calinou, 2014
 # Maxime Paradis <taximus.micro@gmail.com>, 2011
 # Calinou <calinou9999@gmail.com>, 2012
 # Calinou, 2014
 # Maxime Paradis <taximus.micro@gmail.com>, 2011

diff --git a/common.mk.po b/common.mk.po
index b4d8c714415cc3fe434242d7566f2ac7f8ae954c..75c6ecde79af737251e036724efe57de9a81d7fc 100644 (file)
--- a/common.mk.po
+++ b/common.mk.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.

-# 
+#

 # Translators:
 msgid ""
 msgstr ""
 # Translators:
 msgid ""
 msgstr ""


@@ -10,11 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-06-04 15:59+0200\n"
 "PO-Revision-Date: 2014-06-04 13:59+0000\n"
 "Last-Translator: divVerent <divVerent@xonotic.org>\n"
 "POT-Creation-Date: 2014-06-04 15:59+0200\n"
 "PO-Revision-Date: 2014-06-04 13:59+0000\n"
 "Last-Translator: divVerent <divVerent@xonotic.org>\n"

-"Language-Team: Macedonian (http://www.transifex.com/projects/p/xonotic/language/mk/)\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/xonotic/"
+"language/mk/)\n"
+"Language: mk\n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"Language: mk\n"

 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #: qcsrc/client/Main.qc:21
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #: qcsrc/client/Main.qc:21


@@ -321,7 +322,8 @@ msgid "%d seconds left"
 msgstr ""
 
 #: qcsrc/client/mapvoting.qc:273
 msgstr ""
 
 #: qcsrc/client/mapvoting.qc:273

-msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!\n"
+msgid ""
+"mv_mapdownload: ^3You're not supposed to use this command on your own!\n"

 msgstr ""
 
 #: qcsrc/client/mapvoting.qc:283
 msgstr ""
 
 #: qcsrc/client/mapvoting.qc:283


@@ -1338,8 +1340,8 @@ msgstr ""
 #: qcsrc/common/notifications.qh:344
 #, c-format
 msgid ""
 #: qcsrc/common/notifications.qh:344
 #, c-format
 msgid ""

-"^BG%s^BG captured the ^TC^TT^BG flag in ^F1%s^BG seconds, breaking "
-"^BG%s^BG's previous record of ^F2%s^BG seconds"
+"^BG%s^BG captured the ^TC^TT^BG flag in ^F1%s^BG seconds, breaking ^BG"
+"%s^BG's previous record of ^F2%s^BG seconds"

 msgstr ""
 
 #: qcsrc/common/notifications.qh:345
 msgstr ""
 
 #: qcsrc/common/notifications.qh:345


@@ -1375,8 +1377,8 @@ msgstr ""
 #: qcsrc/common/notifications.qh:351
 #, c-format
 msgid ""
 #: qcsrc/common/notifications.qh:351
 #, c-format
 msgid ""

-"^BGThe ^TC^TT^BG flag became impatient after ^F1%.2f^BG seconds and returned"
-" itself"
+"^BGThe ^TC^TT^BG flag became impatient after ^F1%.2f^BG seconds and returned "
+"itself"

 msgstr ""
 
 #: qcsrc/common/notifications.qh:352
 msgstr ""
 
 #: qcsrc/common/notifications.qh:352

diff --git a/common.ru.po b/common.ru.po
index 3170a1024d25eeaf4361fbadb2c84c5fd7d3c938..171d2db281f1e19a6d514150a65586c10f2219fd 100644 (file)
--- a/common.ru.po
+++ b/common.ru.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:

+# adem4ik, 2014

 # Alex Talker <alextalker7@gmail.com>, 2014
 # adem4ik, 2014
 # Lord Canistra <lordcanistra@gmail.com>, 2011
 # Alex Talker <alextalker7@gmail.com>, 2014
 # adem4ik, 2014
 # Lord Canistra <lordcanistra@gmail.com>, 2011

diff --git a/common.sr.po b/common.sr.po
index 6005cd678dc44c54c46ed906d780d0f344c8ac34..1e9faed0c2565d518d3c6380ac8b55f1ffd428a9 100644 (file)
--- a/common.sr.po
+++ b/common.sr.po
@@ -6,6 +6,7 @@
 # Pendulla <djdjoric@gmail.com>, 2014
 # Pendulla <djdjoric@gmail.com>, 2014
 # Ristovski <rafael.ristovski@gmail.com>, 2014
 # Pendulla <djdjoric@gmail.com>, 2014
 # Pendulla <djdjoric@gmail.com>, 2014
 # Ristovski <rafael.ristovski@gmail.com>, 2014

+# Ristovski <rafael.ristovski@gmail.com>, 2014

 msgid ""
 msgstr ""
 "Project-Id-Version: Xonotic\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: Xonotic\n"