Added missing Finnish translations for several error messages.

diff --git a/src/common/translations/fi_FI.qm b/src/common/translations/fi_FI.qm
index cd6dc7b..e48e59f 100644 (file)
Binary files a/src/common/translations/fi_FI.qm and b/src/common/translations/fi_FI.qm differ

diff --git a/src/common/translations/fi_FI.ts b/src/common/translations/fi_FI.ts
index b7d12f5..7c7f6ae 100644 (file)
--- a/src/common/translations/fi_FI.ts
+++ b/src/common/translations/fi_FI.ts
@@ -79,29 +79,29 @@
         <translation>Lisää</translation>
     </message>
     <message>
         <translation>Lisää</translation>
     </message>
     <message>

-        <location filename="../../gui/detailwindow.cpp" line="154"/>
+        <location filename="../../gui/detailwindow.cpp" line="156"/>

         <source>Contact was successfully added to contacts.</source>
         <translation>Yhteystieto lisättiin onnistuneesti.</translation>
     </message>
     <message>
         <source>Contact was successfully added to contacts.</source>
         <translation>Yhteystieto lisättiin onnistuneesti.</translation>
     </message>
     <message>

-        <location filename="../../gui/detailwindow.cpp" line="190"/>
+        <location filename="../../gui/detailwindow.cpp" line="194"/>

         <source>Unable to open SMS application</source>
         <translation>SMS-sovelluksen käynnistäminen epäonnistui</translation>
     </message>
     <message>
         <location filename="../../gui/detailwindow.cpp" line="109"/>
         <source>Unable to open SMS application</source>
         <translation>SMS-sovelluksen käynnistäminen epäonnistui</translation>
     </message>
     <message>
         <location filename="../../gui/detailwindow.cpp" line="109"/>

-        <location filename="../../gui/detailwindow.cpp" line="158"/>
-        <location filename="../../gui/detailwindow.cpp" line="190"/>
+        <location filename="../../gui/detailwindow.cpp" line="160"/>
+        <location filename="../../gui/detailwindow.cpp" line="194"/>

         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>

-        <location filename="../../gui/detailwindow.cpp" line="158"/>
+        <location filename="../../gui/detailwindow.cpp" line="160"/>

         <source>Unable to add contact.</source>
         <translation>Yhteystiedon lisääminen epäonnistui,</translation>
     </message>
     <message>
         <source>Unable to add contact.</source>
         <translation>Yhteystiedon lisääminen epäonnistui,</translation>
     </message>
     <message>

-        <location filename="../../gui/detailwindow.cpp" line="166"/>
+        <location filename="../../gui/detailwindow.cpp" line="170"/>

         <source>Number was successfully copied to clipboard.</source>
         <translation>Numero kopioitiin onnistuneesti leikepöydälle.</translation>
     </message>
         <source>Number was successfully copied to clipboard.</source>
         <translation>Numero kopioitiin onnistuneesti leikepöydälle.</translation>
     </message>

@@ -197,17 +197,32 @@
         <translation>Hakutulokset</translation>
     </message>
     <message>
         <translation>Hakutulokset</translation>
     </message>
     <message>

-        <location filename="../../gui/resultwindow.cpp" line="151"/>
-        <source>Unknown error</source>
-        <translation>Tuntematon virhe</translation>
+        <location filename="../../gui/resultwindow.cpp" line="166"/>
+        <source>Connection to server failed</source>
+        <translation>Palvelimelle yhdistäminen epäonnistui</translation>

     </message>
     <message>
     </message>
     <message>

-        <location filename="../../gui/resultwindow.cpp" line="154"/>
+        <location filename="../../gui/resultwindow.cpp" line="169"/>
+        <source>Invalid login details</source>
+        <translation>Virheellinen tunnus tai salasana</translation>
+    </message>
+    <message>
+        <location filename="../../gui/resultwindow.cpp" line="172"/>
+        <source>Request timed out</source>
+        <translation>Pyyntö aikakatkaistiin</translation>
+    </message>
+    <message>
+        <location filename="../../gui/resultwindow.cpp" line="175"/>
+        <source>Searching failed:</source>
+        <translation>Haku epäonnistui:</translation>
+    </message>
+    <message>
+        <location filename="../../gui/resultwindow.cpp" line="179"/>

         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>

-        <location filename="../../gui/resultwindow.cpp" line="159"/>
+        <location filename="../../gui/resultwindow.cpp" line="184"/>

         <source>No results found</source>
         <translation>Ei hakutuloksia</translation>
     </message>
         <source>No results found</source>
         <translation>Ei hakutuloksia</translation>
     </message>

@@ -218,7 +233,7 @@
         <location filename="../../gui/searchdialog.cpp" line="30"/>
         <location filename="../../gui/searchdialog.cpp" line="55"/>
         <source>Search</source>
         <location filename="../../gui/searchdialog.cpp" line="30"/>
         <location filename="../../gui/searchdialog.cpp" line="55"/>
         <source>Search</source>

-        <translation>Haku</translation>
+        <translation>Hae</translation>

     </message>
     <message>
         <location filename="../../gui/searchdialog.cpp" line="33"/>
     </message>
     <message>
         <location filename="../../gui/searchdialog.cpp" line="33"/>

@@ -272,62 +287,62 @@
         <translation>Eniro-salasana</translation>
     </message>
     <message>
         <translation>Eniro-salasana</translation>
     </message>
     <message>

-        <location filename="../../gui/settingsdialog.cpp" line="56"/>
+        <location filename="../../gui/settingsdialog.cpp" line="57"/>

         <source>Cache size (numbers)</source>
         <translation>Välimuistin koko (numeroa)</translation>
     </message>
     <message>
         <source>Cache size (numbers)</source>
         <translation>Välimuistin koko (numeroa)</translation>
     </message>
     <message>

-        <location filename="../../gui/settingsdialog.cpp" line="59"/>
+        <location filename="../../gui/settingsdialog.cpp" line="60"/>

         <source>Clear</source>
         <translation>Tyhjennä</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Tyhjennä</translation>
     </message>
     <message>

-        <location filename="../../gui/settingsdialog.cpp" line="62"/>
+        <location filename="../../gui/settingsdialog.cpp" line="63"/>

         <source>Eniro site</source>
         <translation>Eniro-sivusto</translation>
     </message>
     <message>
         <source>Eniro site</source>
         <translation>Eniro-sivusto</translation>
     </message>
     <message>

-        <location filename="../../gui/settingsdialog.cpp" line="79"/>
+        <location filename="../../gui/settingsdialog.cpp" line="80"/>

         <source>Finnish</source>
         <translation>Suomi</translation>
     </message>
     <message>
         <source>Finnish</source>
         <translation>Suomi</translation>
     </message>
     <message>

-        <location filename="../../gui/settingsdialog.cpp" line="82"/>
+        <location filename="../../gui/settingsdialog.cpp" line="83"/>

         <source>Swedish</source>
         <translation>Ruotsi</translation>
     </message>
     <message>
         <source>Swedish</source>
         <translation>Ruotsi</translation>
     </message>
     <message>

-        <location filename="../../gui/settingsdialog.cpp" line="85"/>
+        <location filename="../../gui/settingsdialog.cpp" line="86"/>

         <source>Danish</source>
         <translation>Tanska</translation>
     </message>
     <message>
         <source>Danish</source>
         <translation>Tanska</translation>
     </message>
     <message>

-        <location filename="../../gui/settingsdialog.cpp" line="102"/>
+        <location filename="../../gui/settingsdialog.cpp" line="103"/>

         <source>Autostart</source>
         <translation>Käynnistä automaattisesti</translation>
     </message>
     <message>
         <source>Autostart</source>
         <translation>Käynnistä automaattisesti</translation>
     </message>
     <message>

-        <location filename="../../gui/settingsdialog.cpp" line="104"/>
+        <location filename="../../gui/settingsdialog.cpp" line="105"/>

         <source>Enabled</source>
         <translation>Kyllä</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Kyllä</translation>
     </message>
     <message>

-        <location filename="../../gui/settingsdialog.cpp" line="105"/>
+        <location filename="../../gui/settingsdialog.cpp" line="106"/>

         <source>Disabled</source>
         <translation>Ei</translation>
     </message>
     <message>
         <source>Disabled</source>
         <translation>Ei</translation>
     </message>
     <message>

-        <location filename="../../gui/settingsdialog.cpp" line="108"/>
+        <location filename="../../gui/settingsdialog.cpp" line="109"/>

         <source>Save</source>
         <translation>Tallenna</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Tallenna</translation>
     </message>
     <message>

-        <location filename="../../gui/settingsdialog.cpp" line="154"/>
+        <location filename="../../gui/settingsdialog.cpp" line="155"/>

         <source>Restarting daemon...</source>
         <translation>Käynnistetään palvelu uudelleen...</translation>
     </message>
     <message numerus="yes">
         <source>Restarting daemon...</source>
         <translation>Käynnistetään palvelu uudelleen...</translation>
     </message>
     <message numerus="yes">

-        <location filename="../../gui/settingsdialog.cpp" line="178"/>
+        <location filename="../../gui/settingsdialog.cpp" line="179"/>

         <source>%n number(s) were deleted from cache</source>
         <translation>
             <numerusform>Poistettiin %n numero välimuistista</numerusform>
         <source>%n number(s) were deleted from cache</source>
         <translation>
             <numerusform>Poistettiin %n numero välimuistista</numerusform>

diff --git a/src/gui/resultwindow.cpp b/src/gui/resultwindow.cpp
index 605ecb1..b0336de 100644 (file)
--- a/src/gui/resultwindow.cpp
+++ b/src/gui/resultwindow.cpp
@@ -157,11 +157,23 @@ void ResultWindow::requestFinished(QVector <Eniro::Result> const& results,
 
     if(error)
     {
 
     if(error)
     {

-        QString errorString = eniro_->errorString();
+        QString errorString;
+        Eniro::Error error = eniro_->error();

 
 

-        if(errorString.isEmpty())
+        switch(error)

         {
         {

-            errorString = tr("Unknown error");
+        case Eniro::CONNECTION_FAILURE:
+            errorString = tr("Connection to server failed");
+            break;
+        case Eniro::INVALID_LOGIN:
+            errorString = tr("Invalid login details");
+            break;
+        case Eniro::TIMEOUT:
+            errorString = tr("Request timed out");
+            break;
+        default:
+            errorString = tr("Searching failed:") + " " + eniro_->errorString();
+            break;

         }
 
         QMessageBox::critical(this, tr("Error"), errorString);
         }
 
         QMessageBox::critical(this, tr("Error"), errorString);