[tx-robot] updated from transifex

5 files changed, 195 insertions, 210 deletions

diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index cf0d8b1d8ce..0fcbde93026 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-23 01:55-0400\n"
-"PO-Revision-Date: 2013-07-23 05:04+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -227,8 +227,8 @@ msgstr "Objekttypen er ikkje spesifisert."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:625
-#: js/share.js:637
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:631 js/share.js:643
 msgid "Error"
 msgstr "Feil"
 
@@ -248,123 +248,123 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:125 js/share.js:665
+#: js/share.js:131 js/share.js:671
 msgid "Error while sharing"
 msgstr "Feil ved deling"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Feil ved udeling"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Feil ved endring av tillatingar"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delt med deg og gruppa {group} av {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Delt med deg av {owner}"
 
-#: js/share.js:177
+#: js/share.js:183
 msgid "Share with"
 msgstr "Del med"
 
-#: js/share.js:182
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Del med lenkje"
 
-#: js/share.js:185
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Passordvern"
 
-#: js/share.js:187 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Passord"
 
-#: js/share.js:192
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:196
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Send lenkja over e-post"
 
-#: js/share.js:197
+#: js/share.js:203
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:202
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Set utløpsdato"
 
-#: js/share.js:203
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Utløpsdato"
 
-#: js/share.js:235
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Del over e-post:"
 
-#: js/share.js:237
+#: js/share.js:243
 msgid "No people found"
 msgstr "Fann ingen personar"
 
-#: js/share.js:275
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Vidaredeling er ikkje tillate"
 
-#: js/share.js:311
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {brukar}"
 
-#: js/share.js:332
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Udel"
 
-#: js/share.js:344
+#: js/share.js:350
 msgid "can edit"
 msgstr "kan endra"
 
-#: js/share.js:346
+#: js/share.js:352
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:349
+#: js/share.js:355
 msgid "create"
 msgstr "lag"
 
-#: js/share.js:352
+#: js/share.js:358
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:355
+#: js/share.js:361
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:358
+#: js/share.js:364
 msgid "share"
 msgstr "del"
 
-#: js/share.js:392 js/share.js:612
+#: js/share.js:398 js/share.js:618
 msgid "Password protected"
 msgstr "Passordverna"
 
-#: js/share.js:625
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Klarte ikkje fjerna utløpsdato"
 
-#: js/share.js:637
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Klarte ikkje setja utløpsdato"
 
-#: js/share.js:652
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Sender …"
 
-#: js/share.js:663
+#: js/share.js:669
 msgid "Email sent"
 msgstr "E-post sendt"
 
@@ -402,7 +402,7 @@ 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:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Brukarnamn"
@@ -467,7 +467,7 @@ msgstr "Tilgang forbudt"
 msgid "Cloud not found"
 msgstr "Fann ikkje skyen"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +496,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Ver venleg og oppdater PHP-installasjonen din så han køyrer ownCloud på ein trygg måte."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -517,65 +518,65 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Ver venleg og les <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentasjonen</a> for å læra korleis du set opp tenaren din på rett måte."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Lag ein <strong>admin-konto</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Set opp databasen"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "vil verta nytta"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Databasebrukar"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Databasenamn"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Tabellnamnrom for database"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Databasetenar"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Fullfør oppsettet"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 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:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Logg ut"
 
@@ -609,7 +610,7 @@ msgstr "Logg inn"
 msgid "Alternative Logins"
 msgstr "Alternative innloggingar"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
index 4de20b08440..225c83b9622 100644
--- a/l10n/nn_NO/files_versions.po
+++ b/l10n/nn_NO/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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,41 +18,27 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Klarte ikkje å tilbakestilla: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "vellukka"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Tilbakestilte fila %s til utgåva %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "feil"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Klarte ikkje tilbakestilla fila %s til utgåva %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Utgåver"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Ingen eldre utgåver tilgjengelege"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Ingen sti gjeve"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Utgåver"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Tilbakestill ei fil til ei tidlegare utgåve ved å klikka tilbakestill-knappen"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Gjenopprett"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 11db1a7f9d1..aeaadb95a3c 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-23 01:55-0400\n"
-"PO-Revision-Date: 2013-07-23 05:55+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -171,175 +171,173 @@ msgstr "Du må oppgje eit gyldig passord"
 msgid "__language_name__"
 msgstr "Nynorsk"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Tryggleiksåtvaring"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett. Fila .htaccess som ownCloud tilbyr fungerer ikkje. Me rår sterkt til at du set opp tenaren din slik at datamappa ikkje lenger er tilgjengeleg, eller at du flyttar datamappa vekk frå dokumentrota til tenaren."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Oppsettsåtvaring"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 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:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Modulen «fileinfo» manglar"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 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:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Regionaldata fungerer ikkje"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som trengst for å støtta %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Nettilkoplinga fungerer ikkje"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps don´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsprogram ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du slå på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Utfør éi oppgåve for kvar sidelasting"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php er registrert ved ei webcron-teneste. Last sida cron.php i ownCloud-rota ein gong i minuttet over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Bruk cron-tenesta til systemet. Køyr fila cron.php i ownCloud-mappa frå ein cron-jobb på systemet ein gong i minuttet."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Slå på API-et for deling"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "La app-ar bruka API-et til deling"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Tillat lenkjer"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "La brukarar dela ting offentleg med lenkjer"
 
-#: templates/admin.php:153
+#: templates/admin.php:151
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:154
+#: templates/admin.php:152
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:162
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Tillat vidaredeling"
 
-#: templates/admin.php:163
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "La brukarar vidaredela delte ting"
 
-#: templates/admin.php:170
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "La brukarar dela med kven som helst"
 
-#: templates/admin.php:173
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "La brukarar dela berre med brukarar i deira grupper"
 
-#: templates/admin.php:180
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Tryggleik"
 
-#: templates/admin.php:193
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Krev HTTPS"
 
-#: templates/admin.php:194
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Krev at klientar koplar til ownCloud med ei kryptert tilkopling."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å slå av/på SSL-handhevinga."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:207
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:208
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Log nivå"
 
-#: templates/admin.php:239
+#: templates/admin.php:243
 msgid "More"
 msgstr "Meir"
 
-#: templates/admin.php:240
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:246 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Utgåve"
 
-#: templates/admin.php:250 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -397,72 +395,72 @@ msgstr "Feilsporar"
 msgid "Commercial Support"
 msgstr "Betalt brukarstøtte"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Få app-ar som kan synkronisera filene dine"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Vis Oppstartvegvisaren igjen"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 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:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passord"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Passordet ditt er endra"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Klarte ikkje endra passordet"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Passord"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Endra passord"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Visingsnamn"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Di epost-adresse"
 
-#: templates/personal.php:78
+#: 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:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Hjelp oss å omsetja"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index ba41ca0f2f7..888152a0e12 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/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-23 01:55-0400\n"
-"PO-Revision-Date: 2013-07-23 05:05+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"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. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/nn_NO/user_webdavauth.po b/l10n/nn_NO/user_webdavauth.po
index b281d34b07e..05d3c32b03d 100644
--- a/l10n/nn_NO/user_webdavauth.po
+++ b/l10n/nn_NO/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV-autentisering"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud sender brukarakkreditiv til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige."
+msgstr ""