Merge translation files from master branch.

2 files changed, 94 insertions, 100 deletions

diff --git a/tde-i18n-nb/messages/tdepim/kalarm.po b/tde-i18n-nb/messages/tdepim/kalarm.po
index ccd4d3077c2..6bac58030c0 100644
--- a/tde-i18n-nb/messages/tdepim/kalarm.po
+++ b/tde-i18n-nb/messages/tdepim/kalarm.po
@@ -16,7 +16,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kalarm\n"
-"POT-Creation-Date: 2019-01-13 18:48+0100\n"
+"POT-Creation-Date: 2019-01-23 23:17+0100\n"
 "PO-Revision-Date: 2007-08-20 01:38+0200\n"
 "Last-Translator: Knut Yrvin <knuty@skolelinux.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -885,17 +885,11 @@ msgstr "Du må skrive inn et navn for varslilngsmalen"
 msgid "Template name is already in use"
 msgstr "Det malnavnet er allerede i bruk"
 
-#: editdlg.cpp:1387
-msgid ""
-"The date/time in the Alarm tab does not match the recurrence settings "
-"specified in the Recurrence tab."
-msgstr ""
-
-#: editdlg.cpp:1405
+#: editdlg.cpp:1398
 msgid "Recurrence has already expired"
 msgstr "Neste varslingstidspunkt er allerede utløpt"
 
-#: editdlg.cpp:1433
+#: editdlg.cpp:1426
 msgid ""
 "Reminder period must be less than the recurrence interval, unless '%1' is "
 "checked."
@@ -903,7 +897,7 @@ msgstr ""
 "Påminnelsesperioden må være mindre enn gjentakelsesintervallet hvis «%1» "
 "ikke er valgt."
 
-#: editdlg.cpp:1447
+#: editdlg.cpp:1441
 #, fuzzy
 msgid ""
 "The duration of a repetition within the recurrence must be less than the "
@@ -912,7 +906,7 @@ msgstr ""
 "Gjentakingslengden må være mindre enn gjentakingsintervallet, minus "
 "påminnelsesperioden, hvis noen"
 
-#: editdlg.cpp:1454
+#: editdlg.cpp:1448
 #, fuzzy
 msgid ""
 "For a repetition within the recurrence, its period must be in units of days "
@@ -921,20 +915,20 @@ msgstr ""
 "Den enkle varslingsrepetisjonens periode må være i hele dager eller uker for "
 "datovarslinger"
 
-#: editdlg.cpp:1476
+#: editdlg.cpp:1470
 msgid "Do you really want to send the email now to the specified recipient(s)?"
 msgstr ""
 "Er du sikker på at du vil sende e-posten nå til de oppgitte adressatene?"
 
-#: editdlg.cpp:1477
+#: editdlg.cpp:1471
 msgid "Confirm Email"
 msgstr "Bekreft e-post"
 
-#: editdlg.cpp:1477
+#: editdlg.cpp:1471
 msgid "&Send"
 msgstr "&Send"
 
-#: editdlg.cpp:1488
+#: editdlg.cpp:1482
 #, c-format
 msgid ""
 "Command executed:\n"
@@ -943,7 +937,7 @@ msgstr ""
 "Kommando kjørt:\n"
 "%1"
 
-#: editdlg.cpp:1495
+#: editdlg.cpp:1489
 #, c-format
 msgid ""
 "\n"
@@ -952,7 +946,7 @@ msgstr ""
 "\n"
 "Bcc: %1"
 
-#: editdlg.cpp:1496
+#: editdlg.cpp:1490
 msgid ""
 "Email sent to:\n"
 "%1%2"
@@ -960,16 +954,16 @@ msgstr ""
 "E-post sendt til:\n"
 "%1%2"
 
-#: editdlg.cpp:1557 messagewin.cpp:1543
+#: editdlg.cpp:1551 messagewin.cpp:1543
 msgid "Defer Alarm"
 msgstr "Utsett varsling"
 
-#: editdlg.cpp:1711
+#: editdlg.cpp:1705
 msgid ""
 "Log file must be the name or path of a local file, with write permission."
 msgstr "Loggfil må være navn eller sti til en lokal fil med skrivetilgang."
 
-#: editdlg.cpp:1737
+#: editdlg.cpp:1731
 #, c-format
 msgid ""
 "Invalid email address:\n"
@@ -978,11 +972,11 @@ msgstr ""
 "Ugyldig e-postadresse:\n"
 " %1"
 
-#: editdlg.cpp:1744
+#: editdlg.cpp:1738
 msgid "No email address specified"
 msgstr "Ingen e-postadresse oppgitt"
 
-#: editdlg.cpp:1761
+#: editdlg.cpp:1755
 #, c-format
 msgid ""
 "Invalid email attachment:\n"
@@ -991,31 +985,31 @@ msgstr ""
 "Ugyldig e-postvedlegg:\n"
 " %1"
 
-#: editdlg.cpp:1790
+#: editdlg.cpp:1784
 msgid "Display the alarm message now"
 msgstr "Vis varslingsbeskjeden nå"
 
-#: editdlg.cpp:1807
+#: editdlg.cpp:1801
 msgid "Display the file now"
 msgstr "Vis fila nå"
 
-#: editdlg.cpp:1819
+#: editdlg.cpp:1813
 msgid "Execute the specified command now"
 msgstr "Utfør den angitte kommandoen nå"
 
-#: editdlg.cpp:1830
+#: editdlg.cpp:1824
 msgid "Send the email to the specified addressees now"
 msgstr "Send e-posten til de oppgitte adressatene nå"
 
-#: editdlg.cpp:1904
+#: editdlg.cpp:1898
 msgid "Choose File to Attach"
 msgstr "Velg fil som skal legges ved"
 
-#: editdlg.cpp:2011
+#: editdlg.cpp:2005
 msgid "Please select a file to display"
 msgstr "Velg en fil som skal vises"
 
-#: editdlg.cpp:2013
+#: editdlg.cpp:2007
 msgid ""
 "%1\n"
 "not found"
@@ -1023,7 +1017,7 @@ msgstr ""
 "%1\n"
 "ikke funnet"
 
-#: editdlg.cpp:2014
+#: editdlg.cpp:2008
 msgid ""
 "%1\n"
 "is a folder"
@@ -1031,7 +1025,7 @@ msgstr ""
 "%1\n"
 "er en mappe"
 
-#: editdlg.cpp:2015
+#: editdlg.cpp:2009
 msgid ""
 "%1\n"
 "is not readable"
@@ -1039,7 +1033,7 @@ msgstr ""
 "%1\n"
 "er ikke lesbar"
 
-#: editdlg.cpp:2016
+#: editdlg.cpp:2010
 msgid ""
 "%1\n"
 "appears not to be a text or image file"
@@ -2899,195 +2893,195 @@ msgstr "Sluttdato er før startdato"
 msgid "End date/time is earlier than start date/time"
 msgstr "Sluttdato/tid er før startdato/tid"
 
-#: recurrenceedit.cpp:734
+#: recurrenceedit.cpp:641
 msgid ""
 "_: Date cannot be earlier than start date\n"
 "start date"
 msgstr "startdato"
 
-#: recurrenceedit.cpp:1124
+#: recurrenceedit.cpp:1031
 msgid "Recur e&very"
 msgstr "Gjenta h&ver(t)"
 
-#: recurrenceedit.cpp:1192
+#: recurrenceedit.cpp:1099
 msgid "hours:minutes"
 msgstr "timer:minutt"
 
-#: recurrenceedit.cpp:1193
+#: recurrenceedit.cpp:1100
 msgid "Enter the number of hours and minutes between repetitions of the alarm"
 msgstr ""
 "Skriv inn tallet på timer og minutter mellom gjentakelser av varslingen"
 
-#: recurrenceedit.cpp:1211
+#: recurrenceedit.cpp:1118
 msgid ""
 "_: On: Tuesday\n"
 "O&n:"
 msgstr "&På:"
 
-#: recurrenceedit.cpp:1289
+#: recurrenceedit.cpp:1196
 msgid "No day selected"
 msgstr "Ingen dag er valgt"
 
-#: recurrenceedit.cpp:1318
+#: recurrenceedit.cpp:1225
 msgid "day(s)"
 msgstr "dag(er)"
 
-#: recurrenceedit.cpp:1319
+#: recurrenceedit.cpp:1226
 msgid "Enter the number of days between repetitions of the alarm"
 msgstr "Tast inn antall dager mellom varslingsgjentakelser"
 
-#: recurrenceedit.cpp:1320
+#: recurrenceedit.cpp:1227
 msgid "Select the days of the week on which the alarm is allowed to occur"
 msgstr "Velg ukedag da varslingen skal gjentas"
 
-#: recurrenceedit.cpp:1331
+#: recurrenceedit.cpp:1238
 msgid "week(s)"
 msgstr "Uke(r)"
 
-#: recurrenceedit.cpp:1332
+#: recurrenceedit.cpp:1239
 msgid "Enter the number of weeks between repetitions of the alarm"
 msgstr "Tast inn antall uker mellom varslingsgjentakelser"
 
-#: recurrenceedit.cpp:1333
+#: recurrenceedit.cpp:1240
 msgid "Select the days of the week on which to repeat the alarm"
 msgstr "Velg ukedag da varslingen skal gjentas"
 
-#: recurrenceedit.cpp:1356
+#: recurrenceedit.cpp:1263
 msgid ""
 "_: On day number in the month\n"
 "O&n day"
 msgstr "P&å dag"
 
-#: recurrenceedit.cpp:1360
+#: recurrenceedit.cpp:1267
 msgid "Repeat the alarm on the selected day of the month"
 msgstr "Gjenta varslingen på den angitte dagen i måneden"
 
-#: recurrenceedit.cpp:1366
+#: recurrenceedit.cpp:1273
 msgid ""
 "_: Last day of month\n"
 "Last"
 msgstr "Siste"
 
-#: recurrenceedit.cpp:1369
+#: recurrenceedit.cpp:1276
 msgid "Select the day of the month on which to repeat the alarm"
 msgstr "Velg dag i måneden da varslingen skal gjentas"
 
-#: recurrenceedit.cpp:1381
+#: recurrenceedit.cpp:1288
 msgid ""
 "_: On the 1st Tuesday\n"
 "On t&he"
 msgstr "På &den"
 
-#: recurrenceedit.cpp:1386
+#: recurrenceedit.cpp:1293
 msgid ""
 "Repeat the alarm on one day of the week, in the selected week of the month"
 msgstr "Gjenta varslingen på én ukedag, i den valgte uka i måneden"
 
-#: recurrenceedit.cpp:1389
+#: recurrenceedit.cpp:1296
 msgid "1st"
 msgstr "1."
 
-#: recurrenceedit.cpp:1390
+#: recurrenceedit.cpp:1297
 msgid "2nd"
 msgstr "2."
 
-#: recurrenceedit.cpp:1391
+#: recurrenceedit.cpp:1298
 msgid "3rd"
 msgstr "3."
 
-#: recurrenceedit.cpp:1392
+#: recurrenceedit.cpp:1299
 msgid "4th"
 msgstr "4."
 
-#: recurrenceedit.cpp:1393
+#: recurrenceedit.cpp:1300
 msgid "5th"
 msgstr "5."
 
-#: recurrenceedit.cpp:1394
+#: recurrenceedit.cpp:1301
 msgid ""
 "_: Last Monday in March\n"
 "Last"
 msgstr "Siste"
 
-#: recurrenceedit.cpp:1395
+#: recurrenceedit.cpp:1302
 msgid "2nd Last"
 msgstr "2. siste"
 
-#: recurrenceedit.cpp:1396
+#: recurrenceedit.cpp:1303
 msgid "3rd Last"
 msgstr "3. siste"
 
-#: recurrenceedit.cpp:1397
+#: recurrenceedit.cpp:1304
 msgid "4th Last"
 msgstr "4. siste"
 
-#: recurrenceedit.cpp:1398
+#: recurrenceedit.cpp:1305
 msgid "5th Last"
 msgstr "5. siste"
 
-#: recurrenceedit.cpp:1401
+#: recurrenceedit.cpp:1308
 msgid ""
 "_: Every (Monday...) in month\n"
 "Every"
 msgstr "Hver"
 
-#: recurrenceedit.cpp:1404
+#: recurrenceedit.cpp:1311
 msgid "Select the week of the month in which to repeat the alarm"
 msgstr "Velg uke i måneden da varslingen skal gjentas"
 
-#: recurrenceedit.cpp:1417
+#: recurrenceedit.cpp:1324
 msgid "Select the day of the week on which to repeat the alarm"
 msgstr "Velg ukedag da varslingen skal gjentas"
 
-#: recurrenceedit.cpp:1535
+#: recurrenceedit.cpp:1442
 msgid "month(s)"
 msgstr "måned(er)"
 
-#: recurrenceedit.cpp:1536
+#: recurrenceedit.cpp:1443
 msgid "Enter the number of months between repetitions of the alarm"
 msgstr "Tast inn antall måneder mellom varslingsgjentakelser"
 
-#: recurrenceedit.cpp:1547
+#: recurrenceedit.cpp:1454
 msgid "year(s)"
 msgstr "år"
 
-#: recurrenceedit.cpp:1548
+#: recurrenceedit.cpp:1455
 msgid "Enter the number of years between repetitions of the alarm"
 msgstr "Tast inn antall år mellom varslingsgjentakelser"
 
-#: recurrenceedit.cpp:1553
+#: recurrenceedit.cpp:1460
 msgid ""
 "_: List of months to select\n"
 "Months:"
 msgstr ""
 
-#: recurrenceedit.cpp:1572
+#: recurrenceedit.cpp:1479
 msgid "Select the months of the year in which to repeat the alarm"
 msgstr "Velg de måneder da varslingen skal gjentas"
 
-#: recurrenceedit.cpp:1579
+#: recurrenceedit.cpp:1486
 msgid "February 2&9th alarm in non-leap years:"
 msgstr "2&9de februar i ikke-skuddår:"
 
-#: recurrenceedit.cpp:1582
+#: recurrenceedit.cpp:1489
 msgid ""
 "_: No date\n"
 "None"
 msgstr "Ingen"
 
-#: recurrenceedit.cpp:1583
+#: recurrenceedit.cpp:1490
 msgid ""
 "_: 1st March (short form)\n"
 "1 Mar"
 msgstr "1 mar"
 
-#: recurrenceedit.cpp:1584
+#: recurrenceedit.cpp:1491
 msgid ""
 "_: 28th February (short form)\n"
 "28 Feb"
 msgstr "28 feb"
 
-#: recurrenceedit.cpp:1590
+#: recurrenceedit.cpp:1497
 msgid ""
 "Select which date, if any, the February 29th alarm should trigger in non-"
 "leap years"
@@ -3095,7 +3089,7 @@ msgstr ""
 "Velg hvilken dato, hvis noen, den 29. februar-meldinga skal skrus på i ikke-"
 "skuddår"
 
-#: recurrenceedit.cpp:1674
+#: recurrenceedit.cpp:1581
 msgid "No month selected"
 msgstr "Ingen måned er valgt"
 
diff --git a/tde-i18n-nb/messages/tdepim/libkpgp.po b/tde-i18n-nb/messages/tdepim/libkpgp.po
index ea7b6cf8360..877f938d64d 100644
--- a/tde-i18n-nb/messages/tdepim/libkpgp.po
+++ b/tde-i18n-nb/messages/tdepim/libkpgp.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2019-01-13 18:48+0100\n"
+"POT-Creation-Date: 2019-01-23 23:17+0100\n"
 "PO-Revision-Date: 2005-06-20 10:38+0200\n"
 "Last-Translator: Øyvind A. Holm <sunny@sunbase.org>\n"
 "Language-Team: Norsk bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -47,7 +47,7 @@ msgstr "Passordet er for langt. Det må inneholde færre enn 1024 tegn."
 msgid "Out of memory."
 msgstr "Minnet er fullt."
 
-#: kpgp.cpp:279
+#: kpgp.cpp:286
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -55,16 +55,16 @@ msgstr ""
 "Du har skrevet inn et ugyldig passord.\n"
 "Prøv igjen eller avbryt for å lese meldinga mens den fortsatt er kryptert."
 
-#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
-#: kpgp.cpp:582 kpgp.cpp:601
+#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
+#: kpgp.cpp:589 kpgp.cpp:608
 msgid "PGP Warning"
 msgstr "PGP-advarsel"
 
-#: kpgp.cpp:282 kpgp.cpp:342
+#: kpgp.cpp:289 kpgp.cpp:349
 msgid "&Retry"
 msgstr "&Prøv igjen"
 
-#: kpgp.cpp:336
+#: kpgp.cpp:343
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -74,11 +74,11 @@ msgstr ""
 "Vil du prøve igjen, fortsette uten å signere meldinga eller avbryte "
 "sendingen av meldingen?"
 
-#: kpgp.cpp:343 kpgp.cpp:371
+#: kpgp.cpp:350 kpgp.cpp:378
 msgid "Send &Unsigned"
 msgstr "Send &usignert"
 
-#: kpgp.cpp:365
+#: kpgp.cpp:372
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -87,7 +87,7 @@ msgstr ""
 "%1\n"
 "Vil du sende meldinga usignert, eller vil du avbryte?"
 
-#: kpgp.cpp:383
+#: kpgp.cpp:390
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
@@ -98,15 +98,15 @@ msgstr ""
 "Vil du kryptere uansett, la meldinga være som den er eller avbryte sendingen "
 "av meldingen?"
 
-#: kpgp.cpp:390 kpgp.cpp:602
+#: kpgp.cpp:397 kpgp.cpp:609
 msgid "Send &Encrypted"
 msgstr "Send &kryptert"
 
-#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
+#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
 msgid "Send &Unencrypted"
 msgstr "Send &ukryptert"
 
-#: kpgp.cpp:410
+#: kpgp.cpp:417
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -115,11 +115,11 @@ msgstr ""
 "%1\n"
 "Vil du la meldinga være som den er, eller vil du avbryte sendingen?"
 
-#: kpgp.cpp:416
+#: kpgp.cpp:423
 msgid "&Send As-Is"
 msgstr "&Send som den er"
 
-#: kpgp.cpp:427
+#: kpgp.cpp:434
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -128,7 +128,7 @@ msgstr ""
 "Følgende feil oppstod:\n"
 "%1"
 
-#: kpgp.cpp:429
+#: kpgp.cpp:436
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -136,7 +136,7 @@ msgstr ""
 "Dette er feilmeldinga fra %1:\n"
 "%2"
 
-#: kpgp.cpp:574
+#: kpgp.cpp:581
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -144,7 +144,7 @@ msgstr ""
 "Du har ikke valgt en krypteringsnøkkel for mottakeren av denne meldinga. "
 "Derfor vil ikke denne meldinga bli kryptert."
 
-#: kpgp.cpp:577
+#: kpgp.cpp:584
 msgid ""
 "You did not select an encryption key for any of the recipients of this "
 "message; therefore, the message will not be encrypted."
@@ -152,7 +152,7 @@ msgstr ""
 "Du har ikke valgt en krypteringsnøkkel for samtlige mottakere av denne "
 "meldinga. Derfor vil ikke denne meldinga bli kryptert."
 
-#: kpgp.cpp:593
+#: kpgp.cpp:600
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -161,7 +161,7 @@ msgstr ""
 "meldinga. Derfor vil ikke denne personen kunne dekryptere meldinga hvis du "
 "krypterer den."
 
-#: kpgp.cpp:596
+#: kpgp.cpp:603
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -170,7 +170,7 @@ msgstr ""
 "meldinga. Disse personene vil derfor ikke kunne dekryptere denne meldinga "
 "hvis du krypterer den."
 
-#: kpgp.cpp:857
+#: kpgp.cpp:877
 msgid ""
 "This feature is\n"
 "still missing"
@@ -178,18 +178,18 @@ msgstr ""
 "Denne funksjonen\n"
 "mangler fremdeles"
 
-#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
+#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "Enten har du ikke GnuPG/PGP installert på systemet, eller du har valgt å "
 "ikke bruke GnuPG/PGP."
 
-#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "Valg av krypteringsnøkkel"
 
-#: kpgp.cpp:1195
+#: kpgp.cpp:1215
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -201,7 +201,7 @@ msgstr ""
 "\n"
 "Velg på nytt hvilke nøkler som skal brukes for denne mottakeren."
 
-#: kpgp.cpp:1259
+#: kpgp.cpp:1279
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -213,7 +213,7 @@ msgstr ""
 "\n"
 "Velg hvilke nøkler som skal brukes for denne mottakeren."
 
-#: kpgp.cpp:1285
+#: kpgp.cpp:1305
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"