Merge branch 'master' into clean_up_util

Conflicts:
	lib/util.php

1 files changed, 40 insertions, 37 deletions

diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 84d2868ea50..ea723ff9903 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Hans Nesse <>, 2013
+# TheLugal <thelugal@gmail.com>, 2013
 # Stein-Aksel Basma <stabasm@hotmail.com>, 2013
 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"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +36,7 @@ msgstr "Kunne ikke sette opplastingskatalog."
 
 #: ajax/upload.php:22
 msgid "Invalid Token"
-msgstr ""
+msgstr "Ugyldig nøkkel"
 
 #: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
@@ -96,12 +97,12 @@ msgstr "Ikke nok lagringsplass"
 msgid "Upload cancelled."
 msgstr "Opplasting avbrutt."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL-en kan ikke være tom."
 
@@ -109,8 +110,8 @@ msgstr "URL-en kan ikke være tom."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
 
-#: 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:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Feil"
 
@@ -122,15 +123,11 @@ msgstr "Del"
 msgid "Delete permanently"
 msgstr "Slett permanent"
 
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Slett"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
 msgid "Rename"
-msgstr "Omdøp"
+msgstr "Gi nytt navn"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Ventende"
 
@@ -152,23 +149,19 @@ msgstr "avbryt"
 
 #: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
-msgstr "erstatt {new_name} med {old_name}"
+msgstr "erstattet {new_name} med {old_name}"
 
 #: js/filelist.js:350
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "utfør sletting"
-
-#: js/filelist.js:455
+#: js/filelist.js:453
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Laster opp %n fil"
+msgstr[1] "Laster opp %n filer"
 
-#: js/filelist.js:520
+#: js/filelist.js:518
 msgid "files uploading"
 msgstr "filer lastes opp"
 
@@ -192,46 +185,52 @@ msgstr "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkro
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)"
+msgstr "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)"
+
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
 
-#: js/files.js:231
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n mappe"
+msgstr[1] "%n mapper"
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n fil"
+msgstr[1] "%n filer"
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "Kunne ikke gi nytt navn til %s"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -309,6 +308,10 @@ msgstr "Last ned"
 msgid "Unshare"
 msgstr "Avslutt deling"
 
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Slett"
+
 #: templates/index.php:105
 msgid "Upload too large"
 msgstr "Filen er for stor"
@@ -321,7 +324,7 @@ msgstr "Filene du prøver å laste opp er for store for å laste opp til denne s
 
 #: templates/index.php:112
 msgid "Files are being scanned, please wait."
-msgstr "Skanner etter filer, vennligst vent."
+msgstr "Skanner filer, vennligst vent."
 
 #: templates/index.php:115
 msgid "Current scanning"