Merge translation files from master branch.

1 files changed, 44 insertions, 25 deletions

diff --git a/po/sl_SI.po b/po/sl_SI.po
index c6e5de4..362bca0 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sl_SI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-13 19:15+0100\n"
+"POT-Creation-Date: 2019-01-23 23:44+0100\n"
 "PO-Revision-Date: 2007-09-17 17:18+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -327,13 +327,13 @@ msgstr "Ugasni"
 msgid "Logout Dialog"
 msgstr "Pogovorno okno za odjavo"
 
-#: configuredialog.cpp:1784 configuredialog.cpp:1822 kpowersave.cpp:182
-#: kpowersave.cpp:2096 kpowersave.cpp:2156 kpowersave.cpp:2247
+#: configuredialog.cpp:1784 configuredialog.cpp:1822 kpowersave.cpp:185
+#: kpowersave.cpp:2205 kpowersave.cpp:2265 kpowersave.cpp:2383
 msgid "Suspend to Disk"
 msgstr "Zaustavitev s shranjevanjem na disk"
 
-#: configuredialog.cpp:1787 configuredialog.cpp:1825 kpowersave.cpp:186
-#: kpowersave.cpp:2101 kpowersave.cpp:2161 kpowersave.cpp:2250
+#: configuredialog.cpp:1787 configuredialog.cpp:1825 kpowersave.cpp:189
+#: kpowersave.cpp:2210 kpowersave.cpp:2270 kpowersave.cpp:2386
 msgid "Suspend to RAM"
 msgstr "Zaustavitev s shranjevanjem v spomin"
 
@@ -807,7 +807,8 @@ msgstr "Nastavi obvestila ..."
 msgid "Start YaST2 Power Management Module..."
 msgstr "Zaženi YaST2 modul za upravljanje z energijo..."
 
-#: kpowersave.cpp:192 kpowersave.cpp:2389
+#: kpowersave.cpp:192 kpowersave.cpp:2215 kpowersave.cpp:2275
+#: kpowersave.cpp:2389
 msgid "Standby"
 msgstr "Stanje pripravljenosti"
 
@@ -897,19 +898,19 @@ msgstr ""
 "YaST2 modula za upravljanje z energijo ni možno zagnati. Preverite, če je "
 "modul nameščen?"
 
-#: kpowersave.cpp:703
+#: kpowersave.cpp:718
 msgid "Suspend to disk failed"
 msgstr "Zaustavitev s shranjevanjem na disk ni uspela"
 
-#: kpowersave.cpp:711
+#: kpowersave.cpp:726
 msgid "Suspend to disk disabled by administrator."
 msgstr "Administrator je onemogočil zaustavitev s shranjevanjem na disk"
 
-#: kpowersave.cpp:759
+#: kpowersave.cpp:774
 msgid "Suspend to RAM failed"
 msgstr "Zaustavitev s shranjevanjem v spomin je spodletela"
 
-#: kpowersave.cpp:767
+#: kpowersave.cpp:782
 msgid "Suspend to RAM disabled by administrator."
 msgstr "Administrator je onemogočil zaustavitev s shranjevanjem v spomin."
 
@@ -1086,20 +1087,6 @@ msgstr "Preklopljeno v shemo: %1"
 msgid "System is going into %1 now."
 msgstr "Sistem sedaj prehaja v %1."
 
-#: kpowersave.cpp:2205 kpowersave.cpp:2265
-#, fuzzy
-msgid "hibernation"
-msgstr "Zaustavitev s shranjevanjem na disk"
-
-#: kpowersave.cpp:2210 kpowersave.cpp:2270
-msgid "sleep"
-msgstr ""
-
-#: kpowersave.cpp:2215 kpowersave.cpp:2275
-#, fuzzy
-msgid "standby"
-msgstr "Stanje pripravljenosti"
-
 #: kpowersave.cpp:2264 kpowersave.cpp:2269 kpowersave.cpp:2274
 #, c-format
 msgid "System is resumed from %1."
@@ -1398,7 +1385,8 @@ msgstr "Določite dejanje, ki naj se sproži ob pritisku na določen gumb:"
 msgid "Suspend-to-disk Button:"
 msgstr "Gumb za zaustavitev:"
 
-#: configure_Dialog.cpp:902
+#: configure_Dialog.ui:1494
+#, no-c-format
 msgid "Sleep button:"
 msgstr "Gumb za pripravljenost:"
 
@@ -1537,6 +1525,37 @@ msgstr "Obrazec1"
 msgid "Save As ..."
 msgstr "Shrani kot ..."
 
+#~ msgid "Hibernate"
+#~ msgstr "Zaustavitev s shranjevanjem na disk"
+
+#~ msgid "Suspend"
+#~ msgstr "Zaustavitev s shranjevanjem v spomin"
+
+#~ msgid "Hibernation failed"
+#~ msgstr "Zaustavitev s shranjevanjem na disk ni uspela"
+
+#~ msgid "Hibernation disabled by administrator."
+#~ msgstr "Administrator je onemogočil zaustavitev s shranjevanjem na disk"
+
+#, fuzzy
+#~ msgid "Suspend mode failed"
+#~ msgstr "Zaustavitev s shranjevanjem v spomin je spodletela"
+
+#, fuzzy
+#~ msgid "Suspend mode disabled by administrator."
+#~ msgstr "Administrator je onemogočil zaustavitev s shranjevanjem v spomin."
+
+#, fuzzy
+#~ msgid "hibernation"
+#~ msgstr "Zaustavitev s shranjevanjem na disk"
+
+#, fuzzy
+#~ msgid "standby"
+#~ msgstr "Stanje pripravljenosti"
+
+#~ msgid "Suspend button:"
+#~ msgstr "Gumb za pripravljenost:"
+
 #~ msgid "Delete"
 #~ msgstr "Izbriši"