[tx-robot] updated from transifex

2 files changed, 110 insertions, 110 deletions

diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 60be9f1a051..d81a175aab3 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-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 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"
@@ -62,79 +62,79 @@ msgstr "Foreløpig profilbilde ikke tilgjengelig. Prøv igjen"
 msgid "No crop data provided"
 msgstr "Ingen beskjæringsinformasjon angitt"
 
-#: js/config.php:36
+#: js/config.php:43
 msgid "Sunday"
 msgstr "Søndag"
 
-#: js/config.php:37
+#: js/config.php:44
 msgid "Monday"
 msgstr "Mandag"
 
-#: js/config.php:38
+#: js/config.php:45
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: js/config.php:39
+#: js/config.php:46
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:40
+#: js/config.php:47
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:41
+#: js/config.php:48
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:42
+#: js/config.php:49
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: js/config.php:47
+#: js/config.php:54
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:48
+#: js/config.php:55
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:49
+#: js/config.php:56
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:50
+#: js/config.php:57
 msgid "April"
 msgstr "April"
 
-#: js/config.php:51
+#: js/config.php:58
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:52
+#: js/config.php:59
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:53
+#: js/config.php:60
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:54
+#: js/config.php:61
 msgid "August"
 msgstr "August"
 
-#: js/config.php:55
+#: js/config.php:62
 msgid "September"
 msgstr "September"
 
-#: js/config.php:56
+#: js/config.php:63
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:57
+#: js/config.php:64
 msgid "November"
 msgstr "November"
 
-#: js/config.php:58
+#: js/config.php:65
 msgid "December"
 msgstr "Desember"
 
@@ -194,75 +194,75 @@ msgstr "i fjor"
 msgid "years ago"
 msgstr "år siden"
 
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Velg"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Feil ved lasting av filvelger-mal: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
 msgid "No"
 msgstr "Nei"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Velg"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Feil ved lasting av filvelger-mal: {error}"
+
+#: js/oc-dialogs.js:263
 msgid "Ok"
 msgstr "Ok"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
 msgstr "Feil ved lasting av meldingsmal: {error}"
 
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} filkonflikt"
 msgstr[1] "{count} filkonflikter"
 
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
 msgid "One file conflict"
 msgstr "En filkonflikt"
 
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
 msgid "New Files"
 msgstr ""
 
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
 msgid "Already existing files"
 msgstr ""
 
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
 msgstr "Hvilke filer vil du beholde?"
 
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "Hvis du velger begge versjonene vil den kopierte filen få et nummer lagt til i navnet."
 
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
 msgid "Continue"
 msgstr "Fortsett"
 
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
 msgstr "(alle valgt)"
 
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
 msgstr "({count} valgt)"
 
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
 msgstr "Feil ved lasting av \"filen eksisterer\"-mal"
 
@@ -294,12 +294,12 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:747
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Feil"
 
-#: js/share.js:160 js/share.js:790
+#: js/share.js:160 js/share.js:810
 msgid "Error while sharing"
 msgstr "Feil under deling"
 
@@ -327,107 +327,116 @@ msgstr "Del med bruker eller gruppe …"
 msgid "Share link"
 msgstr "Del lenke"
 
-#: js/share.js:223
+#: js/share.js:226
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:228
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:234
 msgid "Password protect"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+#: js/share.js:236 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Passord"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Allow Public Upload"
 msgstr "Tillat Offentlig Opplasting"
 
-#: js/share.js:234
+#: js/share.js:245
 msgid "Email link to person"
 msgstr "Email lenke til person"
 
-#: js/share.js:235
+#: js/share.js:246
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Set expiration date"
 msgstr "Set utløpsdato"
 
-#: js/share.js:241
+#: js/share.js:252
 msgid "Expiration date"
 msgstr "Utløpsdato"
 
-#: js/share.js:277
+#: js/share.js:289
 msgid "Share via email:"
 msgstr "Del på epost"
 
-#: js/share.js:280
+#: js/share.js:292
 msgid "No people found"
 msgstr "Ingen personer funnet"
 
-#: js/share.js:324 js/share.js:385
+#: js/share.js:336 js/share.js:397
 msgid "group"
 msgstr "gruppe"
 
-#: js/share.js:357
+#: js/share.js:369
 msgid "Resharing is not allowed"
 msgstr "Videredeling er ikke tillatt"
 
-#: js/share.js:401
+#: js/share.js:413
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {user}"
 
-#: js/share.js:423
+#: js/share.js:435
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: js/share.js:431
+#: js/share.js:443
 msgid "notify by email"
 msgstr "Varsle på email"
 
-#: js/share.js:434
+#: js/share.js:446
 msgid "can edit"
 msgstr "kan endre"
 
-#: js/share.js:436
+#: js/share.js:448
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:439
+#: js/share.js:451
 msgid "create"
 msgstr "opprett"
 
-#: js/share.js:442
+#: js/share.js:454
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:445
+#: js/share.js:457
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:448
+#: js/share.js:460
 msgid "share"
 msgstr "del"
 
-#: js/share.js:721
+#: js/share.js:734
 msgid "Password protected"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:734
+#: js/share.js:747
 msgid "Error unsetting expiration date"
 msgstr "Feil ved nullstilling av utløpsdato"
 
-#: js/share.js:752
+#: js/share.js:768
 msgid "Error setting expiration date"
 msgstr "Kan ikke sette utløpsdato"
 
-#: js/share.js:777
+#: js/share.js:797
 msgid "Sending ..."
 msgstr "Sender..."
 
-#: js/share.js:788
+#: js/share.js:808
 msgid "Email sent"
 msgstr "E-post sendt"
 
-#: js/share.js:812
+#: js/share.js:832
 msgid "Warning"
 msgstr "Advarsel"
 
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index f237d066e17..6c0eca08190 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.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-14 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 05:54+0000\n"
+"POT-Creation-Date: 2014-05-15 01:54-0400\n"
+"PO-Revision-Date: 2014-05-15 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"
@@ -193,7 +193,7 @@ msgstr "Serveren støtter ikke endring av passord, men oppdatering av brukerens
 msgid "Unable to change password"
 msgstr "Kunne ikke endre passord"
 
-#: js/admin.js:73
+#: js/admin.js:81
 msgid "Sending..."
 msgstr "Sender..."
 
@@ -518,61 +518,52 @@ msgstr "Tillat apps å bruke API for Deling"
 msgid "Allow links"
 msgstr "Tillat lenker"
 
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Tillat brukere å dele filer offentlig med lenker"
-
-#: templates/admin.php:227
+#: templates/admin.php:225
 msgid "Allow public uploads"
 msgstr "Tillat offentlig opplasting"
 
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Tillat at brukere lar andre laste opp til deres offentlig delte mapper"
+#: templates/admin.php:229
+msgid "Set default expiration date"
+msgstr ""
 
-#: templates/admin.php:235
+#: templates/admin.php:231
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:234
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:237
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:241
+msgid "Allow users to share items to the public with links"
+msgstr "Tillat brukere å dele filer offentlig med lenker"
+
+#: templates/admin.php:251
 msgid "Allow resharing"
 msgstr "TIllat videredeling"
 
-#: templates/admin.php:236
+#: templates/admin.php:252
 msgid "Allow users to share items shared with them again"
 msgstr "Tillat brukere å dele filer som allerede har blitt delt med dem"
 
-#: templates/admin.php:243
+#: templates/admin.php:259
 msgid "Allow users to share with anyone"
 msgstr "Tillat brukere å dele med alle"
 
-#: templates/admin.php:246
+#: templates/admin.php:262
 msgid "Allow users to only share with users in their groups"
 msgstr "Tillat kun deling med andre brukere i samme gruppe"
 
-#: templates/admin.php:253
+#: templates/admin.php:269
 msgid "Allow mail notification"
 msgstr "Tillat påminnelser i e-post"
 
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
 #: templates/admin.php:270
-msgid "Expire shares by default after N days"
+msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
 #: templates/admin.php:278