[tx-robot] updated from transifex

9 files changed, 652 insertions, 471 deletions

diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 0364a320a67..0737a74120a 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\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"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,12 +20,7 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s delte «%s» med deg"
-
-#: ajax/share.php:169
+#: ajax/share.php:112
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -75,135 +70,139 @@ msgstr "Inga midlertidig profilbilete tilgjengeleg, prøv igjen"
 msgid "No crop data provided"
 msgstr "Ingen beskjeringsdata gitt"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Søndag"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Måndag"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Tysdag"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "April"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "August"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "November"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:992
 msgid "seconds ago"
 msgstr "sekund sidan"
 
-#: js/js.js:870
+#: js/js.js:993
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minutt sidan"
 msgstr[1] "%n minutt sidan"
 
-#: js/js.js:871
+#: js/js.js:994
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n time sidan"
 msgstr[1] "%n timar sidan"
 
-#: js/js.js:872
+#: js/js.js:995
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:873
+#: js/js.js:996
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:874
+#: js/js.js:997
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag sidan"
 msgstr[1] "%n dagar sidan"
 
-#: js/js.js:875
+#: js/js.js:998
 msgid "last month"
 msgstr "førre månad"
 
-#: js/js.js:876
+#: js/js.js:999
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n månad sidan"
 msgstr[1] "%n månadar sidan"
 
-#: js/js.js:877
+#: js/js.js:1000
 msgid "months ago"
 msgstr "månadar sidan"
 
-#: js/js.js:878
+#: js/js.js:1001
 msgid "last year"
 msgstr "i fjor"
 
-#: js/js.js:879
+#: js/js.js:1002
 msgid "years ago"
 msgstr "år sidan"
 
@@ -271,6 +270,26 @@ msgstr "({count} valte)"
 msgid "Error loading file exists template"
 msgstr "Klarte ikkje å lasta fil-finst-mal"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Delt"
@@ -279,12 +298,12 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: js/share.js:723 templates/installation.php:10
 msgid "Error"
 msgstr "Feil"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:755
 msgid "Error while sharing"
 msgstr "Feil ved deling"
 
@@ -296,123 +315,123 @@ msgstr "Feil ved udeling"
 msgid "Error while changing permissions"
 msgstr "Feil ved endring av tillatingar"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delt med deg og gruppa {group} av {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Delt med deg av {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Passordvern"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Passord"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Tillat offentleg opplasting"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Send lenkja over e-post"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Set utløpsdato"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Utløpsdato"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Del over e-post:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Fann ingen personar"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "gruppe"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Vidaredeling er ikkje tillate"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {brukar}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Udel"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "kan endra"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "lag"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "del"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Passordverna"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Klarte ikkje fjerna utløpsdato"
 
-#: js/share.js:719
+#: js/share.js:723
 msgid "Error setting expiration date"
 msgstr "Klarte ikkje setja utløpsdato"
 
-#: js/share.js:734
+#: js/share.js:742
 msgid "Sending ..."
 msgstr "Sender …"
 
-#: js/share.js:745
+#: js/share.js:753
 msgid "Email sent"
 msgstr "E-post sendt"
 
-#: js/share.js:769
+#: js/share.js:777
 msgid "Warning"
 msgstr "Åtvaring"
 
@@ -459,11 +478,17 @@ msgstr "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https:/
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Oppdateringa er fullført. Sender deg vidare til ownCloud no."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s passordnullstilling"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}"
@@ -483,8 +508,8 @@ msgstr "Førespurnaden feila!<br>Er du viss på at du skreiv inn rett e-post/bru
 msgid "You will receive a link to reset your password via Email."
 msgstr "Du vil få ein e-post med ei lenkje for å nullstilla passordet."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Brukarnamn"
 
@@ -528,7 +553,7 @@ msgstr "Personleg"
 msgid "Users"
 msgstr "Brukarar"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Program"
 
@@ -638,49 +663,47 @@ msgstr "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> f
 msgid "Create an <strong>admin account</strong>"
 msgstr "Lag ein <strong>admin-konto</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avansert"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Set opp databasen"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "vil verta nytta"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Databasebrukar"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Databasenamn"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Tabellnamnrom for database"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Databasetenar"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Fullfør oppsettet"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -696,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Logg ut"
 
@@ -722,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Gløymt passordet?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "hugs"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Logg inn"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternative innloggingar"
 
 #: templates/mail.php:15
 #, 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>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 08a93b7fab3..714cc584ff1 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\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"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,36 +30,48 @@ msgstr "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet"
 msgid "Could not move %s"
 msgstr "Klarte ikkje flytta %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Filnamnet kan ikkje vera tomt."
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate."
+
+#: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -67,236 +79,231 @@ msgstr ""
 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
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Klarte ikkje å endra opplastingsmappa."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Ugyldig token"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen filer lasta opp. Ukjend feil"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr "Ingen feil, fila vart lasta opp"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: "
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den opplasta fila er større enn variabelen MAX_FILE_SIZE i HTML-skjemaet"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fila vart berre delvis lasta opp"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr "Ingen filer vart lasta opp"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr "Manglar ei mellombels mappe"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr "Klarte ikkje skriva til disk"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr "Ikkje nok lagringsplass tilgjengeleg"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Feil ved opplasting. Klarte ikkje å henta filinfo."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Feil ved opplasting. Klarte ikkje å finna opplasta fil."
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr "Feil ved opplasting. Klarte ikkje å henta filinfo."
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Filer"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte."
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Ikkje nok lagringsplass tilgjengeleg"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr "Opplasting avbroten."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr "Klarte ikkje å henta resultat frå tenaren."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} finst allereie"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Del"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Slett for godt"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Endra namn"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Under vegs"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "bytte ut {new_name} med {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappe"
 msgstr[1] "%n mapper"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
 msgstr[1] "%n filer"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} og {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Lastar opp %n fil"
 msgstr[1] "Lastar opp %n filer"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "«.» er eit ugyldig filnamn."
-
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Lagringa di er nesten full ({usedSpacePercent} %)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 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
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Feil ved flytting av fil"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Feil"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Endra"
 
@@ -304,12 +311,12 @@ msgstr "Endra"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "Klarte ikkje å omdøypa på %s"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Last opp"
 
@@ -345,69 +352,69 @@ msgstr "Maksimal storleik for ZIP-filer"
 msgid "Save"
 msgstr "Lagre"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Tekst fil"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Mappe"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Frå lenkje"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Sletta filer"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last noko opp!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "For stor opplasting"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Skannar filer, ver venleg og vent."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Køyrande skanning"
 
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index 63a65fd989f..cba4f8cebb7 100644
--- a/l10n/nn_NO/files_encryption.po
+++ b/l10n/nn_NO/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\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"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 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:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Lagrar …"
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index 85acba6f702..6fe360ef9ed 100644
--- a/l10n/nn_NO/files_external.po
+++ b/l10n/nn_NO/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\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"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 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:465
+#: lib/config.php:516
 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:468
+#: lib/config.php:519
 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 "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Brukarar"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 78a8e15a2bb..b08d5900464 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -54,32 +58,16 @@ msgstr "deling er slått av"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Spør den som sende deg lenkje om du vil ha meir informasjon."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s delte mappa %s med deg"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s delte fila %s med deg"
-
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Last ned"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Last opp"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Avbryt opplasting"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Inga førehandsvising tilgjengeleg for"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index 618246702e1..2558d7a528f 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\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"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,44 +19,48 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Klarte ikkje sletta %s for godt"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Klarte ikkje gjenoppretta %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Feil"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr "gjenoppretta"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Ingenting her. Papirkorga di er tom!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Namn"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Gjenopprett"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Sletta"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Sletta filer"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index ec60d2c1735..2ab71d7f5b8 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\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"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,38 +19,38 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Hjelp"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personleg"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Brukarar"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administrer"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -63,15 +63,10 @@ msgstr "Ukjend filtype"
 msgid "Invalid image"
 msgstr "Ugyldig bilete"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "Vev tjenester under din kontroll"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -94,74 +89,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 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:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Feil i autentisering"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Filer"
@@ -201,7 +200,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -229,20 +228,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -270,66 +269,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "sekund sidan"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "%n minutt sidan"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] "%n timar sidan"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "i dag"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "i går"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] "%n dagar sidan"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "førre månad"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] "%n månadar sidan"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "i fjor"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "år sidan"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index c97bf982e44..e13d7d4e970 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\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"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +20,48 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:280
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: admin/controller.php:120 templates/admin.php:317
+msgid "Authentification method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Klarer ikkje å lasta inn liste fra app-butikken"
@@ -116,62 +158,90 @@ msgstr "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til b
 msgid "Unable to change password"
 msgstr "Klarte ikkje å endra passordet"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Brukardokumentasjon"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Oppdater til {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Slå av"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Slå på"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Ver venleg og vent …"
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Klarte ikkje å skru av programmet"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Klarte ikkje å skru på programmet"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Oppdaterer …"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Feil ved oppdatering av app"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Feil"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Oppdater"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: js/personal.js:220
+#: js/personal.js:244
 msgid "Select a profile picture"
 msgstr "Vel eit profilbilete"
 
-#: js/personal.js:266
+#: js/personal.js:274
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:275
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:276
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:277
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:301
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Lagrar …"
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "sletta"
@@ -184,40 +254,40 @@ msgstr "angra"
 msgid "Unable to remove user"
 msgstr "Klarte ikkje fjerna brukaren"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Gruppestyrar"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Slett"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "legg til gruppe"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Du må oppgje eit gyldig brukarnamn"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Feil ved oppretting av brukar"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Du må oppgje eit gyldig passord"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Nynorsk"
 
@@ -241,18 +311,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:43 templates/admin.php:57
 msgid "Security Warning"
 msgstr "Tryggleiksåtvaring"
 
-#: templates/admin.php:25
+#: templates/admin.php:46
 #, 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
+#: templates/admin.php:60
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -261,68 +355,68 @@ msgid ""
 "root."
 msgstr "Datamappa og filene dine er sannsynlegvis leselege frå nettet. Fila .htaccess fungerer ikkje. Me rår deg sterkt til å konfigurera vevtenaren din sånn at datamappa di ikkje lenger er tilgjengeleg; alternativt kan du flytta datamappa ut av dokumentrot til vevtenaren."
 
-#: templates/admin.php:50
+#: templates/admin.php:71
 msgid "Setup Warning"
 msgstr "Oppsettsåtvaring"
 
-#: templates/admin.php:53
+#: templates/admin.php:74
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
 
-#: templates/admin.php:54
+#: templates/admin.php:75
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Ver venleg og dobbeltsjekk <a href=\"%s\">installasjonsrettleiinga</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:86
 msgid "Module 'fileinfo' missing"
 msgstr "Modulen «fileinfo» manglar"
 
-#: templates/admin.php:68
+#: templates/admin.php:89
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar."
 
-#: templates/admin.php:79
+#: templates/admin.php:100
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: templates/admin.php:103
 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
+#: templates/admin.php:114
 msgid "Locale not working"
 msgstr "Regionaldata fungerer ikkje"
 
-#: templates/admin.php:98
+#: templates/admin.php:119
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:123
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: templates/admin.php:127
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:118
+#: templates/admin.php:139
 msgid "Internet connection not working"
 msgstr "Nettilkoplinga fungerer ikkje"
 
-#: templates/admin.php:121
+#: templates/admin.php:142
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -331,118 +425,162 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Denne tenaren har ikkje ei fungerande nettilkopling. Dette vil seia at visse funksjonar, som montering av ekstern lagring, meldingar om oppdateringar eller installering av tredjepartsprogram, ikkje vil fungera. Det kan òg henda at du ikkje får tilgang til filene dine utanfrå, eller ikkje får sendt varslingsepostar. Me rår deg til å skru på nettilkoplinga for denne tenaren viss du ønskjer desse funksjonane."
 
-#: templates/admin.php:135
+#: templates/admin.php:156
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:163
 msgid "Execute one task with each page loaded"
 msgstr "Utfør éi oppgåve for kvar sidelasting"
 
-#: templates/admin.php:150
+#: templates/admin.php:171
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:179
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:184
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:169
+#: templates/admin.php:190
 msgid "Enable Share API"
 msgstr "Slå på API-et for deling"
 
-#: templates/admin.php:170
+#: templates/admin.php:191
 msgid "Allow apps to use the Share API"
 msgstr "La app-ar bruka API-et til deling"
 
-#: templates/admin.php:177
+#: templates/admin.php:198
 msgid "Allow links"
 msgstr "Tillat lenkjer"
 
-#: templates/admin.php:178
+#: templates/admin.php:199
 msgid "Allow users to share items to the public with links"
 msgstr "La brukarar dela ting offentleg med lenkjer"
 
-#: templates/admin.php:186
+#: templates/admin.php:207
 msgid "Allow public uploads"
 msgstr "Tillat offentlege opplastingar"
 
-#: templates/admin.php:187
+#: templates/admin.php:208
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "La brukarar tillata andre å lasta opp i deira offentleg delte mapper"
 
-#: templates/admin.php:195
+#: templates/admin.php:216
 msgid "Allow resharing"
 msgstr "Tillat vidaredeling"
 
-#: templates/admin.php:196
+#: templates/admin.php:217
 msgid "Allow users to share items shared with them again"
 msgstr "La brukarar vidaredela delte ting"
 
-#: templates/admin.php:203
+#: templates/admin.php:224
 msgid "Allow users to share with anyone"
 msgstr "La brukarar dela med kven som helst"
 
-#: templates/admin.php:206
+#: templates/admin.php:227
 msgid "Allow users to only share with users in their groups"
 msgstr "La brukarar dela berre med brukarar i deira grupper"
 
-#: templates/admin.php:213
+#: templates/admin.php:234
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:235
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:242
 msgid "Security"
 msgstr "Tryggleik"
 
-#: templates/admin.php:234
+#: templates/admin.php:255
 msgid "Enforce HTTPS"
 msgstr "Krev HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:257
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Tvingar klientar til å kopla til %s med ei kryptert tilkopling."
 
-#: templates/admin.php:242
+#: templates/admin.php:263
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet)."
 
-#: templates/admin.php:254
+#: templates/admin.php:275
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:277
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:308
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:330
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:334
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:338
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:343
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:344
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:347
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:351
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:352
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:357
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:255
+#: templates/admin.php:358
 msgid "Log level"
 msgstr "Log nivå"
 
-#: templates/admin.php:287
+#: templates/admin.php:390
 msgid "More"
 msgstr "Meir"
 
-#: templates/admin.php:288
+#: templates/admin.php:391
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:397 templates/personal.php:181
 msgid "Version"
 msgstr "Utgåve"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:401 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -452,30 +590,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "<a href=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Legg til din app"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Fleire app-ar"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Vel eit program"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Sjå programsida på apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "Lisensiert under <span class=\"licence\"></span> av <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Brukardokumentasjon"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administratordokumentasjon"
@@ -509,7 +651,7 @@ msgstr "Vis Oppstartvegvisaren igjen"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Passord"
 
@@ -521,151 +663,149 @@ msgstr "Passordet ditt er endra"
 msgid "Unable to change your password"
 msgstr "Klarte ikkje endra passordet"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Passord"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Endra passord"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Di epost-adresse"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profilbilete"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Last opp ny"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Vel ny frå Filer"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Fjern bilete"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Anten PNG eller JPG. Helst kvadratisk, men du får moglegheita til å beskjera det."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Avbryt"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Vel som profilbilete"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Hjelp oss å omsetja"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Kryptering"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Innloggingspassord"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Dekrypter alle filene"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Innloggingsnamn"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Lag"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Gjenopprettingspassord for administrator"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Standardlagring"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Ubegrensa"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Anna"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Brukarnamn"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Lagring"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "lag nytt passord"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 354e05bee4d..480d38d38db 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\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"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Feil"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Vel grupper"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "Hjelp"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 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 "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 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. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""