Merge translation files from master branch.

1 files changed, 40 insertions, 23 deletions

diff --git a/po/fr.po b/po/fr.po
index cd3664c..106e3d0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\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: 2006-06-01 08:45\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
@@ -339,13 +339,13 @@ msgstr ""
 msgid "Logout Dialog"
 msgstr ""
 
-#: 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 "Mise en veille sur disque"
 
-#: 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 "Mise en veille sur RAM"
 
@@ -833,7 +833,8 @@ msgstr "Configurer les notifications..."
 msgid "Start YaST2 Power Management Module..."
 msgstr "Démarrer le module de gestion d'énergie de YaST2..."
 
-#: kpowersave.cpp:192 kpowersave.cpp:2389
+#: kpowersave.cpp:192 kpowersave.cpp:2215 kpowersave.cpp:2275
+#: kpowersave.cpp:2389
 msgid "Standby"
 msgstr "Attente"
 
@@ -923,7 +924,7 @@ msgstr ""
 msgid "Suspend to disk failed"
 msgstr "Mise en veille sur disque"
 
-#: kpowersave.cpp:711
+#: kpowersave.cpp:726
 msgid "Suspend to disk disabled by administrator."
 msgstr "Mise en veille sur disque désactivée par l'administrateur."
 
@@ -932,7 +933,7 @@ msgstr "Mise en veille sur disque désactivée par l'administrateur."
 msgid "Suspend to RAM failed"
 msgstr "Mise en veille sur RAM"
 
-#: kpowersave.cpp:767
+#: kpowersave.cpp:782
 msgid "Suspend to RAM disabled by administrator."
 msgstr "Mise en veille sur RAM désactivée par l'administrateur."
 
@@ -1113,20 +1114,6 @@ msgstr "La fonction d'économie d'énergie a été basculée sur le profil : %1"
 msgid "System is going into %1 now."
 msgstr "Le système passe maintenant en %1."
 
-#: kpowersave.cpp:2205 kpowersave.cpp:2265
-#, fuzzy
-msgid "hibernation"
-msgstr "Mise en veille sur disque"
-
-#: kpowersave.cpp:2210 kpowersave.cpp:2270
-msgid "sleep"
-msgstr ""
-
-#: kpowersave.cpp:2215 kpowersave.cpp:2275
-#, fuzzy
-msgid "standby"
-msgstr "Attente"
-
 #: kpowersave.cpp:2264 kpowersave.cpp:2269 kpowersave.cpp:2274
 #, c-format
 msgid "System is resumed from %1."
@@ -1425,7 +1412,8 @@ msgstr ""
 msgid "Suspend-to-disk Button:"
 msgstr "Mise en veille sur disque"
 
-#: configure_Dialog.cpp:902
+#: configure_Dialog.ui:1494
+#, no-c-format
 msgid "Sleep button:"
 msgstr ""
 
@@ -1561,6 +1549,35 @@ msgstr ""
 msgid "Save As ..."
 msgstr ""
 
+#~ msgid "Hibernate"
+#~ msgstr "Mise en veille sur disque"
+
+#~ msgid "Suspend"
+#~ msgstr "Mise en veille sur RAM"
+
+#, fuzzy
+#~ msgid "Hibernation failed"
+#~ msgstr "Mise en veille sur disque"
+
+#~ msgid "Hibernation disabled by administrator."
+#~ msgstr "Mise en veille sur disque désactivée par l'administrateur."
+
+#, fuzzy
+#~ msgid "Suspend mode failed"
+#~ msgstr "Mise en veille sur RAM"
+
+#, fuzzy
+#~ msgid "Suspend mode disabled by administrator."
+#~ msgstr "Mise en veille sur RAM désactivée par l'administrateur."
+
+#, fuzzy
+#~ msgid "hibernation"
+#~ msgstr "Mise en veille sur disque"
+
+#, fuzzy
+#~ msgid "standby"
+#~ msgstr "Attente"
+
 #, fuzzy
 #~ msgid "Cancel"
 #~ msgstr "&Annuler"