summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-01-20 17:28:23 -0700
committerJared Adams <jaxad0127@gmail.com>2010-01-20 17:29:10 -0700
commit762053a1547c32c2036f0d3647bfb8d19d009320 (patch)
tree03b2928bef5d734f9edf5de2a39b83aabf615798
parentbc510d9de037b665dc96f97da1848d69e5a8b0ed (diff)
downloadmana-client-762053a1547c32c2036f0d3647bfb8d19d009320.tar.gz
mana-client-762053a1547c32c2036f0d3647bfb8d19d009320.tar.bz2
mana-client-762053a1547c32c2036f0d3647bfb8d19d009320.tar.xz
mana-client-762053a1547c32c2036f0d3647bfb8d19d009320.zip
Fix compile error in CharSelectDialog::chooseSelected
Was missing return statement.
-rw-r--r--po/de.po57
-rw-r--r--src/gui/charselectdialog.cpp2
2 files changed, 36 insertions, 23 deletions
diff --git a/po/de.po b/po/de.po
index a25b80e8..b3cc3ccb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,6 +2,9 @@
# Copyright (C) 2007 The Mana World Development Team
# This file is distributed under the same license as the The Mana World package.
#
+# Matthias Hartmann <hartmann.matthias@gmail.com>, 2007.
+# Jonathan Raphael Joachim Kolberg, 2009, 2010.
+# seeseekey <seeseekey@googlemail.com>, 2009.
#: src/commandhandler.cpp:149 src/commandhandler.cpp:319
#: src/commandhandler.cpp:320 src/commandhandler.cpp:344
#: src/commandhandler.cpp:397 src/engine.cpp:50 src/engine.cpp:57
@@ -52,9 +55,6 @@
#: src/resources/itemdb.cpp:228 src/resources/itemdb.cpp:229
#: src/resources/itemdb.cpp:230 src/resources/itemdb.cpp:306
#: src/resources/monsterdb.cpp:101 src/resources/monsterdb.cpp:133
-# Matthias Hartmann <hartmann.matthias@gmail.com>, 2007.
-# Jonathan Raphael Joachim Kolberg, 2009, 2010.
-# seeseekey <seeseekey@googlemail.com>, 2009.
msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
@@ -1229,11 +1229,13 @@ msgstr ""
msgid "%d FPS"
msgstr ""
-#: src/gui/debugwindow.cpp:65, c-format
+#: src/gui/debugwindow.cpp:65
+#, c-format
msgid "Music: %s"
msgstr "Musik: %s"
-#: src/gui/debugwindow.cpp:66, c-format
+#: src/gui/debugwindow.cpp:66
+#, c-format
msgid "Map: %s"
msgstr "Karte : %s"
@@ -1941,6 +1943,16 @@ msgstr "Partyeinladung von %s abgelehnt."
msgid "PopupMenu"
msgstr ""
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "Handele mit %s"
+
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:160
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Angriff %+d"
+
#: src/gui/popupmenu.cpp:92
#, c-format
msgid "Whisper %s"
@@ -2024,10 +2036,6 @@ msgstr "Angriff"
msgid "/w \""
msgstr ""
-#: src/gui/popupmenu.cpp:229
-msgid "\" "
-msgstr ""
-
#: src/gui/popupmenu.cpp:245
#, fuzzy
msgid "disregard"
@@ -2186,15 +2194,6 @@ msgstr "Die Warteschlange ist leer."
msgid "sell"
msgstr "Verkaufen"
-#: src/gui/serverdialog.cpp:76 src/gui/updatewindow.cpp:301
-#: src/gui/worldselectdialog.cpp:64
-msgid " ("
-msgstr ""
-
-#: src/gui/serverdialog.cpp:80 src/gui/worldselectdialog.cpp:64
-msgid ")"
-msgstr ""
-
#: src/gui/serverdialog.cpp:87
msgid "Choose Your Server"
msgstr "Wähle deinen Server"
@@ -4035,6 +4034,10 @@ msgstr "Ungültiger Updateserver: "
msgid "http://updates.themanaworld.org/"
msgstr ""
+#: src/main.cpp:211
+msgid "://"
+msgstr ""
+
#: src/main.cpp:216 src/main.cpp:229
msgid "updates/"
msgstr ""
@@ -4053,6 +4056,10 @@ msgstr "Ungültiger Updateserver: "
msgid "Warning: no protocol was specified for the update host"
msgstr ""
+#: src/main.cpp:241 src/main.cpp:246
+msgid "\\"
+msgstr ""
+
#: src/main.cpp:253
#, fuzzy, c-format
msgid "Error: %s can't be made, but doesn't exist!"
@@ -4067,6 +4074,15 @@ msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
msgid "Error: %s/%s can't be made, but doesn't exist!"
msgstr " konnte nicht erstellt werden, aber existiert auch nicht! Beende."
+#: src/main.cpp:281
+msgid "/Library/Application Support/"
+msgstr ""
+
+#: src/main.cpp:282 src/main.cpp:371
+#, fuzzy
+msgid "appName"
+msgstr "Name"
+
#: src/main.cpp:282
#, fuzzy
msgid "Mana"
@@ -4308,10 +4324,6 @@ msgstr "Benutzername ist %s"
msgid "LANG="
msgstr ""
-#: src/main.cpp:694
-msgid "translations/"
-msgstr ""
-
#: src/main.cpp:699
msgid "UTF-8"
msgstr ""
@@ -4880,7 +4892,6 @@ msgstr "Dieser Befehl lässt Dich die Party verlassen"
#: src/net/ea/gui/partytab.cpp:87 src/net/ea/gui/partytab.cpp:129
#: src/net/ea/gui/partytab.cpp:161 src/resources/itemdb.cpp:128
-#, fuzzy
msgid "item"
msgstr ""
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 66370a79..e9c2551f 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -277,6 +277,8 @@ bool CharSelectDialog::chooseSelected()
setVisible(false);
attemptCharSelect();
+
+ return true;
}
void CharSelectDialog::update(int slot)