From 4282b48f3a5a0c1d58c484770b11632d782354d5 Mon Sep 17 00:00:00 2001
From: oliver <oliver@localhost>
Date: Sun, 19 Apr 2015 12:51:01 +0200
Subject: [PATCH] remove unused button at creating Achievments

---
 locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 25595 -> 25673 bytes
 locale/de_DE/LC_MESSAGES/The Legend of Z.po |  71 +++++++++++---------
 views/html/achievements/create.tpl          |   3 +-
 3 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo
index 8dcc351adfcdcd96aae1faf50a742cece17e0635..4bf816844a5f090441e10674ae733bd87e91aaf1 100644
GIT binary patch
delta 6348
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
D+WpNE

delta 6272
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

diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.po b/locale/de_DE/LC_MESSAGES/The Legend of Z.po
index f6c16015..fe0defe3 100644
--- a/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
+++ b/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Legend of Z\n"
-"POT-Creation-Date: 2015-04-19 11:29+0100\n"
-"PO-Revision-Date: 2015-04-19 11:29+0100\n"
+"POT-Creation-Date: 2015-04-19 12:49+0100\n"
+"PO-Revision-Date: 2015-04-19 12:50+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -104,10 +104,10 @@ msgstr ""
 #: questtypes/multiplechoice/html/edittask.tpl:79
 #: questtypes/textinput/html/edittask.tpl:44
 #: views/html/achievements/conditions.tpl:151
-#: views/html/achievements/create.tpl:109 views/html/achievements/edit.tpl:112
-#: views/html/charactertypes/edit.tpl:124 views/html/library/edit.tpl:46
-#: views/html/library/edit.tpl:86 views/html/quests/edit.tpl:114
-#: views/html/users/edit.tpl:105 views/html/xplevels/manage.tpl:49
+#: views/html/achievements/edit.tpl:112 views/html/charactertypes/edit.tpl:124
+#: views/html/library/edit.tpl:46 views/html/library/edit.tpl:86
+#: views/html/quests/edit.tpl:114 views/html/users/edit.tpl:109
+#: views/html/xplevels/manage.tpl:49
 msgid "save"
 msgstr "speichern"
 
@@ -723,9 +723,9 @@ msgstr "Quest"
 msgid "Achievement conditions Achievement"
 msgstr "Metaachievement"
 
-#: views/html/achievements/create.tpl:108 views/html/achievements/edit.tpl:111
-msgid "edit conditions"
-msgstr "Bedingungen bearbeiten"
+#: views/html/achievements/create.tpl:108
+msgid "save and edit conditions"
+msgstr "speichern und Bedingungen bearbeiten"
 
 #: views/html/achievements/delete.tpl:11
 msgid "Delete Achievement"
@@ -760,6 +760,10 @@ msgstr "Bedingung"
 msgid "Changing the condition will delete all current conditions"
 msgstr "Das Ändern der Bedingung löscht alle bisherigen Bedingungen"
 
+#: views/html/achievements/edit.tpl:111
+msgid "edit conditions"
+msgstr "Bedingungen bearbeiten"
+
 #: views/html/achievements/index.tpl:11
 msgid "Create new Achievement"
 msgstr "Neues Achievement erstellen"
@@ -987,7 +991,7 @@ msgstr "Motto"
 #: views/html/library/edit.tpl:124 views/html/questgroups/create.tpl:76
 #: views/html/questgroupshierarchy/create.tpl:63
 #: views/html/quests/create.tpl:108 views/html/seminaries/create.tpl:75
-#: views/html/users/create.tpl:96 views/html/xplevels/manage.tpl:83
+#: views/html/users/create.tpl:100 views/html/xplevels/manage.tpl:83
 msgid "create"
 msgstr "erstellen"
 
@@ -1456,9 +1460,9 @@ msgid "Login"
 msgstr "Login"
 
 #: views/html/error/index.tpl:8 views/html/error/index.tpl:9
-#: views/html/introduction/index.tpl:7 views/html/users/create.tpl:84
-#: views/html/users/create.tpl:85 views/html/users/edit.tpl:87
-#: views/html/users/edit.tpl:89 views/html/users/edit.tpl:91
+#: views/html/introduction/index.tpl:7 views/html/users/create.tpl:86
+#: views/html/users/create.tpl:87 views/html/users/edit.tpl:89
+#: views/html/users/edit.tpl:91 views/html/users/edit.tpl:93
 #: views/html/users/index.tpl:15 views/html/users/index.tpl:19
 #: views/html/users/index.tpl:20 views/html/users/login.tpl:12
 #: views/html/users/login.tpl:13 views/html/users/manage.tpl:14
@@ -1467,9 +1471,10 @@ msgid "Username"
 msgstr "Benutzername"
 
 #: views/html/error/index.tpl:10 views/html/error/index.tpl:11
-#: views/html/introduction/index.tpl:8 views/html/users/create.tpl:92
-#: views/html/users/create.tpl:93 views/html/users/edit.tpl:100
-#: views/html/users/edit.tpl:101 views/html/users/login.tpl:14
+#: views/html/introduction/index.tpl:8 views/html/users/create.tpl:94
+#: views/html/users/create.tpl:95 views/html/users/create.tpl:97
+#: views/html/users/edit.tpl:102 views/html/users/edit.tpl:103
+#: views/html/users/edit.tpl:105 views/html/users/login.tpl:14
 #: views/html/users/login.tpl:15 views/html/users/register.tpl:95
 #: views/html/users/register.tpl:96 views/html/users/register.tpl:98
 msgid "Password"
@@ -2069,29 +2074,40 @@ msgid "Password is too long (max. %d chars)"
 msgstr "Das Passwort ist zu lang (max. %d Zeichen)"
 
 #: views/html/users/create.tpl:67 views/html/users/edit.tpl:71
+#: views/html/users/register.tpl:69
+#, php-format
+msgid "Passwords does not match"
+msgstr "Passwörter stimmen nicht überein"
+
+#: views/html/users/create.tpl:69 views/html/users/edit.tpl:73
 #: views/html/users/register.tpl:71
 msgid "Password invalid"
 msgstr "Das Passwort ist ungültig"
 
-#: views/html/users/create.tpl:86 views/html/users/create.tpl:87
-#: views/html/users/edit.tpl:94 views/html/users/edit.tpl:95
+#: views/html/users/create.tpl:88 views/html/users/create.tpl:89
+#: views/html/users/edit.tpl:96 views/html/users/edit.tpl:97
 #: views/html/users/register.tpl:89 views/html/users/register.tpl:90
 msgid "Prename"
 msgstr "Vorname"
 
-#: views/html/users/create.tpl:88 views/html/users/create.tpl:89
-#: views/html/users/edit.tpl:96 views/html/users/edit.tpl:97
+#: views/html/users/create.tpl:90 views/html/users/create.tpl:91
+#: views/html/users/edit.tpl:98 views/html/users/edit.tpl:99
 #: views/html/users/register.tpl:91 views/html/users/register.tpl:92
 msgid "Surname"
 msgstr "Nachname"
 
-#: views/html/users/create.tpl:90 views/html/users/create.tpl:91
-#: views/html/users/edit.tpl:98 views/html/users/edit.tpl:99
+#: views/html/users/create.tpl:92 views/html/users/create.tpl:93
+#: views/html/users/edit.tpl:100 views/html/users/edit.tpl:101
 #: views/html/users/register.tpl:93 views/html/users/register.tpl:94
 #: views/html/users/user.tpl:24
 msgid "E‑mail address"
 msgstr "E‑Mail-Adresse"
 
+#: views/html/users/create.tpl:96 views/html/users/edit.tpl:104
+#: views/html/users/register.tpl:97
+msgid "Repeat password"
+msgstr "Passwort wiederholen"
+
 #: views/html/users/delete.tpl:8 views/html/users/user.tpl:18
 msgid "Delete user"
 msgstr "Benutzer löschen"
@@ -2105,7 +2121,7 @@ msgstr "Soll der Benutzer „%s“ (%s) wirklich gelöscht werden?"
 msgid "Edit user"
 msgstr "Benutzer bearbeiten"
 
-#: views/html/users/edit.tpl:103
+#: views/html/users/edit.tpl:107
 msgid "Mail notifications"
 msgstr "E‑Mailbenachrichtigungen"
 
@@ -2130,15 +2146,6 @@ msgstr "Registrierung"
 msgid "E‑Mail address has to end with @%s"
 msgstr "Die E‑Mail-Adresse muss auf @%s enden"
 
-#: views/html/users/register.tpl:69
-#, php-format
-msgid "Passwords does not match"
-msgstr "Passwörter stimmen nicht überein"
-
-#: views/html/users/register.tpl:97
-msgid "Repeat password"
-msgstr "Passwort wiederholen"
-
 #: views/html/users/register.tpl:100
 msgid "Register"
 msgstr "Registrieren"
diff --git a/views/html/achievements/create.tpl b/views/html/achievements/create.tpl
index fabd866a..af351f18 100644
--- a/views/html/achievements/create.tpl
+++ b/views/html/achievements/create.tpl
@@ -105,6 +105,5 @@
 			<?php endforeach ?>
 		</select>
 	</fieldset>
-	<input type="submit" name="edit-conditions" value="<?=_('edit conditions')?>" />
-	<input type="submit" name="edit" value="<?=_('save')?>" />
+	<input type="submit" name="edit" value="<?=_('save and edit conditions')?>" />
 </form>