Merge translation files from master branch.

2 files changed, 33 insertions, 20 deletions

diff --git a/tde-i18n-nn/messages/tdebase/kcmsmserver.po b/tde-i18n-nn/messages/tdebase/kcmsmserver.po
index 7d2c4167970..1a93c45c1cf 100644
--- a/tde-i18n-nn/messages/tdebase/kcmsmserver.po
+++ b/tde-i18n-nn/messages/tdebase/kcmsmserver.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmsmserver\n"
-"POT-Creation-Date: 2024-03-03 18:16+0000\n"
+"POT-Creation-Date: 2024-03-25 18:17+0000\n"
 "PO-Revision-Date: 2005-09-18 11:41+0200\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -119,12 +119,25 @@ msgstr ""
 "Kryss av her om du vil at økthandsamaren skal visa ein dialogboks der du kan "
 "stadfesta at du vil logga ut."
 
-#: smserverconfigdlg.ui:114
+#: smserverconfigdlg.ui:112
+#, no-c-format
+msgid "Use &alternative shutdown dialog layout"
+msgstr ""
+
+#: smserverconfigdlg.ui:115
+#, no-c-format
+msgid ""
+"Check this option if you want to use an alternative shutdown dialog, where "
+"buttons are arranged in rows rathen then columns. This layout is popular in "
+"Ubuntu and therefore it is also known as 'Ubuntu style' shutdown dialog."
+msgstr ""
+
+#: smserverconfigdlg.ui:125
 #, no-c-format
 msgid "On Login"
 msgstr "Ved innlogging"
 
-#: smserverconfigdlg.ui:117
+#: smserverconfigdlg.ui:128
 #, no-c-format
 msgid ""
 "<ul>\n"
@@ -144,27 +157,27 @@ msgstr ""
 "starta automatisk neste gong.</li> <li><b>Start med tom økt:</b> Lagrar "
 "ingenting, slik at skrivebordet vert heilt tomt neste gong.</li></ul>"
 
-#: smserverconfigdlg.ui:132
+#: smserverconfigdlg.ui:143
 #, no-c-format
 msgid "Restore &previous session"
 msgstr "Gjenopprett &førre økt"
 
-#: smserverconfigdlg.ui:140
+#: smserverconfigdlg.ui:151
 #, no-c-format
 msgid "Restore &manually saved session"
 msgstr "Gjenopprett &manuelt lagra økt"
 
-#: smserverconfigdlg.ui:148
+#: smserverconfigdlg.ui:159
 #, no-c-format
 msgid "Start with an empty &session"
 msgstr "Start med &tom økt"
 
-#: smserverconfigdlg.ui:158
+#: smserverconfigdlg.ui:169
 #, no-c-format
 msgid "Default Shutdown Option"
 msgstr "Standard avslutningsval"
 
-#: smserverconfigdlg.ui:161
+#: smserverconfigdlg.ui:172
 #, no-c-format
 msgid ""
 "Here you can choose what should happen by default when you log out. This "
@@ -173,32 +186,32 @@ msgstr ""
 "Her kan du velja kva som skal skje når du loggar ut. Innstillinga fungerer "
 "berre når du har logga inn gjennom TDM."
 
-#: smserverconfigdlg.ui:172
+#: smserverconfigdlg.ui:183
 #, no-c-format
 msgid "&End current session"
 msgstr "Avslutt &denne økta"
 
-#: smserverconfigdlg.ui:180
+#: smserverconfigdlg.ui:191
 #, no-c-format
 msgid "&Turn off computer"
 msgstr "&Slå av maskina"
 
-#: smserverconfigdlg.ui:188
+#: smserverconfigdlg.ui:199
 #, no-c-format
 msgid "&Restart computer"
 msgstr "Start &maskina om att"
 
-#: smserverconfigdlg.ui:198
+#: smserverconfigdlg.ui:209
 #, no-c-format
 msgid "Advanced"
 msgstr "Avansert"
 
-#: smserverconfigdlg.ui:209
+#: smserverconfigdlg.ui:220
 #, no-c-format
 msgid "Applications to be e&xcluded from sessions:"
 msgstr "Program som &ikkje skal reknast med i øktene:"
 
-#: smserverconfigdlg.ui:220
+#: smserverconfigdlg.ui:231
 #, no-c-format
 msgid ""
 "Here you can enter a comma-separated list of applications that should not be "
diff --git a/tde-i18n-nn/messages/tdewebdev/quanta.po b/tde-i18n-nn/messages/tdewebdev/quanta.po
index b91a8d01bdc..5c316516731 100644
--- a/tde-i18n-nn/messages/tdewebdev/quanta.po
+++ b/tde-i18n-nn/messages/tdewebdev/quanta.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: quanta\n"
-"POT-Creation-Date: 2022-10-13 18:27+0000\n"
+"POT-Creation-Date: 2024-03-25 20:21+0000\n"
 "PO-Revision-Date: 2004-10-26 17:24+0200\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -1418,7 +1418,7 @@ msgstr "<qt>Kan ikkje lagra loggfila<br><b>%1</b></qt>"
 msgid "<qt>Cannot download the DTD from <b>%1</b>.</qt>"
 msgstr ""
 
-#: parsers/dtd/dtdparser.cpp:103
+#: parsers/dtd/dtdparser.cpp:104
 #, fuzzy
 msgid ""
 "<qt>Error while parsing the DTD.<br>The error message is:<br><i>%1</i></qt>"
@@ -1428,12 +1428,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: parsers/dtd/dtdparser.cpp:108 parsers/dtd/dtepcreationdlg.ui:31
+#: parsers/dtd/dtdparser.cpp:109 parsers/dtd/dtepcreationdlg.ui:31
 #, no-c-format
 msgid "DTD - > DTEP Conversion"
 msgstr "DTD-DTEP-konvertering"
 
-#: parsers/dtd/dtdparser.cpp:155
+#: parsers/dtd/dtdparser.cpp:156
 #, fuzzy
 msgid ""
 "<qt>Cannot create the <br><b>%1</b> file.<br>Check that you have write "
@@ -1445,11 +1445,11 @@ msgstr ""
 "«%2»\n"
 " er gyldig."
 
-#: parsers/dtd/dtdparser.cpp:167
+#: parsers/dtd/dtdparser.cpp:168
 msgid "No elements were found in the DTD."
 msgstr ""
 
-#: dialogs/dtepeditdlgs.ui:25 parsers/dtd/dtdparser.cpp:177 src/quanta.cpp:3112
+#: dialogs/dtepeditdlgs.ui:25 parsers/dtd/dtdparser.cpp:178 src/quanta.cpp:3112
 #, fuzzy, no-c-format
 msgid "Configure DTEP"
 msgstr "Oppsette hendingar:"