Merge translation files from master branch.

1 files changed, 17 insertions, 17 deletions

diff --git a/tde-i18n-nn/messages/tdebase/kcmenergy.po b/tde-i18n-nn/messages/tdebase/kcmenergy.po
index cdc3e36d1ef..f2146e11d8a 100644
--- a/tde-i18n-nn/messages/tdebase/kcmenergy.po
+++ b/tde-i18n-nn/messages/tdebase/kcmenergy.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmenergy\n"
-"POT-Creation-Date: 2020-05-11 13:03+0200\n"
+"POT-Creation-Date: 2020-09-23 21:41+0200\n"
 "PO-Revision-Date: 2003-12-15 00:42+0100\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -28,7 +28,7 @@ msgid ""
 "Your emails"
 msgstr ""
 
-#: energy.cpp:149
+#: energy.cpp:146
 msgid ""
 "<h1>Display Power Control</h1> If your display supports power saving "
 "features, you can configure them using this module.<p> There are three "
@@ -46,40 +46,40 @@ msgstr ""
 "du flytta på musa eller trykkja ein tast som truleg ikkje gjev bieffektar, "
 "til dømes Shift-tasten."
 
-#: energy.cpp:185
+#: energy.cpp:182
 msgid "&Enable display power management"
 msgstr "&Slå på straumsparing for skjerm"
 
-#: energy.cpp:189
+#: energy.cpp:186
 msgid "Check this option to enable the power saving features of your display."
 msgstr "Bruk straumsparingsfunksjonane til skjermen."
 
-#: energy.cpp:193
+#: energy.cpp:190
 #, fuzzy
 msgid "&Enable specific display power management"
 msgstr "&Slå på straumsparing for skjerm"
 
-#: energy.cpp:199
+#: energy.cpp:196
 msgid "Your display does not support power saving."
 msgstr "Skjermen støttar ikkje straumsparing."
 
-#: energy.cpp:206
+#: energy.cpp:203
 msgid "Learn more about the Energy Star program"
 msgstr "Lær meir om Energy Star-programmet"
 
-#: energy.cpp:216
+#: energy.cpp:213
 msgid "&Standby after:"
 msgstr "&Ventemodus etter:"
 
-#: energy.cpp:218 energy.cpp:229 energy.cpp:241
+#: energy.cpp:215 energy.cpp:226 energy.cpp:238
 msgid " min"
 msgstr " min"
 
-#: energy.cpp:219 energy.cpp:230 energy.cpp:242
+#: energy.cpp:216 energy.cpp:227 energy.cpp:239
 msgid "Disabled"
 msgstr "Av"
 
-#: energy.cpp:222
+#: energy.cpp:219
 msgid ""
 "Choose the period of inactivity after which the display should enter "
 "\"standby\" mode. This is the first level of power saving."
@@ -87,11 +87,11 @@ msgstr ""
 "Vel kor lang tid det skal gå før skjermen går i ventemodus. Dette er det "
 "første nivået av straumsparinga."
 
-#: energy.cpp:227
+#: energy.cpp:224
 msgid "S&uspend after:"
 msgstr "&Kvilemodus etter:"
 
-#: energy.cpp:233
+#: energy.cpp:230
 msgid ""
 "Choose the period of inactivity after which the display should enter "
 "\"suspend\" mode. This is the second level of power saving, but may not be "
@@ -101,11 +101,11 @@ msgstr ""
 "andre nivået av straumsparinga, men for nokre skjermar kan funksjonen vera "
 "lik det første nivået."
 
-#: energy.cpp:239
+#: energy.cpp:236
 msgid "&Power off after:"
 msgstr "S&lå av etter:"
 
-#: energy.cpp:245
+#: energy.cpp:242
 msgid ""
 "Choose the period of inactivity after which the display should be powered "
 "off. This is the greatest level of power saving that can be achieved while "
@@ -115,10 +115,10 @@ msgstr ""
 "nivået av straumsparing ein kan oppnå medan skjermen framleis fysisk er "
 "slått på."
 
-#: energy.cpp:256
+#: energy.cpp:253
 msgid "Configure KPowersave..."
 msgstr ""
 
-#: energy.cpp:262
+#: energy.cpp:259
 msgid "Configure TDEPowersave..."
 msgstr ""