diff --git a/packages/locale/de/LC_MESSAGES/AC.mo b/packages/locale/de/LC_MESSAGES/AC.mo index 6fe28a7c..74cd7f19 100644 Binary files a/packages/locale/de/LC_MESSAGES/AC.mo and b/packages/locale/de/LC_MESSAGES/AC.mo differ diff --git a/source/locale/AC.pot b/source/locale/AC.pot index 53459244..b0429685 100644 --- a/source/locale/AC.pot +++ b/source/locale/AC.pot @@ -1,13 +1,14 @@ -# AssaultCube i18n TEMPLATE -# Copyright (C) 2010 RabidViper Productions -# This file is distributed under the same license as the AssaultCube package. -# flowtron , 2010. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: AC-1.1\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 19:14+0200\n" +"POT-Creation-Date: 2010-08-08 00:37+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -55,57 +56,57 @@ msgstr "" msgid "not connected" msgstr "" -#: client.cpp:212 client.cpp:525 +#: client.cpp:212 client.cpp:527 msgid "attempting to disconnect..." msgstr "" -#: client.cpp:497 +#: client.cpp:499 msgid "attempting to connect..." msgstr "" -#: client.cpp:502 client.cpp:538 +#: client.cpp:504 client.cpp:540 #, c-format msgid "%c3could not connect to server" msgstr "" -#: client.cpp:515 +#: client.cpp:517 msgid "connected to server" msgstr "" -#: client.cpp:543 +#: client.cpp:545 #, c-format msgid "%c3server network error, disconnecting (%s) ..." msgstr "" -#: client.cpp:565 +#: client.cpp:567 #, c-format msgid "%c3map %s is secured, you can not send, receive or overwrite it" msgstr "" -#: client.cpp:593 +#: client.cpp:595 #, c-format msgid "map %s is too large to send" msgstr "" -#: client.cpp:607 +#: client.cpp:609 #, c-format msgid "sending map %s to server..." msgstr "" -#: client.cpp:612 +#: client.cpp:614 msgid "requesting map from server..." msgstr "" -#: client.cpp:627 +#: client.cpp:633 msgid "getting demo..." msgstr "" -#: client.cpp:628 +#: client.cpp:634 #, c-format msgid "getting demo %d..." msgstr "" -#: client.cpp:634 +#: client.cpp:640 msgid "listing demos..." msgstr "" @@ -146,63 +147,63 @@ msgstr "" msgid "your team is: %s" msgstr "" -#: clientgame.cpp:716 +#: clientgame.cpp:719 msgid "intermission:" msgstr "" -#: clientgame.cpp:717 +#: clientgame.cpp:720 msgid "game has ended!" msgstr "" -#: clientgame.cpp:724 +#: clientgame.cpp:727 #, c-format msgid "time remaining: %d minutes" msgstr "" -#: clientgame.cpp:794 +#: clientgame.cpp:797 #, c-format msgid "%c3invalid ctf-flag entity (%i)" msgstr "" -#: clientgame.cpp:865 +#: clientgame.cpp:868 #, c-format msgid "game mode is \"%s\"%s" msgstr "" -#: clientgame.cpp:1084 +#: clientgame.cpp:1097 #, c-format msgid "%c3invalid vote" msgstr "" -#: clientgame.cpp:1106 +#: clientgame.cpp:1119 #, c-format msgid "%c3invalid reason" msgstr "" -#: clientgame.cpp:1119 +#: clientgame.cpp:1132 #, c-format msgid "%c3you voted already" msgstr "" -#: clientgame.cpp:1136 +#: clientgame.cpp:1149 #, c-format msgid "%s called a vote: %s" msgstr "" -#: clientgame.cpp:1152 +#: clientgame.cpp:1165 #, c-format msgid "%c3could not vote: %s" msgstr "" -#: clientgame.cpp:1163 +#: clientgame.cpp:1176 msgid "failed" msgstr "" -#: clientgame.cpp:1163 +#: clientgame.cpp:1176 msgid "passed" msgstr "" -#: clientgame.cpp:1163 +#: clientgame.cpp:1176 #, c-format msgid "vote %s" msgstr "" @@ -233,35 +234,35 @@ msgstr "" msgid "older" msgstr "" -#: clients2c.cpp:334 +#: clients2c.cpp:336 #, c-format msgid "%c3you are using a different game protocol (you: %d, server: %d)" msgstr "" -#: clients2c.cpp:341 +#: clients2c.cpp:343 msgid "INFO: this server is password protected" msgstr "" -#: clients2c.cpp:455 clients2c.cpp:490 +#: clients2c.cpp:457 clients2c.cpp:492 #, c-format msgid "%s is now known as %s" msgstr "" -#: clients2c.cpp:494 +#: clients2c.cpp:496 #, c-format msgid "connected: %s" msgstr "" -#: clients2c.cpp:513 +#: clients2c.cpp:515 #, c-format msgid "player %s disconnected" msgstr "" -#: clients2c.cpp:550 +#: clients2c.cpp:552 msgid "map deemed unplayable - fix it before you can spawn" msgstr "" -#: clients2c.cpp:574 +#: clients2c.cpp:576 msgid "new round starting... fight!" msgstr "" @@ -275,117 +276,122 @@ msgstr "" msgid "%s started a new map of size %d" msgstr "" -#: clients2c.cpp:911 +#: clients2c.cpp:912 msgid "the round is over! next round in 5 seconds..." msgstr "" -#: clients2c.cpp:912 +#: clients2c.cpp:913 msgid "the bots have won the round!" msgstr "" -#: clients2c.cpp:913 +#: clients2c.cpp:914 msgid "everyone died!" msgstr "" -#: clients2c.cpp:914 +#: clients2c.cpp:915 #, c-format msgid "team %s has won the round!" msgstr "" -#: clients2c.cpp:915 +#: clients2c.cpp:916 msgid "you are the survivor!" msgstr "" -#: clients2c.cpp:916 +#: clients2c.cpp:917 #, c-format msgid "%s is the survivor!" msgstr "" -#: clients2c.cpp:972 +#: clients2c.cpp:976 +#, c-format +msgid "you claimed %s status" +msgstr "" + +#: clients2c.cpp:977 #, c-format msgid "%s claimed %s status" msgstr "" -#: clients2c.cpp:972 clients2c.cpp:1039 -msgid "you" -msgstr "" - -#: clients2c.cpp:983 +#: clients2c.cpp:989 #, c-format msgid "you can't change to team %s" msgstr "" -#: clients2c.cpp:987 +#: clients2c.cpp:993 msgid "active" msgstr "" -#: clients2c.cpp:987 +#: clients2c.cpp:993 msgid "spectate" msgstr "" -#: clients2c.cpp:987 +#: clients2c.cpp:993 #, c-format msgid "you can't change to %s mode" msgstr "" -#: clients2c.cpp:1014 +#: clients2c.cpp:1020 #, c-format msgid "you're now in team %s" msgstr "" -#: clients2c.cpp:1017 +#: clients2c.cpp:1023 #, c-format msgid "the server forced you to team %s" msgstr "" -#: clients2c.cpp:1028 +#: clients2c.cpp:1034 #, c-format msgid "player %s switched to team %s" msgstr "" -#: clients2c.cpp:1031 +#: clients2c.cpp:1037 #, c-format msgid "the server forced %s to team %s" msgstr "" -#: clients2c.cpp:1032 +#: clients2c.cpp:1038 msgid "the enemy" msgstr "" -#: clients2c.cpp:1032 +#: clients2c.cpp:1038 #, c-format msgid "the server forced %s to %s team" msgstr "" -#: clients2c.cpp:1032 +#: clients2c.cpp:1038 msgid "your" msgstr "" -#: clients2c.cpp:1039 +#: clients2c.cpp:1045 #, c-format msgid "%s changed to active play" msgstr "" -#: clients2c.cpp:1139 +#: clients2c.cpp:1045 +msgid "you" +msgstr "" + +#: clients2c.cpp:1145 msgid "no demos available" msgstr "" -#: clients2c.cpp:1203 +#: clients2c.cpp:1211 #, c-format msgid "failed writing to \"%s\"" msgstr "" -#: clients2c.cpp:1206 +#: clients2c.cpp:1214 #, c-format msgid "received demo \"%s\"" msgstr "" -#: clients2c.cpp:1215 +#: clients2c.cpp:1223 #, c-format msgid "received map \"%s\" from server, reloading.." msgstr "" -#: clients2c.cpp:1222 +#: clients2c.cpp:1230 #, c-format msgid "map %s is too large to receive" msgstr "" @@ -427,11 +433,11 @@ msgstr "" msgid "Quit" msgstr "" -#: menus.cpp:1275 +#: menus.cpp:1351 msgid "..restart AssaultCube for this setting to take effect" msgstr "" -#: physics.cpp:817 +#: physics.cpp:901 #, c-format msgid "can't find entity spawn spot! (%d, %d)" msgstr "" diff --git a/source/locale/de/LC_MESSAGES/AC.mo b/source/locale/de/LC_MESSAGES/AC.mo index 6fe28a7c..74cd7f19 100644 Binary files a/source/locale/de/LC_MESSAGES/AC.mo and b/source/locale/de/LC_MESSAGES/AC.mo differ diff --git a/source/locale/de/LC_MESSAGES/AC.po b/source/locale/de/LC_MESSAGES/AC.po index 2f4e505c..cffe782f 100644 --- a/source/locale/de/LC_MESSAGES/AC.po +++ b/source/locale/de/LC_MESSAGES/AC.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: AC-1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 19:05+0200\n" +"POT-Creation-Date: 2010-08-08 00:37+0200\n" "PO-Revision-Date: 2010-07-10 22:20+0200\n" "Last-Translator: flowtron \n" "Language-Team: German\n" @@ -53,12 +53,12 @@ msgstr "" "%c3\"%s\" ist kein gueltiger Teamname, waehle CLA, RVSF oder SPECTATOR " "(Zuschauer)" -#: client.cpp:502 client.cpp:538 +#: client.cpp:504 client.cpp:540 #, c-format msgid "%c3could not connect to server" msgstr "%c3konnte nicht zum Server verbinden" -#: clientgame.cpp:1152 +#: clientgame.cpp:1165 #, c-format msgid "%c3could not vote: %s" msgstr "%c3konnte nicht stimmen: %s" @@ -68,70 +68,70 @@ msgstr "%c3konnte nicht stimmen: %s" msgid "%c3demo was recorded on map revision %d, you have map revision %d" msgstr "%c3Demo wurde fuer Kartenrevision %d aufgenommen, Du hast Revision %d" -#: clientgame.cpp:794 +#: clientgame.cpp:797 #, c-format msgid "%c3invalid ctf-flag entity (%i)" msgstr "%c3ungueltiges CTF-Flaggen Objekt (%i)" -#: clientgame.cpp:1106 +#: clientgame.cpp:1119 #, c-format msgid "%c3invalid reason" msgstr "%c3Ungueltige Abstimmung" -#: clientgame.cpp:1084 +#: clientgame.cpp:1097 #, c-format msgid "%c3invalid vote" msgstr "%c3Ungueltige Abstimmung" -#: client.cpp:565 +#: client.cpp:567 #, c-format msgid "%c3map %s is secured, you can not send, receive or overwrite it" msgstr "" "%c3Die Karte %s ist gesichert. Sie kann nicht gesandt, gesaugt oder " "ueberschrieben werden" -#: client.cpp:543 +#: client.cpp:545 #, c-format msgid "%c3server network error, disconnecting (%s) ..." msgstr "%c3Server Netzwerkfehler. Trenne Verbindung (%s) ..." -#: clients2c.cpp:334 +#: clients2c.cpp:336 #, c-format msgid "%c3you are using a different game protocol (you: %d, server: %d)" msgstr "" "%c3Dein Protokoll und das des Servers unterscheiden sich (Du: %d, Server: %d)" -#: clientgame.cpp:1119 +#: clientgame.cpp:1132 #, c-format msgid "%c3you voted already" msgstr "%c3Du hast schon gestimmt" -#: clientgame.cpp:1136 +#: clientgame.cpp:1149 #, c-format msgid "%s called a vote: %s" msgstr "%s will abstimmen: %s" -#: clients2c.cpp:1039 +#: clients2c.cpp:1045 #, c-format msgid "%s changed to active play" msgstr "%s wechselte in den aktiven Modus" -#: clients2c.cpp:972 +#: clients2c.cpp:977 #, c-format msgid "%s claimed %s status" -msgstr "%s erwarbst %s Status" +msgstr "%s erwarb %s Status" #: clients2c.cpp:804 #, c-format msgid "%s enlarged the map to size %d" msgstr "%s hat die Karte auf Groesse %d erweitert" -#: clients2c.cpp:455 clients2c.cpp:490 +#: clients2c.cpp:457 clients2c.cpp:492 #, c-format msgid "%s is now known as %s" msgstr "%s heisst jetzt %s" -#: clients2c.cpp:916 +#: clients2c.cpp:917 #, c-format msgid "%s is the survivor!" msgstr "%s blieb am Leben!" @@ -141,7 +141,7 @@ msgstr "%s blieb am Leben!" msgid "%s started a new map of size %d" msgstr "%s begann eine neue Karte der Groesse %d" -#: menus.cpp:1275 +#: menus.cpp:1351 msgid "..restart AssaultCube for this setting to take effect" msgstr "..starte AssaultCube neu damit diese Einstellung wirkt" @@ -161,7 +161,7 @@ msgstr "Editieren" msgid "Help" msgstr "Hilfe" -#: clients2c.cpp:341 +#: clients2c.cpp:343 msgid "INFO: this server is password protected" msgstr "INFO: Dieser Server ist Passwort-geschuetzt" @@ -185,7 +185,7 @@ msgstr "Einzelspieler" msgid "aborting connection attempt" msgstr "breche Verbindungsversuch ab" -#: clients2c.cpp:987 +#: clients2c.cpp:993 msgid "active" msgstr "aktiven" @@ -195,24 +195,24 @@ msgid "adding server \"%cs%s%cr\" to favourites category '%cs%s%cr' (new '%s')" msgstr "" "fuege Server \"%cs%s%cr\" zur Favoriten-Kategorie '%cs%s%cr' (Neu '%s')" -#: client.cpp:497 +#: client.cpp:499 msgid "attempting to connect..." msgstr "versuche eine Verbindung aufzubauen" -#: client.cpp:212 client.cpp:525 +#: client.cpp:212 client.cpp:527 msgid "attempting to disconnect..." msgstr "versuche die Verbindung zu trennen..." -#: physics.cpp:817 +#: physics.cpp:901 #, c-format msgid "can't find entity spawn spot! (%d, %d)" msgstr "Spawnstelle bietet keinen Platz! (%d, %d)" -#: client.cpp:515 +#: client.cpp:517 msgid "connected to server" msgstr "mit Server verbunden" -#: clients2c.cpp:494 +#: clients2c.cpp:496 #, c-format msgid "connected: %s" msgstr "verbunden: %s" @@ -236,34 +236,34 @@ msgstr "" "Um im Mehrspieler-Modus editieren zu koennen wird der coopedit Spieltyp " "benoetigt (1)" -#: clients2c.cpp:913 +#: clients2c.cpp:914 msgid "everyone died!" msgstr "alle tot!" -#: clientgame.cpp:1163 +#: clientgame.cpp:1176 msgid "failed" msgstr "gescheitert" -#: clients2c.cpp:1203 +#: clients2c.cpp:1211 #, c-format msgid "failed writing to \"%s\"" msgstr "Fehler beim schreiben von \"%s\"" -#: clientgame.cpp:717 +#: clientgame.cpp:720 msgid "game has ended!" msgstr "Spielende!" -#: clientgame.cpp:865 +#: clientgame.cpp:868 #, c-format msgid "game mode is \"%s\"%s" msgstr "Im Spieltyp \"%s\"%s" -#: client.cpp:628 +#: client.cpp:634 #, c-format msgid "getting demo %d..." msgstr "hole demo %d..." -#: client.cpp:627 +#: client.cpp:633 msgid "getting demo..." msgstr "hole demo..." @@ -272,25 +272,25 @@ msgstr "hole demo..." msgid "ignored players: %s" msgstr "ignorierte Spieler: %s" -#: clientgame.cpp:716 +#: clientgame.cpp:719 msgid "intermission:" msgstr "Zwischenspiel:" -#: client.cpp:634 +#: client.cpp:640 msgid "listing demos..." msgstr "Demoliste..." -#: clients2c.cpp:1222 +#: clients2c.cpp:1230 #, c-format msgid "map %s is too large to receive" msgstr "Die Karte %s ist zu gross um gesandt zu werden" -#: client.cpp:593 +#: client.cpp:595 #, c-format msgid "map %s is too large to send" msgstr "Die Karte %s ist zu gross um gesandt zu werden" -#: clients2c.cpp:550 +#: clients2c.cpp:552 msgid "map deemed unplayable - fix it before you can spawn" msgstr "" "Karte als unspielbar eingestuft - kein spielen moeglich bis dies behoben " @@ -301,7 +301,7 @@ msgstr "" msgid "muted players: %s" msgstr "stumme Spieler: %s" -#: clients2c.cpp:574 +#: clients2c.cpp:576 msgid "new round starting... fight!" msgstr "neue Runde beginnt.. kaempfe!" @@ -309,7 +309,7 @@ msgstr "neue Runde beginnt.. kaempfe!" msgid "newer" msgstr "neuere" -#: clients2c.cpp:1139 +#: clients2c.cpp:1145 msgid "no demos available" msgstr "keine Demos verfuegbar" @@ -333,26 +333,26 @@ msgstr "aeltere" msgid "operation not available in multiplayer" msgstr "Aktion nicht im Mehrspieler-Modus verfuegbar" -#: clientgame.cpp:1163 +#: clientgame.cpp:1176 msgid "passed" msgstr "erfolgreich" -#: clients2c.cpp:513 +#: clients2c.cpp:515 #, c-format msgid "player %s disconnected" msgstr "Spieler %s getrennt" -#: clients2c.cpp:1028 +#: clients2c.cpp:1034 #, c-format msgid "player %s switched to team %s" msgstr "Spieler %s wechselte zum Team %s" -#: clients2c.cpp:1206 +#: clients2c.cpp:1214 #, c-format msgid "received demo \"%s\"" msgstr "Demo \"%s\" erhalten" -#: clients2c.cpp:1215 +#: clients2c.cpp:1223 #, c-format msgid "received map \"%s\" from server, reloading.." msgstr "Karte \"%s\" vom Server erhalten, lade neu.." @@ -365,11 +365,11 @@ msgstr "" "entferne Server \"%cs%s%cr\" von der Favoriten-Kategorie '%cs%s%cr' (Rest '%" "s')" -#: client.cpp:612 +#: client.cpp:614 msgid "requesting map from server..." msgstr "fordere Karte vom Server an..." -#: client.cpp:607 +#: client.cpp:609 #, c-format msgid "sending map %s to server..." msgstr "sende Karte %s an den Server..." @@ -383,80 +383,85 @@ msgstr "" "Server \"%cs%s%cr\" ist in Kategorie '%cs%s%cr' wegen Schluessel '%s', bitte " "enferne diesen von Hand" -#: clients2c.cpp:987 +#: clients2c.cpp:993 msgid "spectate" msgstr "passiven" -#: clients2c.cpp:914 +#: clients2c.cpp:915 #, c-format msgid "team %s has won the round!" msgstr "Team %s hat die Runde gewonnen!" -#: clients2c.cpp:912 +#: clients2c.cpp:913 msgid "the bots have won the round!" msgstr "Die Bots haben die Runde gewonnen!" -#: clients2c.cpp:1032 +#: clients2c.cpp:1038 msgid "the enemy" msgstr "gegnerischen" -#: clients2c.cpp:911 +#: clients2c.cpp:912 msgid "the round is over! next round in 5 seconds..." msgstr "Die Runde ist vorueber! Naechste Runde in 5 Sekunden..." -#: clients2c.cpp:1032 +#: clients2c.cpp:1038 #, c-format msgid "the server forced %s to %s team" msgstr "Der Server zwang %s zum %s Team" -#: clients2c.cpp:1031 +#: clients2c.cpp:1037 #, c-format msgid "the server forced %s to team %s" msgstr "Der Server zwang %s ins Team %s" -#: clients2c.cpp:1017 +#: clients2c.cpp:1023 #, c-format msgid "the server forced you to team %s" msgstr "Der Server zwang Dich ins Team %s" -#: clientgame.cpp:724 +#: clientgame.cpp:727 #, c-format msgid "time remaining: %d minutes" msgstr "verbleibende Zeit: %d Minuten" -#: clientgame.cpp:1163 +#: clientgame.cpp:1176 #, c-format msgid "vote %s" msgstr "Abstimmung %s" -#: clients2c.cpp:972 clients2c.cpp:1039 +#: clients2c.cpp:1045 msgid "you" msgstr "Du" -#: clients2c.cpp:915 +#: clients2c.cpp:916 msgid "you are the survivor!" msgstr "Du bliebst am Leben!" -#: clients2c.cpp:987 +#: clients2c.cpp:993 #, c-format msgid "you can't change to %s mode" msgstr "Du kannst nicht in den %s Modus wechseln" -#: clients2c.cpp:983 +#: clients2c.cpp:989 #, c-format msgid "you can't change to team %s" msgstr "Du kannst nicht zum %s Team wechseln" +#: clients2c.cpp:976 +#, c-format +msgid "you claimed %s status" +msgstr "Du erwarbst %s Status" + #: clientgame.cpp:191 msgid "you need to be dead to become spectator" msgstr "Du musst tot sein um Zuschauer werden zu koennen" -#: clients2c.cpp:1014 +#: clients2c.cpp:1020 #, c-format msgid "you're now in team %s" msgstr "Du bist jetzt im Team %s" -#: clients2c.cpp:1032 +#: clients2c.cpp:1038 msgid "your" msgstr "Deinem" diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp index 3cdfd219..254d9011 100644 --- a/source/src/clients2c.cpp +++ b/source/src/clients2c.cpp @@ -970,7 +970,12 @@ void parsemessages(int cn, playerent *d, ucharbuf &p) if(pl) { pl->clientrole = r; - if(pl->name[0]) conoutf(_("%s claimed %s status"), pl == player1 ? _("you") : colorname(pl), r == CR_ADMIN ? "admin" : "master"); + if(pl->name[0]) + { + // two messages required to allow for proper german translation - is there a better way to do it? + if(pl==player1) conoutf(_("you claimed %s status"), r == CR_ADMIN ? "admin" : "master"); + else conoutf(_("%s claimed %s status"), colorname(pl), r == CR_ADMIN ? "admin" : "master"); + } } } break;