[tx-robot] updated from transifex

1 files changed, 87 insertions, 62 deletions

diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 69c56f33eeb..0e5176bacbe 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Klarte ikke å sende mail til følgende brukere: %s"
@@ -42,6 +42,11 @@ msgstr "Slo av vedlikeholdsmodus"
 msgid "Updated database"
 msgstr "Oppdaterte databasen"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Bilde eller fil ikke angitt"
@@ -138,59 +143,59 @@ msgstr "November"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Lagrer..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minutt siden"
 msgstr[1] "%n minutter siden"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n time siden"
 msgstr[1] "%n timer siden"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag siden"
 msgstr[1] "%n dager siden"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "forrige måned"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n dag siden"
 msgstr[1] "%n dager siden"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "i fjor"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "år siden"
 
@@ -294,149 +299,149 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Feil"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Feil under deling"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Feil ved oppheving av deling"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Feil ved endring av tillatelser"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delt med deg og gruppen {group} av {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Delt med deg av {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Del med bruker eller gruppe …"
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Del lenke"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Tillat Offentlig Opplasting"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Email lenke til person"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Set utløpsdato"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Utløpsdato"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Del på epost"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Ingen personer funnet"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "gruppe"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Videredeling er ikke tillatt"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "Varsle på email"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "kan endre"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "opprett"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "del"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Feil ved nullstilling av utløpsdato"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Kan ikke sette utløpsdato"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Sender..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "E-post sendt"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -468,18 +473,19 @@ msgstr "Feil ved lasting av dialogmal: {error}"
 msgid "No tags selected for deletion."
 msgstr "Ingen merkelapper valgt for sletting."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Vennligst last siden på nytt."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Oppdateringen mislyktes. Vennligst rapporter dette problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud."
 
@@ -809,8 +815,27 @@ msgstr "Takk for din tålmodighet."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Oppdaterer ownCloud til versjon %s, dette kan ta en stund."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""