فهرست منبع

more error and translation updates

Malte Veerman 9 سال پیش
والد
کامیت
106e09bcec
7فایلهای تغییر یافته به همراه62 افزوده شده و 79 حذف شده
  1. 1 1
      import/src/fan.cpp
  2. 1 1
      import/src/loader.cpp
  3. 4 4
      import/src/pwmfan.cpp
  4. 2 2
      import/src/systemdcommunicator.cpp
  5. 5 5
      import/src/temp.cpp
  6. 36 33
      po/de/kcm_fancontrol.po
  7. 13 33
      po/kcm_fancontrol.pot

+ 1 - 1
import/src/fan.cpp

@@ -109,7 +109,7 @@ void Fan::reset()
             }
             else
             {
-                emit error(i18n("Can't open rpmFile: %1", rpmFile->fileName()));
+                emit error(i18n("Can't open rpm file: \"%1\"", rpmFile->fileName()));
                 delete rpmFile;
             }
         }

+ 1 - 1
import/src/loader.cpp

@@ -490,7 +490,7 @@ bool Loader::load(const QUrl &url)
     }
     else
     {
-        emit error(i18n("File does not exist: %1" ,fileName));
+        emit error(i18n("File does not exist: \"%1\"" ,fileName));
         return false;
     }
 

+ 4 - 4
import/src/pwmfan.cpp

@@ -88,7 +88,7 @@ PwmFan::PwmFan(uint index, Hwmon *parent) : Fan(index, parent),
             }
             else
             {
-                emit error(i18n("Can't open pwm file: %1", pwmFile->fileName()));
+                emit error(i18n("Can't open pwm file: \"%1\"", pwmFile->fileName()));
                 delete pwmFile;
             }
 
@@ -106,7 +106,7 @@ PwmFan::PwmFan(uint index, Hwmon *parent) : Fan(index, parent),
             }
             else
             {
-                emit error(i18n("Can't open pwm_mode file: %1", pwmModeFile->fileName()));
+                emit error(i18n("Can't open pwm_mode file: \"%1\"", pwmModeFile->fileName()));
                 delete pwmModeFile;
             }
         }
@@ -176,7 +176,7 @@ void PwmFan::reset()
         }
         else
         {
-            emit error(i18n("Can't open pwmFile: %1", pwmFile->fileName()));
+            emit error(i18n("Can't open pwm file: \"%1\"", pwmFile->fileName()));
             delete pwmFile;
         }
 
@@ -194,7 +194,7 @@ void PwmFan::reset()
         }
         else
         {
-            emit error(i18n("Can't open pwmModeFile: %1", pwmModeFile->fileName()));
+            emit error(i18n("Can't open pwm_mode file: \"%1\"", pwmModeFile->fileName()));
             delete pwmModeFile;
         }
     }

+ 2 - 2
import/src/systemdcommunicator.cpp

@@ -165,7 +165,7 @@ bool SystemdCommunicator::serviceExists()
             return true;
     }
 
-    emit error(i18n("Service does not exist: %1", m_serviceName));
+    emit error(i18n("Service does not exist: \"%1\"", m_serviceName));
     return false;
 }
 
@@ -308,7 +308,7 @@ bool SystemdCommunicator::restartService()
         return dbusAction(QStringLiteral("ReloadOrRestartUnit"), args);
     }
 
-    emit error(i18n("Service does not exist: %1", m_serviceName));
+    emit error(i18n("Service does not exist: \"%1\"", m_serviceName));
     return false;
 }
 

+ 5 - 5
import/src/temp.cpp

@@ -58,7 +58,7 @@ Temp::Temp(uint index, Hwmon *parent) :
         else
         {
             delete valueFile;
-            emit error(i18n("Can't open value file: %1", parent->path() + "/temp" + QString::number(index) + "_input"));
+            emit error(i18n("Can't open value file: \"%1\"", parent->path() + "/temp" + QString::number(index) + "_input"));
         }
 
         if (labelFile->exists())
@@ -66,10 +66,10 @@ Temp::Temp(uint index, Hwmon *parent) :
             if (labelFile->open(QFile::ReadOnly))
                 m_label = QTextStream(labelFile).readLine();
             else
-                emit error(i18n("Can't open label file: %1", parent->path() + "/temp" + QString::number(index) + "_label"));
+                emit error(i18n("Can't open label file: \"%1\"", parent->path() + "/temp" + QString::number(index) + "_label"));
         }
         else
-            emit error(i18n("Temp has no label: %1", parent->path() + "/temp" + QString::number(index)));
+            emit error(i18n("Temp has no label: \"%1\"", parent->path() + "/temp" + QString::number(index)));
 
         delete labelFile;
     }
@@ -130,7 +130,7 @@ void Temp::reset()
                 m_value /= 1000;
             }
             else
-                emit error(i18n("Can't open valueFile: %1", m_parent->path() + "/temp" + QString::number(m_index) + "_input"));
+                emit error(i18n("Can't open value file: \"%1\"", m_parent->path() + "/temp" + QString::number(m_index) + "_input"));
         }
     }
 }
@@ -143,7 +143,7 @@ void Temp::update()
     const auto value = m_valueStream->readAll().toInt(&success) / 1000;
 
     if (!success)
-        emit error(i18n("Can't update value of temp: %1", m_parent->path() + "/temp" + QString::number(m_index)));
+        emit error(i18n("Can't update value of temp: \"%1\"", m_parent->path() + "/temp" + QString::number(m_index)));
 
     if (value != m_value)
     {

+ 36 - 33
po/de/kcm_fancontrol.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fancontrol-gui\n"
 "Report-Msgid-Bugs-To: http://github.com/maldela/fancontrol-gui\n"
-"POT-Creation-Date: 2016-06-10 14:46+0200\n"
-"PO-Revision-Date: 2016-06-10 15:01+0100\n"
+"POT-Creation-Date: 2016-06-10 15:20+0200\n"
+"PO-Revision-Date: 2016-06-10 15:23+0100\n"
 "Last-Translator: Malte Veerman <maldela@halloarsch.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
 "Language: de_DE\n"
@@ -187,14 +187,10 @@ msgstr "Test abbrechen"
 msgid "Test start and stop values"
 msgstr "Start und Stopwerte testen"
 
-#: import/src/fan.cpp:55
+#: import/src/fan.cpp:55 import/src/fan.cpp:112
 msgid "Can't open rpm file: \"%1\""
 msgstr "Kann rpm Datei nicht öffnen: \"%1\""
 
-#: import/src/fan.cpp:112
-msgid "Can't open rpmFile: %1"
-msgstr ""
-
 #: import/src/hwmon.cpp:46
 msgid "%1 is not readable!"
 msgstr "%1 ist nicht lesbar!"
@@ -211,15 +207,15 @@ msgstr "Kein gültiger Sensor: \"%1\""
 msgid "File is not readable: \"%1\""
 msgstr "Datei ist nicht lesbar: \"%1\""
 
-#: import/src/loader.cpp:79
+#: import/src/loader.cpp:79 import/src/loader.cpp:493
 msgid "File does not exist: \"%1\""
 msgstr "Datei existiert nicht: \"%1\""
 
 #: import/src/loader.cpp:165 import/src/loader.cpp:173
 #: import/src/loader.cpp:178 import/src/loader.cpp:191
-#: import/src/loader.cpp:197 import/src/loader.cpp:425
-msgid "Invalid entry to parse: \"%1\""
-msgstr "Ungültiger Eintrag"
+#: import/src/loader.cpp:197 import/src/loader.cpp:291
+msgid "Invalid entry: \"%1\""
+msgstr "Ungültiger Eintrag: \"%1\""
 
 #: import/src/loader.cpp:256
 msgid "Unable to parse interval line: \"%1\""
@@ -233,10 +229,6 @@ msgstr "Ungültiger fan Eintrag: \"%1\""
 msgid "Invalid temp entry: \"%1\""
 msgstr "Ungültiger temp Eintrag: \"%1\""
 
-#: import/src/loader.cpp:291
-msgid "Invalid entry: \"%1\""
-msgstr "Ungültiger Eintrag: \"%1\""
-
 #: import/src/loader.cpp:317 import/src/loader.cpp:342
 msgid "Invalid DEVNAME: \"%1\"!"
 msgstr "Ungültiger DEVNAME: \"%1\""
@@ -257,6 +249,10 @@ msgstr "Unbekannte Zeile in Konfiguration: \"%1\""
 msgid "%1 is not an integer!"
 msgstr "%1 ist keine gültige ganze Zahl!"
 
+#: import/src/loader.cpp:425
+msgid "Invalid entry to parse: \"%1\""
+msgstr "Ungültiger Eintrag"
+
 #: import/src/loader.cpp:444 import/src/loader.cpp:521
 msgid "%1 is not a local file!"
 msgstr "%1 ist keine lokale Datei!"
@@ -271,21 +267,17 @@ msgstr "%1 ist keine gültige Url!"
 msgid "Action not supported! Try running the application as root."
 msgstr "Aktion nicht unterstützt! Starten sie die Anwendung als root."
 
-#: import/src/loader.cpp:493
-msgid "File does not exist: %1"
-msgstr "Datei existiert nicht: \"%1\""
-
 #: import/src/loader.cpp:715
 msgid "Interval must be greater or equal to one!"
 msgstr "Intervall muss größer oder gleich eins sein!"
 
 #: import/src/pwmfan.cpp:91 import/src/pwmfan.cpp:179
-msgid "Can't open pwmFile: %1"
-msgstr ""
+msgid "Can't open pwm file: \"%1\""
+msgstr "Kann pwm Datei nicht öffnen: \"%1\""
 
 #: import/src/pwmfan.cpp:109 import/src/pwmfan.cpp:197
-msgid "Can't open pwmModeFile: %1"
-msgstr ""
+msgid "Can't open pwm_mode file: \"%1\""
+msgstr "Kann pwm_mode Datei nicht öffnen: \"%1\""
 
 #: import/src/pwmfan.cpp:212
 msgid "Pwm cannot exceed 0-255!"
@@ -317,28 +309,28 @@ msgstr "Authorisationsfehler: %1"
 
 #: import/src/systemdcommunicator.cpp:168
 #: import/src/systemdcommunicator.cpp:311
-msgid "Service does not exist: %1"
-msgstr "Service existiert nicht: %1"
+msgid "Service does not exist: \"%1\""
+msgstr "Service existiert nicht: \"%1\""
 
 #: import/src/systemdcommunicator.cpp:247
 msgid "Invalid manager interface!"
 msgstr "Ungültiges Managerinterface!"
 
 #: import/src/temp.cpp:61 import/src/temp.cpp:133
-msgid "Can't open valueFile: %1"
-msgstr ""
+msgid "Can't open value file: \"%1\""
+msgstr "Kann value Datei nicht öffnen: \"%1\""
 
 #: import/src/temp.cpp:69
-msgid "Can't open labelFile: %1"
-msgstr ""
+msgid "Can't open label file: \"%1\""
+msgstr "Kann label Datei nicht öffnen: \"%1\""
 
 #: import/src/temp.cpp:72
-msgid "Temp has no label: %1"
-msgstr "Temp hat kein Label: %1"
+msgid "Temp has no label: \"%1\""
+msgstr "Temp hat kein Label: \"%1\""
 
 #: import/src/temp.cpp:146
-msgid "Can't update value of temp: %1"
-msgstr "Kann Wert von Temp nicht aktualisieren: %1"
+msgid "Can't update value of temp: \"%1\""
+msgstr "Kann Wert von Temp nicht aktualisieren: \"%1\""
 
 #: kcm/package/contents/ui/KCM.qml:101
 msgid "Control fans manually"
@@ -370,6 +362,17 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "maldela@halloarsch.de"
 
+#, fuzzy
+#~ msgid "Can't open rpm file: %1"
+#~ msgstr "Kann rpm Datei nicht öffnen: \"%1\""
+
+#~ msgid "File does not exist: %1"
+#~ msgstr "Datei existiert nicht: \"%1\""
+
+#, fuzzy
+#~ msgid "Can't open pwm file: %1"
+#~ msgstr "Kann rpm Datei nicht öffnen: \"%1\""
+
 #~ msgid "%1 does not exist!"
 #~ msgstr "%1 existiert nicht!"
 

+ 13 - 33
po/kcm_fancontrol.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://github.com/maldela/fancontrol-gui\n"
-"POT-Creation-Date: 2016-06-10 14:56+0200\n"
+"POT-Creation-Date: 2016-06-10 15:20+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -188,14 +188,10 @@ msgstr ""
 msgid "Test start and stop values"
 msgstr ""
 
-#: import/src/fan.cpp:55
+#: import/src/fan.cpp:55 import/src/fan.cpp:112
 msgid "Can't open rpm file: \"%1\""
 msgstr ""
 
-#: import/src/fan.cpp:112
-msgid "Can't open rpmFile: %1"
-msgstr ""
-
 #: import/src/hwmon.cpp:46
 msgid "%1 is not readable!"
 msgstr ""
@@ -212,7 +208,7 @@ msgstr ""
 msgid "File is not readable: \"%1\""
 msgstr ""
 
-#: import/src/loader.cpp:79
+#: import/src/loader.cpp:79 import/src/loader.cpp:493
 msgid "File does not exist: \"%1\""
 msgstr ""
 
@@ -272,28 +268,16 @@ msgstr ""
 msgid "Action not supported! Try running the application as root."
 msgstr ""
 
-#: import/src/loader.cpp:493
-msgid "File does not exist: %1"
-msgstr ""
-
 #: import/src/loader.cpp:715
 msgid "Interval must be greater or equal to one!"
 msgstr ""
 
-#: import/src/pwmfan.cpp:91
-msgid "Can't open pwm file: %1"
-msgstr ""
-
-#: import/src/pwmfan.cpp:109
-msgid "Can't open pwm_mode file: %1"
-msgstr ""
-
-#: import/src/pwmfan.cpp:179
-msgid "Can't open pwmFile: %1"
+#: import/src/pwmfan.cpp:91 import/src/pwmfan.cpp:179
+msgid "Can't open pwm file: \"%1\""
 msgstr ""
 
-#: import/src/pwmfan.cpp:197
-msgid "Can't open pwmModeFile: %1"
+#: import/src/pwmfan.cpp:109 import/src/pwmfan.cpp:197
+msgid "Can't open pwm_mode file: \"%1\""
 msgstr ""
 
 #: import/src/pwmfan.cpp:212
@@ -326,31 +310,27 @@ msgstr ""
 
 #: import/src/systemdcommunicator.cpp:168
 #: import/src/systemdcommunicator.cpp:311
-msgid "Service does not exist: %1"
+msgid "Service does not exist: \"%1\""
 msgstr ""
 
 #: import/src/systemdcommunicator.cpp:247
 msgid "Invalid manager interface!"
 msgstr ""
 
-#: import/src/temp.cpp:61
-msgid "Can't open value file: %1"
+#: import/src/temp.cpp:61 import/src/temp.cpp:133
+msgid "Can't open value file: \"%1\""
 msgstr ""
 
 #: import/src/temp.cpp:69
-msgid "Can't open label file: %1"
+msgid "Can't open label file: \"%1\""
 msgstr ""
 
 #: import/src/temp.cpp:72
-msgid "Temp has no label: %1"
-msgstr ""
-
-#: import/src/temp.cpp:133
-msgid "Can't open valueFile: %1"
+msgid "Temp has no label: \"%1\""
 msgstr ""
 
 #: import/src/temp.cpp:146
-msgid "Can't update value of temp: %1"
+msgid "Can't update value of temp: \"%1\""
 msgstr ""
 
 #: kcm/package/contents/ui/KCM.qml:101