Added Norwegian translation, updated web page and updated changelog to newest version.

diff --git a/debian/changelog b/debian/changelog
index 029e8bb..83a57b8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jenirok (0.2-2) unstable; urgency=low
+
+  * Changed background daemon to search both people and companies instead of people only.
+  * Norwegian translation added.
+
+ -- Jesse Hakanen <jessehakanen@gmail.com>  Thu, 17 Jun 2010 19:49:24 +0100
+
 jenirok (0.2-1) unstable; urgency=low
 
   * Architecture changed to allow easier addition of new phonebook sources.

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 89c10cd..7c25219 100644 (file)
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -27,15 +27,17 @@
 
 namespace
 {
-    static int const LANGUAGE_COUNT = 2;
+    static int const LANGUAGE_COUNT = 3;
 
     static QString const LANGUAGE_NAMES[LANGUAGE_COUNT] = {
        "English",
+       "Norsk",
        "Suomi"
     };
 
     static QString const LANGUAGE_IDS[LANGUAGE_COUNT] = {
        "en_US",
+       "nb_NO",
        "fi_FI"
     };
 }

diff --git a/src/common/translations.grc b/src/common/translations.grc
index 7dd5380..bb212ae 100644 (file)
--- a/src/common/translations.grc
+++ b/src/common/translations.grc
@@ -1,5 +1,6 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
    <file>translations/fi_FI.qm</file>
+   <file>translations/nb_NO.qm</file>
 </qresource>
 </RCC>

diff --git a/src/common/translations/nb_NO.qm b/src/common/translations/nb_NO.qm
new file mode 100644 (file)
index 0000000..c5e9ee4
Binary files /dev/null and b/src/common/translations/nb_NO.qm differ

diff --git a/src/common/translations/nb_NO.ts b/src/common/translations/nb_NO.ts
new file mode 100644 (file)
index 0000000..d1054e0
--- /dev/null
+++ b/src/common/translations/nb_NO.ts
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="nb_NO">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../../gui/aboutdialog.cpp" line="27"/>
+        <source>About</source>
+        <translation>Om</translation>
+    </message>
+</context>
+<context>
+    <name>CallListener</name>
+    <message>
+        <source>Searching...</source>
+        <translation>Søker...</translation>
+    </message>
+    <message>
+        <source>Request timed out</source>
+        <translation>Tilkobling mislyktes</translation>
+    </message>
+    <message>
+        <source>Searching failed:</source>
+        <translation>Søk feilet:</translation>
+    </message>
+    <message>
+        <source>Phone number was not found</source>
+        <translation>Nummeret ble ikke funnet</translation>
+    </message>
+    <message>
+        <source>Automatic connecting is not allowed by settings.</source>
+        <translation>Automatisk oppkobling ikke tillatt, sjekk innstillinger.</translation>
+    </message>
+    <message>
+        <source>Connecting...</source>
+        <translation>Kobler til...</translation>
+    </message>
+    <message>
+        <source>No available 3G or WLAN networks found.</source>
+        <translation>Ingen tilgjengelige nettverk.</translation>
+    </message>
+    <message>
+        <source>Selected access point doesn&apos;t exist.</source>
+        <translation>Valgte tilgangspunkt finnes ikke.</translation>
+    </message>
+    <message>
+        <source>Unable to connect to network.</source>
+        <translation>Kan ikke koble til nettverket.</translation>
+    </message>
+</context>
+<context>
+    <name>ConnectionSelector</name>
+    <message>
+        <location filename="../../gui/connectionselector.cpp" line="69"/>
+        <source>Use global setting</source>
+        <translation>Bruk globale innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../../gui/connectionselector.cpp" line="70"/>
+        <source>WLAN connection</source>
+        <translation>WLAN tilkobling</translation>
+    </message>
+    <message>
+        <location filename="../../gui/connectionselector.cpp" line="71"/>
+        <source>GPRS connection</source>
+        <translation>GPRS tilkobling</translation>
+    </message>
+    <message>
+        <location filename="../../gui/connectionselector.cpp" line="72"/>
+        <source>Any connection</source>
+        <translation>Vilkårlig tilkobling</translation>
+    </message>
+</context>
+<context>
+    <name>DetailWindow</name>
+    <message>
+        <location filename="../../gui/detailwindow.cpp" line="42"/>
+        <location filename="../../gui/detailwindow.cpp" line="119"/>
+        <source>Add to contacts</source>
+        <translation>Legg til kontakter</translation>
+    </message>
+    <message>
+        <location filename="../../gui/detailwindow.cpp" line="43"/>
+        <source>Copy number to clipboard</source>
+        <translation>Kopier nummer til utklippstavle</translation>
+    </message>
+    <message>
+        <location filename="../../gui/detailwindow.cpp" line="44"/>
+        <source>Call</source>
+        <translation>Ring</translation>
+    </message>
+    <message>
+        <location filename="../../gui/detailwindow.cpp" line="45"/>
+        <source>Send SMS</source>
+        <translation>Send SMS</translation>
+    </message>
+    <message>
+        <location filename="../../gui/detailwindow.cpp" line="53"/>
+        <location filename="../../gui/detailwindow.cpp" line="122"/>
+        <source>Name</source>
+        <translation>Navn</translation>
+    </message>
+    <message>
+        <location filename="../../gui/detailwindow.cpp" line="54"/>
+        <source>Street</source>
+        <translation>Gate</translation>
+    </message>
+    <message>
+        <location filename="../../gui/detailwindow.cpp" line="55"/>
+        <source>City</source>
+        <translation>By</translation>
+    </message>
+    <message>
+        <location filename="../../gui/detailwindow.cpp" line="57"/>
+        <source>Phone number</source>
+        <translation>Telefonnummer</translation>
+    </message>
+    <message>
+        <location filename="../../gui/detailwindow.cpp" line="109"/>
+        <source>Unable make call</source>
+        <translation>Kan ikke foreta anrop</translation>
+    </message>
+    <message>
+        <location filename="../../gui/detailwindow.cpp" line="123"/>
+        <source>Add</source>
+        <translation>Legg til</translation>
+    </message>
+    <message>
+        <location filename="../../gui/detailwindow.cpp" line="156"/>
+        <source>Contact was successfully added to contacts.</source>
+        <translation>Kontakten ble lagt til i kontaktlisten.</translation>
+    </message>
+    <message>
+        <location filename="../../gui/detailwindow.cpp" line="194"/>
+        <source>Unable to open SMS application</source>
+        <translation>Kan ikke åpne SMS applikasjon</translation>
+    </message>
+    <message>
+        <location filename="../../gui/detailwindow.cpp" line="109"/>
+        <location filename="../../gui/detailwindow.cpp" line="160"/>
+        <location filename="../../gui/detailwindow.cpp" line="194"/>
+        <source>Error</source>
+        <translation>Feil</translation>
+    </message>
+    <message>
+        <location filename="../../gui/detailwindow.cpp" line="160"/>
+        <source>Unable to add contact.</source>
+        <translation>Kan ikke legge til kontakt.</translation>
+    </message>
+    <message>
+        <location filename="../../gui/detailwindow.cpp" line="170"/>
+        <source>Number was successfully copied to clipboard.</source>
+        <translation>Nummeret ble kopiert til utklippstavlen.</translation>
+    </message>
+</context>
+<context>
+    <name>EmptyGuiConfig</name>
+    <message>
+        <location filename="../../gui/emptyguiconfig.cpp" line="27"/>
+        <source>Selected phonebook has no settings to configure.</source>
+        <translation>Den valgte telefonlisten har ingen innstillinger.</translation>
+    </message>
+</context>
+<context>
+    <name>EniroGuiConfig</name>
+    <message>
+        <location filename="../../gui/eniroguiconfig.cpp" line="36"/>
+        <source>Eniro username</source>
+        <translation>Eniro username</translation>
+    </message>
+    <message>
+        <location filename="../../gui/eniroguiconfig.cpp" line="39"/>
+        <source>Eniro password</source>
+        <translation>Eniro password</translation>
+    </message>
+    <message>
+        <location filename="../../gui/eniroguiconfig.cpp" line="45"/>
+        <source>Eniro site</source>
+        <translation>Eniro site</translation>
+    </message>
+    <message>
+        <location filename="../../gui/eniroguiconfig.cpp" line="57"/>
+        <source>Finnish</source>
+        <translation>Finnish</translation>
+    </message>
+    <message>
+        <location filename="../../gui/eniroguiconfig.cpp" line="60"/>
+        <source>Swedish</source>
+        <translation>Swedish</translation>
+    </message>
+    <message>
+        <location filename="../../gui/eniroguiconfig.cpp" line="63"/>
+        <source>Danish</source>
+        <translation>Danish</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="48"/>
+        <source>Jenirok</source>
+        <translation>Jenirok</translation>
+    </message>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="54"/>
+        <location filename="../../gui/mainwindow.cpp" line="151"/>
+        <source>Stop daemon</source>
+        <translation>Stopp daemon</translation>
+    </message>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="60"/>
+        <location filename="../../gui/mainwindow.cpp" line="117"/>
+        <source>Start daemon</source>
+        <translation>Start daemon</translation>
+    </message>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="65"/>
+        <source>Search</source>
+        <translation>Søk</translation>
+    </message>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="82"/>
+        <source>Settings</source>
+        <translation>Innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="83"/>
+        <source>About</source>
+        <translation>Om</translation>
+    </message>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="115"/>
+        <source>Daemon was successfully stopped.</source>
+        <translation>Daemon ble stoppet.</translation>
+    </message>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="116"/>
+        <source>Unable to stop daemon.</source>
+        <translation>Kan ikke stoppe daemon.</translation>
+    </message>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="127"/>
+        <source>Unable to start daemon</source>
+        <translation>Kan ikke starte daemon.</translation>
+    </message>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="129"/>
+        <source>Daemon cannot be started because it&apos;s not allowed to connect to the Internet. You have to either allow automatic Internet connection in Jenirok settings or in global Maemo settings.</source>
+        <translation>Daemon får ikke tilgang til internett. Du må enten tillate automatisk tilkobling til internett i Jenirok eller i globale Maemo innstillinger.</translation>
+    </message>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="133"/>
+        <source>Open settings</source>
+        <translation>Åpne innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="135"/>
+        <source>Close</source>
+        <translation>Lukk</translation>
+    </message>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="149"/>
+        <source>Daemon was successfully started.</source>
+        <translation>Daemon ble startet.</translation>
+    </message>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="150"/>
+        <source>Unable to start daemon.</source>
+        <translation>Kan ikke starte daemon.</translation>
+    </message>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="157"/>
+        <source>Error</source>
+        <translation>Feil</translation>
+    </message>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="181"/>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <location filename="../../gui/mainwindow.cpp" line="181"/>
+        <source>You need to set login details or other options in settings before using this feature.</source>
+        <translation>Du må fylle inn påloggingsinformasjon for å bruke denne tjenesten.</translation>
+    </message>
+</context>
+<context>
+    <name>ResultWindow</name>
+    <message>
+        <location filename="../../gui/resultwindow.cpp" line="36"/>
+        <source>Search results</source>
+        <translation>Søke resultater</translation>
+    </message>
+    <message>
+        <location filename="../../gui/resultwindow.cpp" line="163"/>
+        <source>Connection to server failed</source>
+        <translation>Tilkobling til server feilet</translation>
+    </message>
+    <message>
+        <location filename="../../gui/resultwindow.cpp" line="166"/>
+        <source>Invalid login details</source>
+        <translation>Feil påloggingsinformasjon</translation>
+    </message>
+    <message>
+        <location filename="../../gui/resultwindow.cpp" line="169"/>
+        <source>Request timed out</source>
+        <translation>Tilkobling feilet</translation>
+    </message>
+    <message>
+        <location filename="../../gui/resultwindow.cpp" line="172"/>
+        <source>Searching failed:</source>
+        <translation>Søk feilet:</translation>
+    </message>
+    <message>
+        <location filename="../../gui/resultwindow.cpp" line="176"/>
+        <source>Error</source>
+        <translation>Feil</translation>
+    </message>
+    <message>
+        <location filename="../../gui/resultwindow.cpp" line="181"/>
+        <source>No results found</source>
+        <translation>Ingen resultater funnet</translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <location filename="../../gui/searchdialog.cpp" line="30"/>
+        <location filename="../../gui/searchdialog.cpp" line="55"/>
+        <source>Search</source>
+        <translation>Søk</translation>
+    </message>
+    <message>
+        <location filename="../../gui/searchdialog.cpp" line="33"/>
+        <source>Name/number</source>
+        <translation>Navn/nummer</translation>
+    </message>
+    <message>
+        <location filename="../../gui/searchdialog.cpp" line="39"/>
+        <source>Location</source>
+        <translation>Sted</translation>
+    </message>
+    <message>
+        <location filename="../../gui/searchdialog.cpp" line="44"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="../../gui/searchdialog.cpp" line="45"/>
+        <source>Persons</source>
+        <translation>Personer</translation>
+    </message>
+    <message>
+        <location filename="../../gui/searchdialog.cpp" line="46"/>
+        <source>Companies</source>
+        <translation>Firmaer</translation>
+    </message>
+</context>
+<context>
+    <name>Settings</name>
+    <message>
+        <location filename="../settings.cpp" line="168"/>
+        <source>fi</source>
+        <translation>fi</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../../gui/settingsdialog.cpp" line="44"/>
+        <source>Settings</source>
+        <translation>Innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../../gui/settingsdialog.cpp" line="58"/>
+        <source>Cache size (numbers)</source>
+        <translation>Cache størrelse</translation>
+    </message>
+    <message>
+        <location filename="../../gui/settingsdialog.cpp" line="61"/>
+        <source>Clear</source>
+        <translation>Tilbakestill</translation>
+    </message>
+    <message>
+        <location filename="../../gui/settingsdialog.cpp" line="64"/>
+        <source>Language</source>
+        <translation>Språk</translation>
+    </message>
+    <message>
+        <location filename="../../gui/settingsdialog.cpp" line="65"/>
+        <source>Automatic</source>
+        <translation>Automatisk</translation>
+    </message>
+    <message>
+        <location filename="../../gui/settingsdialog.cpp" line="82"/>
+        <source>Phonebook</source>
+        <translation>Kontaktliste</translation>
+    </message>
+    <message>
+        <location filename="../../gui/settingsdialog.cpp" line="102"/>
+        <source>Autostart</source>
+        <translation>Automatisk start</translation>
+    </message>
+    <message>
+        <location filename="../../gui/settingsdialog.cpp" line="104"/>
+        <source>Enabled</source>
+        <translation>Aktivert</translation>
+    </message>
+    <message>
+        <location filename="../../gui/settingsdialog.cpp" line="105"/>
+        <source>Disabled</source>
+        <translation>Deaktivert</translation>
+    </message>
+    <message>
+        <location filename="../../gui/settingsdialog.cpp" line="108"/>
+        <source>Connect automatically on</source>
+        <translation>Koble til automatisk</translation>
+    </message>
+    <message>
+        <location filename="../../gui/settingsdialog.cpp" line="112"/>
+        <source>Save</source>
+        <translation>Lagre</translation>
+    </message>
+    <message>
+        <location filename="../../gui/settingsdialog.cpp" line="137"/>
+        <source>General</source>
+        <translation>Generell</translation>
+    </message>
+    <message>
+        <location filename="../../gui/settingsdialog.cpp" line="138"/>
+        <source>Daemon</source>
+        <translation>Daemon</translation>
+    </message>
+    <message>
+        <location filename="../../gui/settingsdialog.cpp" line="139"/>
+        <location filename="../../gui/settingsdialog.cpp" line="208"/>
+        <source>Phonebook settings</source>
+        <translation>Kontaktliste innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../../gui/settingsdialog.cpp" line="170"/>
+        <source>Restarting daemon...</source>
+        <translation>Restarter daemon...</translation>
+    </message>
+    <message>
+        <location filename="../../gui/settingsdialog.cpp" line="176"/>
+        <source>You need to restart Jenirok for language change to take effect.</source>
+        <translation>Du må restarte Jenirok for å endre språk.</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../gui/settingsdialog.cpp" line="188"/>
+        <source>%n number(s) were deleted from cache</source>
+        <translation>
+            <numerusform>Telefonnummeret ble slettet fra cache</numerusform>
+            <numerusform>Telefonnummerene ble slettet fra cache</numerusform>
+        </translation>
+    </message>
+</context>
+</TS>

diff --git a/src/gui/aboutdialog.cpp b/src/gui/aboutdialog.cpp
index 8e4172d..1e358c7 100644 (file)
--- a/src/gui/aboutdialog.cpp
+++ b/src/gui/aboutdialog.cpp
@@ -32,7 +32,7 @@ AboutDialog::AboutDialog(QWidget* parent): QDialog(parent)
     image->setPixmap(pixmap);
     mainLayout->addWidget(image, 0, Qt::AlignLeft);
     mainLayout->addSpacing(20);
-    QLabel* text = new QLabel("<font size='4'><b>Jenirok</b></font><br>(c) 2010 Jesse Hakanen<br><a href='http://jenirok.garage.maemo.org'>http://jenirok.garage.maemo.org</a>");
+    QLabel* text = new QLabel(QString::fromUtf8("<font size='4'><b>Jenirok</b></font><br>(c) 2010 Jesse Hakanen<br>Norwegian translation by Eirik Lindem and Jørgen Sogn<br><a href='http://jenirok.garage.maemo.org'>http://jenirok.garage.maemo.org</a>"));
     text->setOpenExternalLinks(true);
     mainLayout->addWidget(text, 10, Qt::AlignLeft);
 

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 70b783d..ac9d643 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -169,17 +169,16 @@ void SettingsDialog::saveSettings()
 
     Settings::instance()->endEdit();
 
-    if(Daemon::isRunning())
-    {
-        QMaemo5InformationBox::information(this, tr("Restarting daemon..."), 1500);
-        Daemon::restart();
-    }
-
     if(language != selectedLanguage_)
     {
         QMaemo5InformationBox::information(this, tr("You need to restart Jenirok for language change to take effect."));
         selectedLanguage_ = language;
     }
+    else if(Daemon::isRunning())
+    {
+        QMaemo5InformationBox::information(this, tr("Restarting daemon..."), 1500);
+        Daemon::restart();
+    }
 
 }
 

diff --git a/www/index.html b/www/index.html
index f10621e..c684041 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -28,7 +28,7 @@
        <li><a href="http://maemo.org/packages/view/jenirok/">Package overview and changelog</a></li>
 </ul>
 
-<p>Jenirok is an open source Maemo 5 application that shows unknown callers' details automatically on screen. Caller details are fetched using <a href="http://henkilot.eniro.fi/">Eniro person search</a> or <a href="http://www.1881.no">1881.no</a> which means that Jenirok is mainly usable for Finnish, Swedish, Danish and Norwegian users. Only free phonebook services are used so <strong>using Jenirok is completely free except for the possible gprs data transfer costs</strong>. Currently Jenirok is available in English and Finnish, but I'm looking for Swedish, Danish and Norwegian translators. <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#106;&#101;&#115;&#115;&#101;&#104;&#97;&#107;&#97;&#110;&#101;&#110;&#64;&#103;&#109;&#97;&#105;&#108;&#46;&#99;&#111;&#109;">Contact me</a> if you are interested.</p>
+<p>Jenirok is an open source Maemo 5 application that shows unknown callers' details automatically on screen. Caller details are fetched using <a href="http://henkilot.eniro.fi/">Eniro person search</a> or <a href="http://www.1881.no">1881.no</a> which means that Jenirok is mainly usable for Finnish, Swedish, Danish and Norwegian users. Only free phonebook services are used so <strong>using Jenirok is completely free except for the possible gprs data transfer costs</strong>. Currently Jenirok is available in English, Finnish and Norwegian, but I'm looking for Swedish and Danish translators. <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#106;&#101;&#115;&#115;&#101;&#104;&#97;&#107;&#97;&#110;&#101;&#110;&#64;&#103;&#109;&#97;&#105;&#108;&#46;&#99;&#111;&#109;">Contact me</a> if you are interested.</p>
 
 <p>Jenirok consists of a background daemon which listens to incoming calls and a gui application which can be used for manual searching and configuring the daemon. Eniro account is needed for manual search. Searches are automatically cached so network is used as little as possible. Searching is only done when the caller's number is not found from the address book.</p>