Merge branch 'master' into fix_for_2377

1 files changed, 23 insertions, 19 deletions

diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 5f4d199f3e5..fb877debb85 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-24 01:57+0200\n"
-"PO-Revision-Date: 2013-05-23 23:15+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr "afturkalla"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:78
-#: templates/users.php:103
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Hópar"
 
-#: js/users.js:95 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Hópstjóri"
 
-#: js/users.js:115 templates/users.php:155
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Eyða"
 
@@ -153,15 +153,15 @@ msgstr "Eyða"
 msgid "add group"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:421 js/users.js:427 js/users.js:442
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:426
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:77
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Lykilorð"
 
@@ -423,7 +423,7 @@ msgstr "Nýtt lykilorð"
 msgid "Change password"
 msgstr "Breyta lykilorði"
 
-#: templates/personal.php:56 templates/users.php:76
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
@@ -455,7 +455,7 @@ msgstr "WebDAV"
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Notaðu þessa vefslóð til að tengjast ownCloud svæðinu þínu"
 
-#: templates/users.php:21 templates/users.php:75
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
@@ -463,30 +463,34 @@ msgstr ""
 msgid "Create"
 msgstr "Búa til"
 
-#: templates/users.php:33
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Sjálfgefin gagnageymsla"
 
-#: templates/users.php:39 templates/users.php:133
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Ótakmarkað"
 
-#: templates/users.php:57 templates/users.php:148
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Annað"
 
-#: templates/users.php:82
+#: templates/users.php:87
 msgid "Storage"
 msgstr "gagnapláss"
 
-#: templates/users.php:93
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:97
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:128
+#: templates/users.php:133
 msgid "Default"
 msgstr "Sjálfgefið"