Merge branch 'master' into encryption_work_with_public_gallery

1 files changed, 32 insertions, 32 deletions

diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index 0cb877bee87..99cee713a01 100644
--- a/l10n/ne/lib.po
+++ b/l10n/ne/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-10-17 13:47-0400\n"
-"PO-Revision-Date: 2013-10-17 17:47+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-21 15:01+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"
@@ -24,31 +24,31 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:254
+#: private/app.php:255
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:359
+#: private/app.php:360
 msgid "Help"
 msgstr ""
 
-#: private/app.php:372
+#: private/app.php:373
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:383
+#: private/app.php:384
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:395
+#: private/app.php:396
 msgid "Users"
 msgstr ""
 
-#: private/app.php:408
+#: private/app.php:409
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:872
+#: private/app.php:873
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -70,25 +70,25 @@ msgstr ""
 msgid "cannot open \"%s\""
 msgstr ""
 
-#: private/files.php:226
+#: private/files.php:228
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:227
+#: private/files.php:229
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:228 private/files.php:256
+#: private/files.php:230 private/files.php:258
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:253
+#: private/files.php:255
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:254
+#: private/files.php:256
 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 ""
 
@@ -133,17 +133,17 @@ msgid ""
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/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 ""
 
-#: private/installer.php:162
+#: private/installer.php:169
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:175
+#: private/installer.php:182
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
@@ -268,13 +268,13 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/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 ""
 
-#: private/setup.php:185
+#: private/setup.php:196
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -284,54 +284,54 @@ msgstr ""
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:122
+#: private/template/functions.php:130
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:123
+#: private/template/functions.php:131
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:124
+#: private/template/functions.php:132
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:125
+#: private/template/functions.php:133
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:126
+#: private/template/functions.php:134
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:128
+#: private/template/functions.php:136
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:138
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:139
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:141
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:142
 msgid "years ago"
 msgstr ""
 
-#: private/template.php:297
+#: private/template.php:297 public/util.php:108
 msgid "Caused by:"
 msgstr ""