Merge branch 'master' into setup

Conflicts:
	core/setup.php

9 files changed, 947 insertions, 635 deletions

diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index cfc83cf7733..f4c49800380 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-20 10:44-0400\n"
-"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2013-12-07 22:26-0500\n"
+"PO-Revision-Date: 2013-12-08 03:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,14 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:97
+#: ajax/share.php:119 ajax/share.php:198
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: ajax/share.php:227
-msgid "group"
+#: ajax/share.php:169
+#, php-format
+msgid "Couldn't send mail to following users: %s "
 msgstr ""
 
 #: ajax/update.php:11
@@ -51,45 +52,6 @@ msgstr ""
 msgid "... %d%% done ..."
 msgstr ""
 
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr ""
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr ""
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr ""
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr ""
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr ""
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr ""
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr ""
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -190,55 +152,55 @@ msgstr "Դեկտեմբեր"
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:866
+#: js/js.js:858
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:859
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:868
+#: js/js.js:860
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:869
+#: js/js.js:861
 msgid "today"
 msgstr ""
 
-#: js/js.js:870
+#: js/js.js:862
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:871
+#: js/js.js:863
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:864
 msgid "last month"
 msgstr ""
 
-#: js/js.js:873
+#: js/js.js:865
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:874
+#: js/js.js:866
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:875
+#: js/js.js:867
 msgid "last year"
 msgstr ""
 
-#: js/js.js:876
+#: js/js.js:868
 msgid "years ago"
 msgstr ""
 
@@ -306,155 +268,183 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
-#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
-#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
-msgid "The object type is not specified."
-msgstr ""
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:645 js/share.js:657
-msgid "Error"
-msgstr ""
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr ""
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr ""
-
-#: js/share.js:30 js/share.js:45 js/share.js:87
+#: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
 
-#: js/share.js:90
+#: js/share.js:109
 msgid "Share"
 msgstr ""
 
-#: js/share.js:131 js/share.js:685
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
+#: js/share.js:719 templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:160 js/share.js:747
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:142
+#: js/share.js:171
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:149
+#: js/share.js:178
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:187
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:160
+#: js/share.js:189
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:183
-msgid "Share with"
+#: js/share.js:213
+msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:188
-msgid "Share with link"
+#: js/share.js:219
+msgid "Share link"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:222
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:193 templates/installation.php:57 templates/login.php:26
+#: js/share.js:224 templates/installation.php:58 templates/login.php:38
 msgid "Password"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:229
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:202
+#: js/share.js:233
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:203
+#: js/share.js:234
 msgid "Send"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:239
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:209
+#: js/share.js:240
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:242
+#: js/share.js:275
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:278
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:283
+#: js/share.js:322 js/share.js:359
+msgid "group"
+msgstr ""
+
+#: js/share.js:333
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:319
+#: js/share.js:375
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:340
+#: js/share.js:397
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:352
+#: js/share.js:405
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:408
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:354
+#: js/share.js:410
 msgid "access control"
 msgstr ""
 
-#: js/share.js:357
+#: js/share.js:413
 msgid "create"
 msgstr ""
 
-#: js/share.js:360
+#: js/share.js:416
 msgid "update"
 msgstr ""
 
-#: js/share.js:363
+#: js/share.js:419
 msgid "delete"
 msgstr ""
 
-#: js/share.js:366
+#: js/share.js:422
 msgid "share"
 msgstr ""
 
-#: js/share.js:400 js/share.js:632
+#: js/share.js:694
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:645
+#: js/share.js:707
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:657
+#: js/share.js:719
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:672
+#: js/share.js:734
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:683
+#: js/share.js:745
 msgid "Email sent"
 msgstr ""
 
+#: js/share.js:769
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Ջնջել"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:8
+msgid "Please reload the page."
+msgstr ""
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -475,27 +465,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php:7
 msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
 msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
-#: templates/login.php:19
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
+#: templates/login.php:31
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
 msgid ""
 "Your files are encrypted. If you haven't enabled the recovery key, there "
 "will be no way to get your data back after your password is reset. If you "
@@ -503,12 +493,12 @@ msgid ""
 "continue. Do you really want to continue?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
 msgstr ""
 
 #: lostpassword/templates/resetpassword.php:4
@@ -535,7 +525,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:108
+#: strings.php:7 templates/layout.user.php:111
 msgid "Apps"
 msgstr ""
 
@@ -547,6 +537,34 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
@@ -563,108 +581,119 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-"Cheers!"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
 msgstr ""
 
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
 msgstr ""
 
-#: templates/installation.php:24 templates/installation.php:31
-#: templates/installation.php:38
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
 msgid "Security Warning"
 msgstr ""
 
-#: templates/installation.php:25
+#: templates/installation.php:26
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:27
 #, php-format
 msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
-#: templates/installation.php:32
+#: templates/installation.php:33
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:33
+#: templates/installation.php:34
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:39
+#: templates/installation.php:40
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:41
+#: templates/installation.php:42
 #, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:47
+#: templates/installation.php:48
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:65
+#: templates/installation.php:67
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:67
+#: templates/installation.php:74
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:77
+#: templates/installation.php:86
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:82 templates/installation.php:94
-#: templates/installation.php:105 templates/installation.php:116
-#: templates/installation.php:128
+#: templates/installation.php:91 templates/installation.php:103
+#: templates/installation.php:114 templates/installation.php:125
+#: templates/installation.php:137
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:140
+#: templates/installation.php:149
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:147
+#: templates/installation.php:156
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:152
+#: templates/installation.php:161
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:160
+#: templates/installation.php:169
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:167
+#: templates/installation.php:176
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:175
+#: templates/installation.php:185
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:41
+#: templates/installation.php:185
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation.  "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:69
+#: templates/layout.user.php:72 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -682,19 +711,27 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:32
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:44
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:37
+#: templates/login.php:49
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:52
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:45
+#: templates/login.php:58
 msgid "Alternative Logins"
 msgstr ""
 
@@ -702,10 +739,37 @@ msgstr ""
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>Cheers!"
+"href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
-#: templates/update.php:3
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 46e6544393b..7449a234803 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-20 10:44-0400\n"
-"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2013-12-20 01:55-0500\n"
+"PO-Revision-Date: 2013-12-20 06:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -27,220 +27,286 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:16 ajax/upload.php:45
+#: ajax/newfile.php:56 js/files.js:74
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:62
+msgid "File name must not contain \"/\". Please choose a different name."
+msgstr ""
+
+#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:81
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:86
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:103
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:140
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:21
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:27
+msgid "Folder name must not contain \"/\". Please choose a different name."
+msgstr ""
+
+#: ajax/newfolder.php:56
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:18 ajax/upload.php:50
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:27
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:59
+#: ajax/upload.php:64
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:66
+#: ajax/upload.php:71
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:72
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:74
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:70
+#: ajax/upload.php:75
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:76
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:77
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:73
+#: ajax/upload.php:78
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:91
+#: ajax/upload.php:96
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:120 ajax/upload.php:143
+#: ajax/upload.php:127 ajax/upload.php:154
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:136
+#: ajax/upload.php:144
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:160
+#: ajax/upload.php:172
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:12
+#: appinfo/app.php:11
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:244
+#: js/file-upload.js:228
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:255
+#: js/file-upload.js:239
 msgid "Not enough space available"
 msgstr ""
 
-#: js/file-upload.js:322
+#: js/file-upload.js:306
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:356
+#: js/file-upload.js:344
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:446
+#: js/file-upload.js:436
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:520
-msgid "URL cannot be empty."
+#: js/file-upload.js:523
+msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:525 lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+#: js/file-upload.js:527 js/filelist.js:377
+msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
-msgid "Error"
+#: js/file-upload.js:529 js/filelist.js:379
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/fileactions.js:119
-msgid "Share"
+#: js/file-upload.js:595
+msgid "Could not create file"
 msgstr ""
 
-#: js/fileactions.js:131
-msgid "Delete permanently"
+#: js/file-upload.js:611
+msgid "Could not create folder"
 msgstr ""
 
-#: js/fileactions.js:197
-msgid "Rename"
+#: js/file-upload.js:661
+msgid "Error fetching URL"
 msgstr ""
 
-#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
-msgid "Pending"
+#: js/fileactions.js:125
+msgid "Share"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:418
-msgid "{new_name} already exists"
+#: js/fileactions.js:137
+msgid "Delete permanently"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:418
-msgid "replace"
+#: js/fileactions.js:194
+msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:416
-msgid "suggest name"
+#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:416 js/filelist.js:418
-msgid "cancel"
+#: js/filelist.js:405
+msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:463
+#: js/filelist.js:539
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:463
+#: js/filelist.js:539
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+#: js/filelist.js:591
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:541
+#: js/filelist.js:617
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:731 js/filelist.js:769
+#: js/filelist.js:828 js/filelist.js:866
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:25
+#: js/files.js:72
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:29
-msgid "File name cannot be empty."
-msgstr ""
-
-#: js/files.js:37
+#: js/files.js:81
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:51
+#: js/files.js:93
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:55
+#: js/files.js:97
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:67
+#: js/files.js:110
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:114
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:118
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:296
+#: js/files.js:349
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:507 js/files.js:545
+#: js/files.js:558 js/files.js:596
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 templates/index.php:61
+#: js/files.js:558 js/files.js:596
+msgid "Error"
+msgstr ""
+
+#: js/files.js:613 templates/index.php:56
 msgid "Name"
 msgstr ""
 
-#: js/files.js:559 templates/index.php:73
+#: js/files.js:614 templates/index.php:68
 msgid "Size"
 msgstr ""
 
-#: js/files.js:560 templates/index.php:75
+#: js/files.js:615 templates/index.php:70
 msgid "Modified"
 msgstr ""
 
-#: lib/app.php:73
+#: lib/app.php:60
+msgid "Invalid folder name. Usage of 'Shared' is reserved."
+msgstr ""
+
+#: lib/app.php:101
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:17
+#: lib/helper.php:11 templates/index.php:16
 msgid "Upload"
 msgstr ""
 
@@ -276,65 +342,69 @@ msgstr ""
 msgid "Save"
 msgstr "Պահպանել"
 
-#: templates/index.php:6
+#: templates/index.php:5
 msgid "New"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/index.php:8
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:11
+#: templates/index.php:10
+msgid "New folder"
+msgstr ""
+
+#: templates/index.php:10
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:13
+#: templates/index.php:12
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:29
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:34
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:45
-msgid "You don’t have write permissions here."
+#: templates/index.php:40
+msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:45
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:67
+#: templates/index.php:62
 msgid "Download"
 msgstr "Բեռնել"
 
-#: templates/index.php:80 templates/index.php:81
-msgid "Unshare"
-msgstr ""
-
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:73 templates/index.php:74
 msgid "Delete"
 msgstr "Ջնջել"
 
-#: templates/index.php:100
+#: templates/index.php:86
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:102
+#: templates/index.php:88
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:93
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:96
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/hy/files_encryption.po b/l10n/hy/files_encryption.po
index e9b9f2afbe8..ccf3ebcc249 100644
--- a/l10n/hy/files_encryption.po
+++ b/l10n/hy/files_encryption.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:59+0000\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2013-11-29 14:08-0500\n"
+"PO-Revision-Date: 2013-11-29 19:08+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -43,75 +43,96 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
-#: ajax/updatePrivateKeyPassword.php:51
+#: ajax/updatePrivateKeyPassword.php:52
 msgid "Private key password successfully updated."
 msgstr ""
 
-#: ajax/updatePrivateKeyPassword.php:53
+#: ajax/updatePrivateKeyPassword.php:54
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
 msgstr ""
 
-#: files/error.php:7
+#: files/error.php:12
 msgid ""
-"Your private key is not valid! Likely your password was changed outside the "
-"ownCloud system (e.g. your corporate directory). You can update your private"
-" key password in your personal settings to recover access to your encrypted "
-"files."
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
 msgstr ""
 
-#: hooks/hooks.php:44
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:59
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:45
+#: hooks/hooks.php:60
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:263
+#: hooks/hooks.php:273
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
-#: js/settings-admin.js:11
-msgid "Saving..."
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: templates/invalid_private_key.php:5
-msgid ""
-"Your private key is not valid! Maybe the your password was changed from "
-"outside."
+#: js/settings-admin.js:13
+msgid "Saving..."
 msgstr ""
 
-#: templates/invalid_private_key.php:7
-msgid "You can unlock your private key in your "
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
 msgstr ""
 
-#: templates/invalid_private_key.php:7
+#: templates/invalid_private_key.php:8
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:10
+#: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:11
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:54
+#: templates/settings-admin.php:14
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:62
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
 msgstr ""
 
@@ -119,58 +140,62 @@ msgstr ""
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:41
+#: templates/settings-admin.php:40
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:48
+#: templates/settings-admin.php:47
 msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:58
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:16
+#: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:24
+#: templates/settings-personal.php:22
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:30
+#: templates/settings-personal.php:28
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:35
+#: templates/settings-personal.php:33
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:42
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:47
+#: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:63
+#: templates/settings-personal.php:60
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:64
+#: templates/settings-personal.php:61
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index ac97dda5449..6b9791aa98d 100644
--- a/l10n/hy/files_external.po
+++ b/l10n/hy/files_external.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2013-11-21 10:01-0500\n"
 "PO-Revision-Date: 2013-04-26 08:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
 msgid "Access granted"
 msgstr ""
 
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:65 js/google.js:86
 msgid "Grant access"
 msgstr ""
 
@@ -33,24 +33,24 @@ msgstr ""
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:42 js/google.js:121
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:447
+#: lib/config.php:461
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:450
+#: lib/config.php:465
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:453
+#: lib/config.php:468
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index bdb47a3fbc9..0852fdce9b2 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-10-21 13:01-0400\n"
+"PO-Revision-Date: 2013-10-21 17:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -18,16 +18,16 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
-msgid "The password is wrong. Try again."
+msgid "This share is password-protected"
 msgstr ""
 
 #: templates/authenticate.php:7
-msgid "Password"
+msgid "The password is wrong. Try again."
 msgstr ""
 
-#: templates/authenticate.php:9
-msgid "Submit"
-msgstr "Հաստատել"
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
 
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
@@ -53,28 +53,32 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:15
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:20
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:28 templates/public.php:94
 msgid "Download"
 msgstr "Բեռնել"
 
-#: templates/public.php:43 templates/public.php:46
+#: templates/public.php:45 templates/public.php:48
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:56
+#: templates/public.php:58
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:85
+#: templates/public.php:91
 msgid "No preview available for"
 msgstr ""
+
+#: templates/public.php:98
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po
index b1c3d308429..499cc4c2caa 100644
--- a/l10n/hy/files_trashbin.po
+++ b/l10n/hy/files_trashbin.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2013-11-21 10:01-0500\n"
+"PO-Revision-Date: 2013-11-16 07:44+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -27,55 +27,31 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:100
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:36
-msgid "delete file permanently"
+#: lib/trashbin.php:815 lib/trashbin.php:817
+msgid "restored"
 msgstr ""
 
-#: js/trash.js:127
-msgid "Delete permanently"
+#: templates/index.php:8
+msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: js/trash.js:182 templates/index.php:17
+#: templates/index.php:22
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:183 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:191
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/trash.js:197
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/trash.php:819 lib/trash.php:821
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
+#: templates/index.php:25 templates/index.php:27
+msgid "Restore"
 msgstr ""
 
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
+#: templates/index.php:33
+msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:36 templates/index.php:37
 msgid "Delete"
 msgstr "Ջնջել"
 
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index d1e8def17c4..a54f97275bd 100644
--- a/l10n/hy/lib.po
+++ b/l10n/hy/lib.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2013-12-17 06:45-0500\n"
+"PO-Revision-Date: 2013-12-17 11:45+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -17,318 +17,317 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:239
+#: private/app.php:243
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: app.php:250
+#: private/app.php:255
 msgid "No app name specified"
 msgstr ""
 
-#: app.php:361
+#: private/app.php:360
 msgid "Help"
 msgstr ""
 
-#: app.php:374
+#: private/app.php:373
 msgid "Personal"
 msgstr ""
 
-#: app.php:385
+#: private/app.php:384
 msgid "Settings"
 msgstr ""
 
-#: app.php:397
+#: private/app.php:396
 msgid "Users"
 msgstr ""
 
-#: app.php:410
+#: private/app.php:409
 msgid "Admin"
 msgstr ""
 
-#: app.php:839
+#: private/app.php:873
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
-#: avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: avatar.php:64
+#: private/avatar.php:66
 msgid "Unknown filetype"
 msgstr ""
 
-#: avatar.php:69
+#: private/avatar.php:71
 msgid "Invalid image"
 msgstr ""
 
-#: defaults.php:35
+#: private/defaults.php:34
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
 #, php-format
 msgid "cannot open \"%s\""
 msgstr ""
 
-#: files.php:226
+#: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:227
+#: private/files.php:232
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:228 files.php:256
+#: private/files.php:233 private/files.php:261
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:253
+#: private/files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: files.php:254
+#: private/files.php:259
 msgid ""
-"Download the files in smaller chunks, seperately or kindly ask your "
+"Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
 msgstr ""
 
-#: installer.php:63
+#: private/installer.php:63
 msgid "No source specified when installing app"
 msgstr ""
 
-#: installer.php:70
+#: private/installer.php:70
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: installer.php:75
+#: private/installer.php:75
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: installer.php:89
+#: private/installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: installer.php:103
+#: private/installer.php:103
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: installer.php:125
+#: private/installer.php:125
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: installer.php:131
+#: private/installer.php:131
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: installer.php:140
+#: private/installer.php:140
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: installer.php:146
+#: private/installer.php:146
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: installer.php:152
+#: private/installer.php:159
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: installer.php:162
+#: private/installer.php:169
 msgid "App directory already exists"
 msgstr ""
 
-#: installer.php:175
+#: private/installer.php:182
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: json.php:28
+#: private/json.php:28
 msgid "Application is not enabled"
 msgstr ""
 
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
 msgid "Authentication error"
 msgstr ""
 
-#: json.php:51
+#: private/json.php:51
 msgid "Token expired. Please reload page."
 msgstr ""
 
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
 
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
 msgid "Text"
 msgstr ""
 
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
 msgid "Images"
 msgstr ""
 
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:26
 #, php-format
 msgid "%s enter the database username."
 msgstr ""
 
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:29
 #, php-format
 msgid "%s enter the database name."
 msgstr ""
 
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:32
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr ""
 
-#: setup/mssql.php:20
+#: private/setup/mssql.php:20
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
-#: setup/postgresql.php:24 setup/postgresql.php:70
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup/mysql.php:12
+#: private/setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
-#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
-#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
-#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
-#: setup/postgresql.php:125 setup/postgresql.php:134
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:144
+#: private/setup/oci.php:151 private/setup/oci.php:162
+#: private/setup/oci.php:169 private/setup/oci.php:178
+#: private/setup/oci.php:186 private/setup/oci.php:195
+#: private/setup/oci.php:201 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
-#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
-#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
-#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:145
+#: private/setup/oci.php:152 private/setup/oci.php:163
+#: private/setup/oci.php:179 private/setup/oci.php:187
+#: private/setup/oci.php:196 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup/oci.php:34
+#: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:170 private/setup/oci.php:202
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:28
+#: private/setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:31
+#: private/setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:184
+#: private/setup.php:195
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:185
+#: private/setup.php:196
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:130
 msgid "seconds ago"
 msgstr ""
 
-#: template/functions.php:97
+#: private/template/functions.php:131
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:98
+#: private/template/functions.php:132
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:99
+#: private/template/functions.php:133
 msgid "today"
 msgstr ""
 
-#: template/functions.php:100
+#: private/template/functions.php:134
 msgid "yesterday"
 msgstr ""
 
-#: template/functions.php:101
+#: private/template/functions.php:136
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:102
+#: private/template/functions.php:138
 msgid "last month"
 msgstr ""
 
-#: template/functions.php:103
+#: private/template/functions.php:139
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:104
+#: private/template/functions.php:141
 msgid "last year"
 msgstr ""
 
-#: template/functions.php:105
+#: private/template/functions.php:142
 msgid "years ago"
 msgstr ""
-
-#: template.php:297
-msgid "Caused by:"
-msgstr ""
-
-#: vcategories.php:188 vcategories.php:249
-#, php-format
-msgid "Could not find category \"%s\""
-msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index ecc4b3e2788..d3c43e0c909 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-20 10:45-0400\n"
-"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2013-12-04 18:12-0500\n"
+"PO-Revision-Date: 2013-12-04 23:13+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgid "Authentication error"
 msgstr ""
 
 #: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
+msgid "Your full name has been changed."
 msgstr ""
 
 #: ajax/changedisplayname.php:34
-msgid "Unable to change display name"
+msgid "Unable to change full name"
 msgstr ""
 
 #: ajax/creategroup.php:10
@@ -117,11 +117,11 @@ msgstr ""
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:108
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
 msgid "Enable"
 msgstr ""
 
@@ -129,31 +129,31 @@ msgstr ""
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:100
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:99 js/apps.js:112 js/apps.js:113
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:123
+#: js/apps.js:125
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:126
+#: js/apps.js:128
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:126
+#: js/apps.js:128
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:127 templates/apps.php:43
+#: js/apps.js:129 templates/apps.php:43
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:130
+#: js/apps.js:132
 msgid "Updated"
 msgstr ""
 
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:265
+#: js/personal.js:266
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
@@ -181,44 +181,75 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: js/users.js:95 templates/users.php:26 templates/users.php:90
 #: templates/users.php:118
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:97 templates/users.php:92 templates/users.php:130
+#: js/users.js:100 templates/users.php:92 templates/users.php:130
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:120 templates/users.php:170
+#: js/users.js:123 templates/users.php:170
 msgid "Delete"
 msgstr "Ջնջել"
 
-#: js/users.js:277
+#: js/users.js:284
 msgid "add group"
 msgstr ""
 
-#: js/users.js:436
+#: js/users.js:451
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:437 js/users.js:443 js/users.js:458
+#: js/users.js:452 js/users.js:458 js/users.js:473
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:442
+#: js/users.js:457
 msgid "A valid password must be provided"
 msgstr ""
 
+#: js/users.js:481
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
 #: personal.php:45 personal.php:46
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:22 templates/admin.php:36
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:18
+#: templates/admin.php:25
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:39
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -227,48 +258,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:50
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:32
+#: templates/admin.php:53
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:54
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:65
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:47
+#: templates/admin.php:68
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:79
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: templates/admin.php:82
+msgid ""
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
+"newer because older versions are known to be broken. It is possible that "
+"this installation is not working correctly."
+msgstr ""
+
+#: templates/admin.php:93
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:63
+#: templates/admin.php:98
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:102
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: templates/admin.php:106
 #, php-format
 msgid ""
-"System locale can't be set to %s. This means that there might be problems "
-"with certain characters in file names. We strongly suggest to install the "
-"required packages on your system to support %s."
+"We strongly suggest to install the required packages on your system to "
+"support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:75
+#: templates/admin.php:118
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:78
+#: templates/admin.php:121
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -277,110 +328,118 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:92
+#: templates/admin.php:135
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:99
+#: templates/admin.php:142
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:107
+#: templates/admin.php:150
 msgid ""
-"cron.php is registered at a webcron service to call cron.php once a minute "
-"over http."
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
 msgstr ""
 
-#: templates/admin.php:115
-msgid "Use systems cron service to call the cron.php file once a minute."
+#: templates/admin.php:158
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:120
+#: templates/admin.php:163
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:126
+#: templates/admin.php:169
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:127
+#: templates/admin.php:170
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:177
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:178
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:186
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:187
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:195
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:196
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:203
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:206
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:213
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:214
+msgid "Allow user to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:221
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:234
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:236
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:242
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:254
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:204
+#: templates/admin.php:255
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:287
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:288
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:242 templates/personal.php:161
+#: templates/admin.php:294 templates/personal.php:173
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:246 templates/personal.php:164
+#: templates/admin.php:298 templates/personal.php:176
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -472,7 +531,7 @@ msgid "Change password"
 msgstr ""
 
 #: templates/personal.php:58 templates/users.php:88
-msgid "Display Name"
+msgid "Full Name"
 msgstr ""
 
 #: templates/personal.php:73
@@ -491,62 +550,66 @@ msgstr ""
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:90
+#: templates/personal.php:91
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:92
+#: templates/personal.php:93
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:94
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:95
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
 #: templates/personal.php:97
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:101
 msgid "Abort"
 msgstr ""
 
-#: templates/personal.php:98
+#: templates/personal.php:102
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:106 templates/personal.php:107
+#: templates/personal.php:110 templates/personal.php:111
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:119
+#: templates/personal.php:130
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:125
+#: templates/personal.php:137
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:127
+#: templates/personal.php:139
 #, php-format
 msgid ""
-"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
-"target=\"_blank\">access your Files via WebDAV</a>"
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:138
+#: templates/personal.php:150
 msgid "Encryption"
 msgstr ""
 
-#: templates/personal.php:140
-msgid "The encryption app is no longer enabled, decrypt all your file"
+#: templates/personal.php:152
+msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:146
+#: templates/personal.php:158
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:151
+#: templates/personal.php:163
 msgid "Decrypt all Files"
 msgstr ""
 
@@ -572,6 +635,10 @@ msgstr ""
 msgid "Default Storage"
 msgstr ""
 
+#: templates/users.php:44 templates/users.php:139
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
 #: templates/users.php:48 templates/users.php:148
 msgid "Unlimited"
 msgstr ""
@@ -589,7 +656,7 @@ msgid "Storage"
 msgstr ""
 
 #: templates/users.php:108
-msgid "change display name"
+msgid "change full name"
 msgstr ""
 
 #: templates/users.php:112
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index 8b2b904fe7f..74da815526b 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/user_ldap.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2013-12-20 01:55-0500\n"
+"PO-Revision-Date: 2013-12-20 06:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -25,314 +25,425 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:36
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:39
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:43
+#: ajax/testConfiguration.php:46
 msgid ""
-"The configuration is invalid. Please look in the ownCloud log for further "
+"The configuration is invalid. Please have a look at the logs for further "
 "details."
 msgstr ""
 
-#: js/settings.js:66
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
 msgid "Deletion failed"
 msgstr ""
 
-#: js/settings.js:82
+#: js/settings.js:83
 msgid "Take over settings from recent server configuration?"
 msgstr ""
 
-#: js/settings.js:83
+#: js/settings.js:84
 msgid "Keep settings?"
 msgstr ""
 
-#: js/settings.js:97
+#: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:111
+#: js/settings.js:127
 msgid "mappings cleared"
 msgstr ""
 
-#: js/settings.js:112
+#: js/settings.js:128
 msgid "Success"
 msgstr ""
 
-#: js/settings.js:117
+#: js/settings.js:133
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:141
+#: js/settings.js:837
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:846
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:872 js/settings.js:881
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:875 js/settings.js:884
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:878
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:905
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:146
+#: js/settings.js:912
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:156
+#: js/settings.js:921
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:157
+#: js/settings.js:922
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:9
-msgid ""
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behavior. Please ask your system administrator to "
-"disable one of them."
+#: lib/wizard.php:79 lib/wizard.php:93
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:122
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:778 lib/wizard.php:790
+msgid "Invalid Host"
 msgstr ""
 
-#: templates/settings.php:12
+#: lib/wizard.php:951
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr "Պահպանել"
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Limit the access to %s to groups meeting this criteria:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
 msgid ""
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
-"work. Please ask your system administrator to install it."
+"The filter specifies which LDAP groups shall have access to the %s instance."
 msgstr ""
 
-#: templates/settings.php:16
-msgid "Server configuration"
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
 msgstr ""
 
-#: templates/settings.php:32
-msgid "Add Server Configuration"
+#: templates/part.wizard-loginfilter.php:4
+msgid "What attribute shall be used as login name:"
 msgstr ""
 
-#: templates/settings.php:37
-msgid "Host"
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/part.wizard-loginfilter.php:38
+#, php-format
 msgid ""
-"You can omit the protocol, except you require SSL. Then start with ldaps://"
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:40
-msgid "Base DN"
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:41
-msgid "One Base DN per line"
+#: templates/part.wizard-server.php:30
+msgid "Host"
 msgstr ""
 
-#: templates/settings.php:42
-msgid "You can specify Base DN for users and groups in the Advanced tab"
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/part.wizard-server.php:45
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/part.wizard-server.php:52
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/part.wizard-server.php:53
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:51
-msgid "User Login Filter"
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit the access to %s to users meeting this criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
 #, php-format
 msgid ""
-"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action. Example: \"uid=%%uid\""
+"The filter specifies which LDAP users shall have access to the %s instance."
 msgstr ""
 
-#: templates/settings.php:55
-msgid "User List Filter"
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
 msgstr ""
 
-#: templates/settings.php:58
-msgid ""
-"Defines the filter to apply, when retrieving users (no placeholders). "
-"Example: \"objectClass=person\""
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Group Filter"
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:14
 msgid ""
-"Defines the filter to apply, when retrieving groups (no placeholders). "
-"Example: \"objectClass=posixGroup\""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:66
+#: templates/settings.php:20
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:22
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:22
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:69
-msgid "Port"
-msgstr ""
-
-#: templates/settings.php:70
+#: templates/settings.php:23
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:23
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:24
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:25
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:25
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:73
-msgid "Use TLS"
-msgstr ""
-
-#: templates/settings.php:73
-msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
-
-#: templates/settings.php:74
+#: templates/settings.php:26
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:27
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:27
 #, php-format
 msgid ""
 "Not recommended, use it for testing only! If connection only works with this"
 " option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:28
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:28
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:30
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:32
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:33
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:33
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:34
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:82 templates/settings.php:85
+#: templates/settings.php:34 templates/settings.php:37
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:35
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:35
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:36
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:36
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:37
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:38
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:40
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:42
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:43
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:43
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:44
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:45
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:45
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:98
+#: templates/settings.php:51
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:52
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -348,15 +459,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:53
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:54
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:55
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -367,15 +478,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:103
-msgid "UUID Attribute:"
+#: templates/settings.php:56
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:58
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:59
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -389,18 +504,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:60
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:60
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
-
-#: templates/settings.php:108
-msgid "Test Configuration"
-msgstr ""
-
-#: templates/settings.php:108
-msgid "Help"
-msgstr ""