Merge branch 'master' into fix_3728_with_file_exists_dialog

Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/templates/part.list.php

6 files changed, 375 insertions, 308 deletions

diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index 70b0faea8ee..5183d028931 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/core.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-11 08:07-0400\n"
-"PO-Revision-Date: 2013-08-11 12:07+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 13:33+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -22,6 +22,35 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr ""
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr ""
+
+#: ajax/update.php:26
+#, php-format
+msgid "... %d%% done ..."
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -137,83 +166,79 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:354
+#: js/js.js:355
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:814
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
 #: js/js.js:815
-msgid "1 minute ago"
+msgid "today"
 msgstr ""
 
 #: js/js.js:816
-msgid "{minutes} minutes ago"
+msgid "yesterday"
 msgstr ""
 
 #: js/js.js:817
-msgid "1 hour ago"
-msgstr ""
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #: js/js.js:818
-msgid "{hours} hours ago"
+msgid "last month"
 msgstr ""
 
 #: js/js.js:819
-msgid "today"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #: js/js.js:820
-msgid "yesterday"
-msgstr ""
-
-#: js/js.js:821
-msgid "{days} days ago"
-msgstr ""
-
-#: js/js.js:822
-msgid "last month"
-msgstr ""
-
-#: js/js.js:823
-msgid "{months} months ago"
-msgstr ""
-
-#: js/js.js:824
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:826
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:168
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:178
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:195
 msgid "Ok"
 msgstr ""
 
@@ -377,8 +402,9 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -445,7 +471,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:105
 msgid "Apps"
 msgstr ""
 
@@ -578,10 +604,6 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -596,19 +618,19 @@ msgstr ""
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:34
+#: templates/login.php:32
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:39
+#: templates/login.php:37
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:47
+#: templates/login.php:45
 msgid "Alternative Logins"
 msgstr ""
 
@@ -619,14 +641,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index 26e7154708e..16ee2747372 100644
--- a/l10n/ne/files.po
+++ b/l10n/ne/files.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-07-22 01:54-0400\n"
-"PO-Revision-Date: 2013-07-22 05:55+0000\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-30 13:34+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -74,7 +74,11 @@ msgstr ""
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr ""
 
@@ -94,21 +98,20 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
 msgid "Error"
 msgstr ""
 
@@ -120,51 +123,61 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:303
+#: js/filelist.js:305
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:305 js/filelist.js:307
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:350
+#: js/filelist.js:352
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:457
-msgid "1 file uploading"
+#: js/filelist.js:430
+msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:460 js/filelist.js:518
+#: js/filelist.js:561
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:626
 msgid "files uploading"
 msgstr ""
 
@@ -190,44 +203,30 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
 msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:344
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
+#: js/files.js:245
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:562 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:563 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:564 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -285,64 +284,52 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr ""
diff --git a/l10n/ne/files_trashbin.po b/l10n/ne/files_trashbin.po
index 5b7a422b1f9..06099b3a416 100644
--- a/l10n/ne/files_trashbin.po
+++ b/l10n/ne/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -51,21 +51,17 @@ msgstr ""
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: 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"
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index 5ab14347a8f..a938ce906cd 100644
--- a/l10n/ne/lib.po
+++ b/l10n/ne/lib.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-11 08:07-0400\n"
-"PO-Revision-Date: 2013-08-11 12:08+0000\n"
+"POT-Creation-Date: 2013-08-25 19:18-0400\n"
+"PO-Revision-Date: 2013-08-25 23:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,38 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:360
+#: app.php:239
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: app.php:250
+msgid "No app name specified"
+msgstr ""
+
+#: app.php:361
 msgid "Help"
 msgstr ""
 
-#: app.php:373
+#: app.php:374
 msgid "Personal"
 msgstr ""
 
-#: app.php:384
+#: app.php:385
 msgid "Settings"
 msgstr ""
 
-#: app.php:396
+#: app.php:397
 msgid "Users"
 msgstr ""
 
-#: app.php:409
+#: app.php:410
 msgid "Admin"
 msgstr ""
 
-#: app.php:836
+#: app.php:837
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -73,8 +84,60 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
+#: installer.php:63
+msgid "No source specified when installing app"
+msgstr ""
+
+#: installer.php:70
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: installer.php:75
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: installer.php:89
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: installer.php:103
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: installer.php:123
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: installer.php:129
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: installer.php:138
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: installer.php:144
+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:150
+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:160
+msgid "App directory already exists"
+msgstr ""
+
+#: installer.php:173
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
 #: json.php:28
@@ -206,50 +269,46 @@ msgid "seconds ago"
 msgstr ""
 
 #: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
 msgstr ""
 
 #: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
 msgstr ""
 
 #: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
 msgstr ""
 
 #: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
 #: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template/functions.php:91
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index 20fa4cf7fb4..95b359633ed 100644
--- a/l10n/ne/settings.po
+++ b/l10n/ne/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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-25 19:18-0400\n"
+"PO-Revision-Date: 2013-08-25 23:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -42,10 +42,6 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
-#: ajax/enableapp.php:11
-msgid "Could not enable app. "
-msgstr ""
-
 #: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
@@ -92,35 +88,51 @@ msgstr ""
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:41 js/apps.js:81
+#: js/apps.js:41 js/apps.js:74 js/apps.js:100
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:41 js/apps.js:69 js/apps.js:88
+#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:60
+#: js/apps.js:63
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
-msgid "Error"
+#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:95
+#: js/apps.js:115
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:98
+#: js/apps.js:118
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:101
+#: js/apps.js:118
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:119 templates/apps.php:43
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:122
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -141,31 +153,31 @@ msgstr ""
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:269
+#: js/users.js:277
 msgid "add group"
 msgstr ""
 
-#: js/users.js:428
+#: js/users.js:436
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:434
+#: js/users.js:442
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +248,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -365,10 +377,6 @@ msgstr ""
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:43
-msgid "Update"
-msgstr ""
-
 #: templates/help.php:4
 msgid "User Documentation"
 msgstr ""
@@ -465,6 +473,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
index 5ca0bf8245f..823ea6ee1a6 100644
--- a/l10n/ne/user_ldap.po
+++ b/l10n/ne/user_ldap.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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"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:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 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 "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 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. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr ""