From 8462f795942e17ee942a5e5cce3545a53c1a8837 Mon Sep 17 00:00:00 2001 From: eshe Date: Thu, 17 Jun 2010 20:22:51 +0100 Subject: [PATCH] Added Norwegian translation, updated web page and updated changelog to newest version. --- debian/changelog | 7 + src/common/settings.cpp | 4 +- src/common/translations.grc | 1 + src/common/translations/nb_NO.qm | Bin 0 -> 8099 bytes src/common/translations/nb_NO.ts | 459 ++++++++++++++++++++++++++++++++++++++ src/gui/aboutdialog.cpp | 2 +- src/gui/settingsdialog.cpp | 11 +- www/index.html | 2 +- 8 files changed, 477 insertions(+), 9 deletions(-) create mode 100644 src/common/translations/nb_NO.qm create mode 100644 src/common/translations/nb_NO.ts diff --git a/debian/changelog b/debian/changelog index 029e8bb..83a57b8 100644 --- 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 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 --- 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 --- a/src/common/translations.grc +++ b/src/common/translations.grc @@ -1,5 +1,6 @@ translations/fi_FI.qm + translations/nb_NO.qm diff --git a/src/common/translations/nb_NO.qm b/src/common/translations/nb_NO.qm new file mode 100644 index 0000000000000000000000000000000000000000..c5e9ee48cb190e18374b9ef48a9eefa1054dbb3d GIT binary patch literal 8099 zcmcIpe~cVe9sl0l?%m$q-rlvnUfZM8hn~<{au6uQG!3M^Ymb)eadulPN({5RZ|{cN zn^|^d?>rM}A{a3w5DY&G5^V!0NfSa)3;9wX|0o@iZ)XzBr? zJ0 zN#cL%n*JK?+xm5)^>5R@OYbB~KSqcj5U`_lG0kZ`GRa4}bLl^#6Kl_-e?}cSY)gyTH$?L#dfZ|Al=k zse|Y2AnNT&-Ejl{UbnS(jeL-(|46U*IqYA3r1zGme+E5n>3gy3Q{Zd3@8w6HgB^DF zcOC=Zy}AB%FMk*Gujw1|6Y3P+yBIQ$@CK) z9_ZYruV=lUe&!JTq5tXho6o!rJ&g|}XI}#Sfr0z~IELpJ4Loq~P0-Vg11FyYpQD#& zb{)akF$?a+hU6rkB)t+dT_P}#59zKeM3LDUt9<>Ls?9I@(vyuK{4^5R&$I{mfll7 zP{e-r5f)^7olaI-mHa%Lx(G$d!uDtmhiY_`&ome_Z79UrauQlV+eA||O9x<}_9O?VW)Eb~kmfep1xBmNapu4z8|I6>nll3%h_e8PTHp@s@6D3153&gvUhBTS6)wiYD9rMzD!_`>QfWn4 zg#tn@B(C=K79C!uI4grXBL&A&9YX8;aE4m|pSH?s%!frw%)JqQ{e)Xy2@sTzE!pLq zYgJ-Qm!ds55Fus=BzIRTZY5fMDYzOR=$O@s8Ea8SFP?3a2G~0SS;P8{m9IhD=g-s= zM1!*PZrQGBI}kfY-J?hxoC_szlN~jrZX;VdoQoJ(f$hE0{pj(y> z>sVOja>>r42Giiys=ypgDnki)Z(~LcdqFt31|QMUD^pb)NP@=-SJPmc?aGKVZ{+Wuv>e-;XTQqq zcI=AVxM?HpR$JH^1k}h1^k`W*OTiG)J4M;@JQQ>a9HNK~HxTo{N!Vrk)bYZzeFXtg z1RA-if)j=}2V9{#Z04rw$%<3MlPF>tfR#2tqego6*iJi@WDuLnIJnTH$(}4q^ERrC zYd-q+TecI*e<|cYPWcN)pyWi!^^{VY)^?04n@Wh!u)}2=S2p3wN>?{?%JL=)*W8fv z4y%tVE7VqaI*F47sGY($BN4A)y5YWtW6Q$2*6t{xk}`X><2RnDGvYpVh7C?!NX_SR z2c`2CXUyipXFpEY5^I`~MNlY!9-Fk}qU!*(9PXiVQh2^q;nFoH^A@~B*#3Eq{gqCz z+9cB@vfrVGGUpbFm#bqefD}Vey9I>vR+`~si`hA=jfzO|j7)DW%N8HqauSLug zG|~k)#tHTmp1G=AVrS&GoUgh%<5^U#eu265Goi3L2N&R+!Ps2Dw{G1Tw|V-+2+tPb zyLzd0h>^^Zy26D=3k<&iM+Mc7c|4?X6}q`)E`&UWs=)7ooJF@HMb+bpg+Gt+R8d-f zP<=Fqx^RKi}JJ|Mkn$#2M_ zZCa6*)!Tx`1^PQ<8yN1^?sb-|l3i%jU^HLj4FffHt_RPwPhuDhV*CvzHrhN@^9R!|~LuGK{;7VCH(=8k&;9|CsptEQ*118g` zZed@1OABE*-PEfOuGYAM)X$3$m3zoMzVm2%BoEZ5+mh1_+ZhuyoR59lsSPJKdt1b^ z1SAzOm*m>6SaBCo^5y4sGZAFbkj93iX8eY9ubIQMZs6KF3y1cLsQr-JKM%Ck#0>7MMH7 z?ca>Vu7Bv@$Pd6eqVzZPFfLLsU9W{PC|D7?jgHcx?n!I?iy?!alq>c)zJ`%TrILwx z(rKeU^-oRO9#4jK7aC!=A=r(lh^vQYcAG7*DL+k$BSm3U=-D>W=cE~h||@!I2y3%M_0S64SkdP;|@9( z6IShFx*TO4HI+;azgG+c(YZ9`0zy}(wcjnG)i(`$&#~H#?1?OzusCi$c4ZxP>VbxG zjZJPs8~38I*TCQ5f{fjypxlH3p=SC}@pXB)_(EP+ReI1MqP7yHnsbQ!JnmGt>GSAK U7K><0Re9OW^UVON&W?`%0%J)D^#A|> literal 0 HcmV?d00001 diff --git a/src/common/translations/nb_NO.ts b/src/common/translations/nb_NO.ts new file mode 100644 index 0000000..d1054e0 --- /dev/null +++ b/src/common/translations/nb_NO.ts @@ -0,0 +1,459 @@ + + + + + AboutDialog + + + About + Om + + + + CallListener + + Searching... + Søker... + + + Request timed out + Tilkobling mislyktes + + + Searching failed: + Søk feilet: + + + Phone number was not found + Nummeret ble ikke funnet + + + Automatic connecting is not allowed by settings. + Automatisk oppkobling ikke tillatt, sjekk innstillinger. + + + Connecting... + Kobler til... + + + No available 3G or WLAN networks found. + Ingen tilgjengelige nettverk. + + + Selected access point doesn't exist. + Valgte tilgangspunkt finnes ikke. + + + Unable to connect to network. + Kan ikke koble til nettverket. + + + + ConnectionSelector + + + Use global setting + Bruk globale innstillinger + + + + WLAN connection + WLAN tilkobling + + + + GPRS connection + GPRS tilkobling + + + + Any connection + Vilkårlig tilkobling + + + + DetailWindow + + + + Add to contacts + Legg til kontakter + + + + Copy number to clipboard + Kopier nummer til utklippstavle + + + + Call + Ring + + + + Send SMS + Send SMS + + + + + Name + Navn + + + + Street + Gate + + + + City + By + + + + Phone number + Telefonnummer + + + + Unable make call + Kan ikke foreta anrop + + + + Add + Legg til + + + + Contact was successfully added to contacts. + Kontakten ble lagt til i kontaktlisten. + + + + Unable to open SMS application + Kan ikke åpne SMS applikasjon + + + + + + Error + Feil + + + + Unable to add contact. + Kan ikke legge til kontakt. + + + + Number was successfully copied to clipboard. + Nummeret ble kopiert til utklippstavlen. + + + + EmptyGuiConfig + + + Selected phonebook has no settings to configure. + Den valgte telefonlisten har ingen innstillinger. + + + + EniroGuiConfig + + + Eniro username + Eniro username + + + + Eniro password + Eniro password + + + + Eniro site + Eniro site + + + + Finnish + Finnish + + + + Swedish + Swedish + + + + Danish + Danish + + + + MainWindow + + + Jenirok + Jenirok + + + + + Stop daemon + Stopp daemon + + + + + Start daemon + Start daemon + + + + Search + Søk + + + + Settings + Innstillinger + + + + About + Om + + + + Daemon was successfully stopped. + Daemon ble stoppet. + + + + Unable to stop daemon. + Kan ikke stoppe daemon. + + + + Unable to start daemon + Kan ikke starte daemon. + + + + Daemon cannot be started because it's not allowed to connect to the Internet. You have to either allow automatic Internet connection in Jenirok settings or in global Maemo settings. + Daemon får ikke tilgang til internett. Du må enten tillate automatisk tilkobling til internett i Jenirok eller i globale Maemo innstillinger. + + + + Open settings + Åpne innstillinger + + + + Close + Lukk + + + + Daemon was successfully started. + Daemon ble startet. + + + + Unable to start daemon. + Kan ikke starte daemon. + + + + Error + Feil + + + + Info + Info + + + + You need to set login details or other options in settings before using this feature. + Du må fylle inn påloggingsinformasjon for å bruke denne tjenesten. + + + + ResultWindow + + + Search results + Søke resultater + + + + Connection to server failed + Tilkobling til server feilet + + + + Invalid login details + Feil påloggingsinformasjon + + + + Request timed out + Tilkobling feilet + + + + Searching failed: + Søk feilet: + + + + Error + Feil + + + + No results found + Ingen resultater funnet + + + + SearchDialog + + + + Search + Søk + + + + Name/number + Navn/nummer + + + + Location + Sted + + + + Type + Type + + + + Persons + Personer + + + + Companies + Firmaer + + + + Settings + + + fi + fi + + + + SettingsDialog + + + Settings + Innstillinger + + + + Cache size (numbers) + Cache størrelse + + + + Clear + Tilbakestill + + + + Language + Språk + + + + Automatic + Automatisk + + + + Phonebook + Kontaktliste + + + + Autostart + Automatisk start + + + + Enabled + Aktivert + + + + Disabled + Deaktivert + + + + Connect automatically on + Koble til automatisk + + + + Save + Lagre + + + + General + Generell + + + + Daemon + Daemon + + + + + Phonebook settings + Kontaktliste innstillinger + + + + Restarting daemon... + Restarter daemon... + + + + You need to restart Jenirok for language change to take effect. + Du må restarte Jenirok for å endre språk. + + + + %n number(s) were deleted from cache + + Telefonnummeret ble slettet fra cache + Telefonnummerene ble slettet fra cache + + + + diff --git a/src/gui/aboutdialog.cpp b/src/gui/aboutdialog.cpp index 8e4172d..1e358c7 100644 --- 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("Jenirok
(c) 2010 Jesse Hakanen
http://jenirok.garage.maemo.org"); + QLabel* text = new QLabel(QString::fromUtf8("Jenirok
(c) 2010 Jesse Hakanen
Norwegian translation by Eirik Lindem and Jørgen Sogn
http://jenirok.garage.maemo.org")); 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 --- 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 --- a/www/index.html +++ b/www/index.html @@ -28,7 +28,7 @@
  • Package overview and changelog
    • -

    Jenirok is an open source Maemo 5 application that shows unknown callers' details automatically on screen. Caller details are fetched using Eniro person search or 1881.no which means that Jenirok is mainly usable for Finnish, Swedish, Danish and Norwegian users. Only free phonebook services are used so using Jenirok is completely free except for the possible gprs data transfer costs. Currently Jenirok is available in English and Finnish, but I'm looking for Swedish, Danish and Norwegian translators. Contact me if you are interested.

    +

    Jenirok is an open source Maemo 5 application that shows unknown callers' details automatically on screen. Caller details are fetched using Eniro person search or 1881.no which means that Jenirok is mainly usable for Finnish, Swedish, Danish and Norwegian users. Only free phonebook services are used so using Jenirok is completely free except for the possible gprs data transfer costs. Currently Jenirok is available in English, Finnish and Norwegian, but I'm looking for Swedish and Danish translators. Contact me if you are interested.

    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.

    -- 1.7.9.5