diff -Nru kdenetwork-4.1.3/debian/changelog kdenetwork-4.1.4/debian/changelog --- kdenetwork-4.1.3/debian/changelog 2009-01-15 17:13:57.000000000 +0000 +++ kdenetwork-4.1.4/debian/changelog 2009-01-15 17:13:58.000000000 +0000 @@ -1,3 +1,11 @@ +kdenetwork (4:4.1.4-0ubuntu1~intrepid1) intrepid-proposed; urgency=low + + * New upstream release + * remove kubuntu_05_fix_kopete_logout_crash.diff completely, applied upstream + * Added kdenetwork as depends for kdenetwork-dbg + + -- Steve Stalcup Wed, 07 Jan 2009 21:13:26 -0500 + kdenetwork (4:4.1.3-0ubuntu1~intrepid2) intrepid-backports; urgency=low * Add kubuntu_05_fix_kopete_crash.diff from upstream, which fixes KDE bug 172011 diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/debian/control /tmp/yhUjnDlui0/kdenetwork-4.1.4/debian/control --- kdenetwork-4.1.3/debian/control 2009-01-15 17:13:57.000000000 +0000 +++ kdenetwork-4.1.4/debian/control 2009-01-15 17:13:58.000000000 +0000 @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Sune Vuorela , Fathi Boudra , Armin Berres , Modestas Vainius , Matthew Rosewarne Build-Depends: cdbs (>= 0.4.52ubuntu7), debhelper (>= 6), cmake (>= 2.4.5), quilt, - kdepimlibs5-dev (>= 4:4.1.3), libphonon-dev (>= 4:4.2.0), libplasma-dev (>= 4:4.1.3), + kdepimlibs5-dev (>= 4:4.1.4), libphonon-dev (>= 4:4.2.0), libplasma-dev (>= 4:4.1.4), zlib1g-dev, libjpeg62-dev, libxml2-dev, libxslt1-dev, libssl-dev, libxdamage-dev, libxss-dev, libslp-dev, libiw-dev, libidn11-dev, libvncserver-dev (>= 0.9.3), libqca2-dev (>= 2.0.0), @@ -51,7 +51,7 @@ Package: kdenetwork-dev Section: devel Architecture: any -Depends: kopete (= ${binary:Version}), kdebase-dev (>= 4:4.0.74) +Depends: kopete (= ${binary:Version}), kdebase-dev (>= 4:4.1.4) Conflicts: kdenetwork-dev-kde4 Replaces: kdenetwork-dev-kde4 Description: development files for the KDE 4 networking module @@ -150,9 +150,8 @@ Section: libdevel Architecture: any Priority: extra -Depends: kdebase-runtime-dbg +Depends: kdebase-runtime-dbg, kdenetwork (= ${source:Version}) Recommends: kdebase-workspace-dbg -Suggests: kdenetwork (= ${source:Version}) Conflicts: kdenetwork-dbg-kde4 Replaces: kdenetwork-dbg-kde4 Description: debugging symbols for the KDE 4 networking module diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/debian/patches/kubuntu_05_fix_kopete_logout_crash.diff /tmp/yhUjnDlui0/kdenetwork-4.1.4/debian/patches/kubuntu_05_fix_kopete_logout_crash.diff --- kdenetwork-4.1.3/debian/patches/kubuntu_05_fix_kopete_logout_crash.diff 2009-01-15 17:13:57.000000000 +0000 +++ kdenetwork-4.1.4/debian/patches/kubuntu_05_fix_kopete_logout_crash.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -Index: kdenetwork-4.1.3/kopete/libkopete/kopetepluginmanager.cpp -=================================================================== ---- kdenetwork-4.1.3.orig/kopete/libkopete/kopetepluginmanager.cpp 2008-11-08 14:44:08.000000000 -0500 -+++ kdenetwork-4.1.3/kopete/libkopete/kopetepluginmanager.cpp 2008-11-08 14:48:27.000000000 -0500 -@@ -62,14 +62,18 @@ - if ( shutdownMode != DoneShutdown ) - kWarning( 14010 ) << "Destructing plugin manager without going through the shutdown process! Backtrace is: " << endl << kBacktrace(); - -- // Quick cleanup of the remaining plugins, hope it helps -- // Note that deleting it.value() causes slotPluginDestroyed to be called, which -- // removes the plugin from the list of loaded plugins. -+ // Clean up loadedPlugins manually, because PluginManager can't access our global -+ // static once this destructor has started. - while ( !loadedPlugins.empty() ) - { - InfoToPluginMap::ConstIterator it = loadedPlugins.begin(); - kWarning( 14010 ) << "Deleting stale plugin '" << it.value()->objectName() << "'"; -- delete it.value(); -+ KPluginInfo info = it.key(); -+ Plugin *plugin = it.value(); -+ loadedPlugins.remove(info); -+ plugin->disconnect(&instance, SLOT(slotPluginDestroyed(QObject*))); -+ delete plugin; -+ - } - } - -@@ -245,10 +249,6 @@ - { - kDebug( 14010 ) ; - -- // Disconnect any remaining plugins (bug 172011). -- for ( PluginManagerPrivate::InfoToPluginMap::ConstIterator it = _kpmp->loadedPlugins.begin(); it != _kpmp->loadedPlugins.end(); ++it ) -- disconnect( it.value(), SIGNAL(destroyed(QObject*)), this, 0 ); -- - _kpmp->shutdownMode = PluginManagerPrivate::DoneShutdown; - - KGlobal::deref(); diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/debian/patches/series /tmp/yhUjnDlui0/kdenetwork-4.1.4/debian/patches/series --- kdenetwork-4.1.3/debian/patches/series 2009-01-15 17:13:57.000000000 +0000 +++ kdenetwork-4.1.4/debian/patches/series 2009-01-15 17:13:58.000000000 +0000 @@ -1,4 +1,3 @@ kubuntu_01_suid_kppp.diff kubuntu_02_kppp_add_boud_rates.diff kubuntu_04_fix_kopete_nowlistening_wording.diff -kubuntu_05_fix_kopete_logout_crash.diff Binary files /tmp/3whLddlRfY/kdenetwork-4.1.3/doc/kget/index.cache.bz2 and /tmp/yhUjnDlui0/kdenetwork-4.1.4/doc/kget/index.cache.bz2 differ Binary files /tmp/3whLddlRfY/kdenetwork-4.1.3/doc/knewsticker/index.cache.bz2 and /tmp/yhUjnDlui0/kdenetwork-4.1.4/doc/knewsticker/index.cache.bz2 differ Binary files /tmp/3whLddlRfY/kdenetwork-4.1.3/doc/kopete/index.cache.bz2 and /tmp/yhUjnDlui0/kdenetwork-4.1.4/doc/kopete/index.cache.bz2 differ Binary files /tmp/3whLddlRfY/kdenetwork-4.1.3/doc/kppp/index.cache.bz2 and /tmp/yhUjnDlui0/kdenetwork-4.1.4/doc/kppp/index.cache.bz2 differ Binary files /tmp/3whLddlRfY/kdenetwork-4.1.3/doc/krdc/index.cache.bz2 and /tmp/yhUjnDlui0/kdenetwork-4.1.4/doc/krdc/index.cache.bz2 differ Binary files /tmp/3whLddlRfY/kdenetwork-4.1.3/doc/krfb/index.cache.bz2 and /tmp/yhUjnDlui0/kdenetwork-4.1.4/doc/krfb/index.cache.bz2 differ diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kfile-plugins/torrent/kfile_torrent.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kfile-plugins/torrent/kfile_torrent.desktop --- kdenetwork-4.1.3/kfile-plugins/torrent/kfile_torrent.desktop 2008-06-10 12:41:31.000000000 +0100 +++ kdenetwork-4.1.4/kfile-plugins/torrent/kfile_torrent.desktop 2009-01-06 16:21:31.000000000 +0000 @@ -21,7 +21,7 @@ Name[hi]=बिट टोरेंट जानकारी Name[hu]=Bittorrent-jellemzők Name[is]=Bit Torrent upplýsingar -Name[it]=Informazioni Bittorrent +Name[it]=Informazioni BitTorrent Name[ja]=Bit Torrent 情報 Name[kk]=Bit Torrent мәліметі Name[km]=ព័ត៌មាន Bit Torrent @@ -32,7 +32,7 @@ Name[nds]=BitTorrent-Info Name[ne]=बिट टोरेन्ट सूचना Name[nl]=Bittorent-informatie -Name[nn]=Bit Torrent-info +Name[nn]=BitTorrent-info Name[pa]=Bit Torrent ਜਾਣਕਾਰੀ Name[pl]=Informacja o Bit Torrent Name[pt]=Informações do Bit Torrent diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kget/conf/dlgnetwork.ui /tmp/yhUjnDlui0/kdenetwork-4.1.4/kget/conf/dlgnetwork.ui --- kdenetwork-4.1.3/kget/conf/dlgnetwork.ui 2008-04-02 13:19:37.000000000 +0100 +++ kdenetwork-4.1.4/kget/conf/dlgnetwork.ui 2009-01-06 16:21:31.000000000 +0000 @@ -10,16 +10,7 @@ - - 0 - - - 0 - - - 0 - - + 0 @@ -60,7 +51,7 @@ Qt::Horizontal - + 71 48 @@ -109,7 +100,7 @@ QSizePolicy::Expanding - + 115 36 @@ -122,15 +113,15 @@ kBi/s - - 10 - - 100000 + 1000000 5 + + 10 + @@ -152,6 +143,15 @@ KiB/s + + 1000000 + + + 5 + + + 10 + @@ -159,6 +159,15 @@ KiB/s + + 1000000 + + + 5 + + + 10 + @@ -166,7 +175,7 @@ Qt::Horizontal - + 40 20 @@ -179,7 +188,7 @@ Qt::Horizontal - + 40 20 @@ -228,7 +237,7 @@ QSizePolicy::Expanding - + 115 56 @@ -242,7 +251,10 @@ sec - 100 + 86400 + + + 5 @@ -283,7 +295,7 @@ QSizePolicy::Expanding - + 200 16 diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kget/core/plugin/kget_plugin.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kget/core/plugin/kget_plugin.desktop --- kdenetwork-4.1.3/kget/core/plugin/kget_plugin.desktop 2008-08-28 09:08:05.000000000 +0100 +++ kdenetwork-4.1.4/kget/core/plugin/kget_plugin.desktop 2009-01-06 16:21:31.000000000 +0000 @@ -22,9 +22,10 @@ Name[nb]=Programtillegg for KGet Name[nds]=KGet-Moduul Name[nl]=KGet-plugin +Name[nn]=KGet-programtillegg Name[pl]=Wtyczka KGet Name[pt]='Plugin' do KGet -Name[pt_BR]=Plugin do KGet +Name[pt_BR]=Plug-in do KGet Name[ro]=Modul KGet Name[ru]=Модуль KGet Name[sl]=Vstavek za KGet @@ -61,10 +62,11 @@ Comment[nds]=Moduul för KGet Comment[ne]=केडीई गेटका लागि प्लगइन Comment[nl]=Plugin voor KGet +Comment[nn]=Programtillegg til KGet Comment[pa]=ਕੇ-ਗੈੱਟ ਲਈ ਪਲੱਗਇਨ Comment[pl]=Wtyczka dla KGet Comment[pt]=Plugin do KGet -Comment[pt_BR]=Plugin para o KGet +Comment[pt_BR]=Plug-in para o KGet Comment[ro]=Modul pentru KGet Comment[ru]=Модуль KGet Comment[sl]=Vstavek za KGet diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kget/plasma/applet/plasma-kget-default.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kget/plasma/applet/plasma-kget-default.desktop --- kdenetwork-4.1.3/kget/plasma/applet/plasma-kget-default.desktop 2008-08-28 09:08:05.000000000 +0100 +++ kdenetwork-4.1.4/kget/plasma/applet/plasma-kget-default.desktop 2009-01-06 16:21:31.000000000 +0000 @@ -29,6 +29,7 @@ Comment[nb]=KGet nedlastingsovervåker Comment[nds]=Daallaadkieker för KGet Comment[nl]=KGet-downloadsmonitor +Comment[nn]=KGet-overvaking Comment[pl]=Monitor pobierania KGet Comment[pt]=Monitor de transferências do KGet Comment[pt_BR]=Lista de download do Kget diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kget/plasma/engine/plasma-engine-kget.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kget/plasma/engine/plasma-engine-kget.desktop --- kdenetwork-4.1.3/kget/plasma/engine/plasma-engine-kget.desktop 2008-07-15 20:50:53.000000000 +0100 +++ kdenetwork-4.1.4/kget/plasma/engine/plasma-engine-kget.desktop 2009-01-06 16:21:31.000000000 +0000 @@ -22,8 +22,9 @@ Name[lt]=KGet duomenų sistema Name[lv]=KGet datu dzinējs Name[nb]=KGet datamotor -Name[nds]=KGet-Hanteerkarn +Name[nds]=KGet-Datenkarn Name[nl]=KGet (gegevensengine) +Name[nn]=KGet-datamotor Name[pa]=KGet ਡਾਟਾ ਇੰਜਣ Name[pl]=Silnik danych KGet Name[pt]=Motor de Dados do KGet diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kget/sounds/kget.notifyrc /tmp/yhUjnDlui0/kdenetwork-4.1.4/kget/sounds/kget.notifyrc --- kdenetwork-4.1.3/kget/sounds/kget.notifyrc 2008-07-15 20:50:53.000000000 +0100 +++ kdenetwork-4.1.4/kget/sounds/kget.notifyrc 2009-01-06 16:21:31.000000000 +0000 @@ -33,6 +33,7 @@ Name[nb]=Overføring lagt til Name[nds]=Överdregen toföögt Name[nl]=Overdracht toegevoegd +Name[nn]=Overføring lagd til Name[pa]=ਟਰਾਂਸਫਰ ਸ਼ਾਮਲ ਕੀਤਾ Name[pl]=Dodano transfer Name[pt]=Transferência Adicionada @@ -74,6 +75,7 @@ Comment[nb]=En ny nedlasting er blitt lagt til Comment[nds]=En nieg Överdregen wöör toföögt Comment[nl]=Er is een nieuwe download toegevoegd +Comment[nn]=Ei ny nedlasting er lagd til Comment[pa]=ਇੱਕ ਨਵਾਂ ਡਾਊਨਲੋਡ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ Comment[pl]=Nowe zlecenie pobrania pliku zostało dodane Comment[pt]=Foi adicionada uma transferência nova @@ -120,6 +122,7 @@ Name[nb]=Nedlasting startet Name[nds]=Daalladen anfungen Name[nl]=Download gestart +Name[nn]=Nedlastinga har starta Name[pa]=ਡਾਊਨਲੋਡ ਸ਼ੁਰੂ ਕੀਤਾ Name[pl]=Pobieranie rozpoczęte Name[pt]=Transferência Iniciada @@ -162,6 +165,7 @@ Comment[nb]=Nedlasting er startet Comment[nds]=Daalladen hett start Comment[nl]=Het downloaden is gestart +Comment[nn]=Nedlastinga har starta Comment[pa]=ਡਾਊਨਲੋਡ ਸ਼ੁਰੂ ਕੀਤਾ ਗਿਆ Comment[pl]=Pobieranie pliku zostało rozpoczęte Comment[pt]=A transferência começou @@ -208,6 +212,7 @@ Name[nb]=Nedlasting ferdig Name[nds]=Daalladen afslaten Name[nl]=Download voltooid +Name[nn]=Nedlastinga er ferdig Name[pa]=ਡਾਊਨਲੋਡ ਮੁਕੰਮਲ ਹੋਇਆ Name[pl]=Pobieranie zakończone Name[pt]=Transferência Terminada @@ -250,6 +255,7 @@ Comment[nb]=Nedlasting ferdig Comment[nds]=Daalladen beendt Comment[nl]=Het downloaden is voltooid +Comment[nn]=Nedlastinga er ferdig Comment[pa]=ਡਾਊਨਲੋਡ ਮੁਕੰਮਲ ਹੋਇਆ Comment[pl]=Pobieranie pliku zostało zakończone Comment[pt]=A transferência terminou @@ -294,6 +300,7 @@ Name[nb]=Alle nedlastinger ferdige Name[nds]=All Daalladen afslaten Name[nl]=Alle downloads voltooid +Name[nn]=Alle nedlastingar er ferdige Name[pa]=ਸਭ ਡਾਊਨਲੋਡ ਮੁਕੰਮਲ ਹੋਏ Name[pl]=Pobieranie wszystkich plików zostało zakończone Name[pt]=Todas as Transferências Terminaram @@ -335,6 +342,7 @@ Comment[nb]=Alle nedlastinger er ferdige Comment[nds]=All Daalladen afslaten Comment[nl]=Alle downloads zijn voltooid +Comment[nn]=Alle nedlastingar er ferdige Comment[pa]=ਡਾਊਨਲੋਡ ਮੁਕੰਮਲ ਹੋਏ Comment[pl]=Pobieranie wszystkich plików zostało zakończone Comment[pt]=Todas as transferências terminaram diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kget/transfer-plugins/bittorrent/kget_bittorrentfactory.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kget/transfer-plugins/bittorrent/kget_bittorrentfactory.desktop --- kdenetwork-4.1.3/kget/transfer-plugins/bittorrent/kget_bittorrentfactory.desktop 2008-07-15 20:50:52.000000000 +0100 +++ kdenetwork-4.1.4/kget/transfer-plugins/bittorrent/kget_bittorrentfactory.desktop 2009-01-06 16:21:31.000000000 +0000 @@ -16,6 +16,7 @@ Name[nb]=KIO overføringsfabrikk Name[nds]=KIO-Överdreegmoduul Name[ne]=कियो स्थानान्तरण फ्याक्ट्री +Name[nn]=KIO-overføringar Name[pl]=Moduł transferów KIO Name[pt]=Factory de Transferências do KIO Name[pt_BR]=Fator de transferência - KIO @@ -49,9 +50,10 @@ Comment[nds]=Överdreegmoduul för KGet Comment[ne]=केडीई गेटका लागि प्लगइन स्थानान्तरण गर्नुहोस् Comment[nl]=Overdrachtplugin voor KGet +Comment[nn]=Overføringstillegg til KGet Comment[pl]=Wtyczka transferów dla KGet Comment[pt]='Plugin' de transferências para o KGet -Comment[pt_BR]=Plugin de transferências para o KGet +Comment[pt_BR]=Plug-in de transferências para o KGet Comment[ru]=Модуль передачи для KGet Comment[sl]=Vstavek za prenose za KGet Comment[sv]=Överföringsinsticksprogram för Kget diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kget/transfer-plugins/kio/kget_kiofactory.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kget/transfer-plugins/kio/kget_kiofactory.desktop --- kdenetwork-4.1.3/kget/transfer-plugins/kio/kget_kiofactory.desktop 2008-07-15 20:50:52.000000000 +0100 +++ kdenetwork-4.1.4/kget/transfer-plugins/kio/kget_kiofactory.desktop 2009-01-06 16:21:31.000000000 +0000 @@ -16,6 +16,7 @@ Name[nb]=KIO overføringsfabrikk Name[nds]=KIO-Överdreegmoduul Name[ne]=कियो स्थानान्तरण फ्याक्ट्री +Name[nn]=KIO-overføringar Name[pl]=Moduł transferów KIO Name[pt]=Factory de Transferências do KIO Name[pt_BR]=Fator de transferência - KIO @@ -49,9 +50,10 @@ Comment[nds]=Överdreegmoduul för KGet Comment[ne]=केडीई गेटका लागि प्लगइन स्थानान्तरण गर्नुहोस् Comment[nl]=Overdrachtplugin voor KGet +Comment[nn]=Overføringstillegg til KGet Comment[pl]=Wtyczka transferów dla KGet Comment[pt]='Plugin' de transferências para o KGet -Comment[pt_BR]=Plugin de transferências para o KGet +Comment[pt_BR]=Plug-in de transferências para o KGet Comment[ru]=Модуль передачи для KGet Comment[sl]=Vstavek za prenose za KGet Comment[sv]=Överföringsinsticksprogram för Kget diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kget/transfer-plugins/metalink/kget_metalinkfactory.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kget/transfer-plugins/metalink/kget_metalinkfactory.desktop --- kdenetwork-4.1.3/kget/transfer-plugins/metalink/kget_metalinkfactory.desktop 2008-08-28 09:08:05.000000000 +0100 +++ kdenetwork-4.1.4/kget/transfer-plugins/metalink/kget_metalinkfactory.desktop 2009-01-06 16:21:31.000000000 +0000 @@ -16,6 +16,7 @@ Name[nb]=MetaLink overføringsfabrikk Name[nds]=MetaLink-Överdreegmoduul Name[ne]=मेटालिङ्क स्थानान्तरण फ्याक्ट्री +Name[nn]=MetaLink-overføringar Name[pt]=Factory de Transferências do MetaLink Name[sv]=Metalink-överföringsgenerering Name[x-test]=xxMetaLink TransferFactoryxx @@ -47,9 +48,10 @@ Comment[nds]=Överdreegmoduul för KGet Comment[ne]=केडीई गेटका लागि प्लगइन स्थानान्तरण गर्नुहोस् Comment[nl]=Overdrachtplugin voor KGet +Comment[nn]=Overføringstillegg til KGet Comment[pl]=Wtyczka transferów dla KGet Comment[pt]='Plugin' de transferências para o KGet -Comment[pt_BR]=Plugin de transferências para o KGet +Comment[pt_BR]=Plug-in de transferências para o KGet Comment[ru]=Модуль передачи для KGet Comment[sl]=Vstavek za prenose za KGet Comment[sv]=Överföringsinsticksprogram för Kget diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kget/transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kget/transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.desktop --- kdenetwork-4.1.3/kget/transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.desktop 2008-08-28 09:08:05.000000000 +0100 +++ kdenetwork-4.1.4/kget/transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.desktop 2009-01-06 16:21:31.000000000 +0000 @@ -13,6 +13,7 @@ Name[lt]=MirrorSearch siuntimo sistema Name[nb]=MirrorSearch overføringsfabrikk Name[nds]=MirrorSearch-Överdreegmoduul +Name[nn]=MirrorSearch-overføringar Name[pt]=Factory de Transferências do MirrorSearch Name[pt_BR]=Procura por mirror Gerador de transferência Name[sv]=Mirrorsearch-överföringsgenerering @@ -47,9 +48,10 @@ Comment[nds]=Överdreegmoduul för KGet Comment[ne]=केडीई गेटका लागि प्लगइन स्थानान्तरण गर्नुहोस् Comment[nl]=Overdrachtplugin voor KGet +Comment[nn]=Overføringstillegg til KGet Comment[pl]=Wtyczka transferów dla KGet Comment[pt]='Plugin' de transferências para o KGet -Comment[pt_BR]=Plugin de transferências para o KGet +Comment[pt_BR]=Plug-in de transferências para o KGet Comment[ru]=Модуль передачи для KGet Comment[sl]=Vstavek za prenose za KGet Comment[sv]=Överföringsinsticksprogram för Kget diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kget/transfer-plugins/mms/kget_mmsfactory.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kget/transfer-plugins/mms/kget_mmsfactory.desktop --- kdenetwork-4.1.3/kget/transfer-plugins/mms/kget_mmsfactory.desktop 2008-08-28 09:08:05.000000000 +0100 +++ kdenetwork-4.1.4/kget/transfer-plugins/mms/kget_mmsfactory.desktop 2009-01-06 16:21:31.000000000 +0000 @@ -13,6 +13,7 @@ Name[lt]=MMS siuntimo sistema Name[nb]=MMS overføringsfabrikk Name[nds]=MMS-Överdreegmoduul +Name[nn]=MMS-overføringar Name[pt]=Factory de Transferências de MMS Name[pt_BR]=Gerador de transferência MMS Name[sv]=MMS-överföringsfabrik diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kget/transfer-plugins/multisegmentkio/kget_multisegkiofactory.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kget/transfer-plugins/multisegmentkio/kget_multisegkiofactory.desktop --- kdenetwork-4.1.3/kget/transfer-plugins/multisegmentkio/kget_multisegkiofactory.desktop 2008-08-28 09:08:05.000000000 +0100 +++ kdenetwork-4.1.4/kget/transfer-plugins/multisegmentkio/kget_multisegkiofactory.desktop 2009-01-06 16:21:31.000000000 +0000 @@ -22,6 +22,7 @@ Name[nb]=Multi-segment KIO overføringsfabrikk Name[nds]=Mehrsegment-KIO-Överdreegmoduul Name[ne]=बहुँविध खण्ड कियो स्थानान्तरण फ्याक्ट्री +Name[nn]=Fleirsegmentert KIO-overføringar Name[pt]=Factory de Transferências do KIO Multi-Segmentos Name[sv]=Flersegments I/O-slav överföringsgenerering Name[tr]=Çok Parçalı KIO TransferFactory @@ -55,9 +56,10 @@ Comment[nds]=Överdreegmoduul för KGet Comment[ne]=केडीई गेटका लागि प्लगइन स्थानान्तरण गर्नुहोस् Comment[nl]=Overdrachtplugin voor KGet +Comment[nn]=Overføringstillegg til KGet Comment[pl]=Wtyczka transferów dla KGet Comment[pt]='Plugin' de transferências para o KGet -Comment[pt_BR]=Plugin de transferências para o KGet +Comment[pt_BR]=Plug-in de transferências para o KGet Comment[ru]=Модуль передачи для KGet Comment[sl]=Vstavek za prenose za KGet Comment[sv]=Överföringsinsticksprogram för Kget diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/doc/t1/kopete_tutorialplugin.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/doc/t1/kopete_tutorialplugin.desktop --- kdenetwork-4.1.3/kopete/doc/t1/kopete_tutorialplugin.desktop 2008-07-15 20:50:47.000000000 +0100 +++ kdenetwork-4.1.4/kopete/doc/t1/kopete_tutorialplugin.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -27,10 +27,11 @@ Name[nds]=Inföhrenmoduul Name[ne]=संरक्षक प्लगइन Name[nl]=Oefenplugin +Name[nn]=Programtillegg for opplæring Name[pa]=ਟਟੋਰੀਅਲ ਪਲੱਗਇਨ Name[pl]=Wtyczka - przykład Name[pt]='Plugin' de Tutorial -Name[pt_BR]=Plugin Tutorial +Name[pt_BR]=Plug-in Tutorial Name[ru]=Модуль-руководство Name[sl]=Vstavek vodnik Name[sv]=Handledningsinsticksprogram @@ -66,9 +67,10 @@ Comment[nds]=Bispillmoduul för't Lehren, wodennig Kopete utwickelt warrt Comment[ne]=कोपेट विकास पढाउनका लागि प्रदर्शनी प्लगइन Comment[nl]=Demonstratieplugin voor het leren van Kopete-ontwikkeling +Comment[nn]=Programtillegg for demonstrasjon og opplæring i Kopete-utvikling Comment[pl]=Wtyczka demonstracyjna do nauki programowania Kopete Comment[pt]='Plugin' de demonstração para ensinar a programar no Kopete -Comment[pt_BR]=Plugin de demonstração para ensinar o desenvolvimento do Kopete +Comment[pt_BR]=Plug-in de demonstração para ensinar o desenvolvimento do Kopete Comment[ru]=Демонстрационный модуль для изучения программирования модулей Kopete Comment[sl]=Predstavitveni vstavek za učenje razvoja Kopete Comment[sv]=Demonstrationsinsticksprogram för att lära ut utveckling av Kopete diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/doc/t2/kopete_tutorialplugin.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/doc/t2/kopete_tutorialplugin.desktop --- kdenetwork-4.1.3/kopete/doc/t2/kopete_tutorialplugin.desktop 2008-07-15 20:50:47.000000000 +0100 +++ kdenetwork-4.1.4/kopete/doc/t2/kopete_tutorialplugin.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -27,10 +27,11 @@ Name[nds]=Inföhrenmoduul Name[ne]=संरक्षक प्लगइन Name[nl]=Oefenplugin +Name[nn]=Programtillegg for opplæring Name[pa]=ਟਟੋਰੀਅਲ ਪਲੱਗਇਨ Name[pl]=Wtyczka - przykład Name[pt]='Plugin' de Tutorial -Name[pt_BR]=Plugin Tutorial +Name[pt_BR]=Plug-in Tutorial Name[ru]=Модуль-руководство Name[sl]=Vstavek vodnik Name[sv]=Handledningsinsticksprogram @@ -66,9 +67,10 @@ Comment[nds]=Bispillmoduul för't Lehren, wodennig Kopete utwickelt warrt Comment[ne]=कोपेट विकास पढाउनका लागि प्रदर्शनी प्लगइन Comment[nl]=Demonstratieplugin voor het leren van Kopete-ontwikkeling +Comment[nn]=Programtillegg for demonstrasjon og opplæring i Kopete-utvikling Comment[pl]=Wtyczka demonstracyjna do nauki programowania Kopete Comment[pt]='Plugin' de demonstração para ensinar a programar no Kopete -Comment[pt_BR]=Plugin de demonstração para ensinar o desenvolvimento do Kopete +Comment[pt_BR]=Plug-in de demonstração para ensinar o desenvolvimento do Kopete Comment[ru]=Демонстрационный модуль для изучения программирования модулей Kopete Comment[sl]=Predstavitveni vstavek za učenje razvoja Kopete Comment[sv]=Demonstrationsinsticksprogram för att lära ut utveckling av Kopete diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/doc/t3/kopete_tutorialplugin.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/doc/t3/kopete_tutorialplugin.desktop --- kdenetwork-4.1.3/kopete/doc/t3/kopete_tutorialplugin.desktop 2008-07-15 20:50:47.000000000 +0100 +++ kdenetwork-4.1.4/kopete/doc/t3/kopete_tutorialplugin.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -27,10 +27,11 @@ Name[nds]=Inföhrenmoduul Name[ne]=संरक्षक प्लगइन Name[nl]=Oefenplugin +Name[nn]=Programtillegg for opplæring Name[pa]=ਟਟੋਰੀਅਲ ਪਲੱਗਇਨ Name[pl]=Wtyczka - przykład Name[pt]='Plugin' de Tutorial -Name[pt_BR]=Plugin Tutorial +Name[pt_BR]=Plug-in Tutorial Name[ru]=Модуль-руководство Name[sl]=Vstavek vodnik Name[sv]=Handledningsinsticksprogram @@ -66,9 +67,10 @@ Comment[nds]=Bispillmoduul för't Lehren, wodennig Kopete utwickelt warrt Comment[ne]=कोपेट विकास पढाउनका लागि प्रदर्शनी प्लगइन Comment[nl]=Demonstratieplugin voor het leren van Kopete-ontwikkeling +Comment[nn]=Programtillegg for demonstrasjon og opplæring i Kopete-utvikling Comment[pl]=Wtyczka demonstracyjna do nauki programowania Kopete Comment[pt]='Plugin' de demonstração para ensinar a programar no Kopete -Comment[pt_BR]=Plugin de demonstração para ensinar o desenvolvimento do Kopete +Comment[pt_BR]=Plug-in de demonstração para ensinar o desenvolvimento do Kopete Comment[ru]=Демонстрационный модуль для изучения программирования модулей Kopete Comment[sl]=Predstavitveni vstavek za učenje razvoja Kopete Comment[sv]=Demonstrationsinsticksprogram för att lära ut utveckling av Kopete diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/doc/t3/kopete_tutorialplugin_config.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/doc/t3/kopete_tutorialplugin_config.desktop --- kdenetwork-4.1.3/kopete/doc/t3/kopete_tutorialplugin_config.desktop 2008-07-23 09:26:27.000000000 +0100 +++ kdenetwork-4.1.4/kopete/doc/t3/kopete_tutorialplugin_config.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -28,6 +28,7 @@ Name[nds]=Inföhren Name[ne]=संरक्षक Name[nl]=Oefening +Name[nn]=Opplæring Name[pa]=ਟਟੋਰੀਅਲ Name[pl]=Podręcznik Name[ru]=Руководство @@ -55,7 +56,7 @@ Comment[gl]=Converte á xente normal en Superdesenvolventes de Kopete Comment[hi]=सामान्य जनता को सुपर केऑप्टी डेवलपर में परिवर्तित कर देता है Comment[hu]=Oktatómodul azoknak, akik Kopete-fejlesztők szeretnének lenni -Comment[it]=Tramuta persone normali in Super Sviluppatori di Kopete +Comment[it]=Trasforma persone normali in Super Sviluppatori di Kopete Comment[ja]=普通の人を Kopete のスーパー開発者に変えます Comment[km]=ប្រែ​ក្លាយ​មនុស្ស​ធម្មតា​ឲ្យ​ទៅ​ជា​កំពូល​អ្នក​អភិវឌ្ឍន៍ Kopete Comment[ko]=일반적인 사람들에게 Kopete 개발을 소개합니다 @@ -65,6 +66,7 @@ Comment[nds]=Maakt ut normaal Lüüd basig Kopete-Utwicklers Comment[ne]=सामान्य मानिसलाई सपर कोपेट विकासकर्तामा फर्काउँदछ Comment[nl]=Maakt van normale personen super Kopete-ontwikkelaars +Comment[nn]=Gjer vanlege folk til supre Kopete-utviklarar Comment[pl]=Zamienia zwykłych ludzi w super-programistów Kopete Comment[pt]=Torna as pessoas normais em Super-Programadores do Kopete Comment[pt_BR]=Transforma pessoas normais em super desenvolvedores do Kopete diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/kopete/chatwindow/chatwindow.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/kopete/chatwindow/chatwindow.desktop --- kdenetwork-4.1.3/kopete/kopete/chatwindow/chatwindow.desktop 2008-07-15 20:50:47.000000000 +0100 +++ kdenetwork-4.1.4/kopete/kopete/chatwindow/chatwindow.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -48,7 +48,7 @@ Name[nds]=Kopete-Klöönfinster Name[ne]=कोपेट कुराकानी सञ्झ्याल Name[nl]=Kopete gespreksvenster -Name[nn]=Kopete pratevindauge +Name[nn]=Pratevindauget i Kopete Name[pa]=ਕੋਪੀਟੀ ਗੱਲਾਬਾਤ ਵਿੰਡੋ Name[pl]=Okno rozmowy Kopete Name[pt]=Janela de Conversação do Kopete diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/kopete/chatwindow/emailwindow.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/kopete/chatwindow/emailwindow.desktop --- kdenetwork-4.1.3/kopete/kopete/chatwindow/emailwindow.desktop 2008-07-15 20:50:47.000000000 +0100 +++ kdenetwork-4.1.4/kopete/kopete/chatwindow/emailwindow.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -45,7 +45,7 @@ Name[nds]=Kopete-Nettpostfinster Name[ne]=कोपेट इमेल सञ्झ्याल Name[nl]=Kopete e-mailvenster -Name[nn]=Kopete e-postvindauge +Name[nn]=E-postvindauget i Kopete Name[pa]=ਕੋਪੀਟੀ ਈ-ਮੇਲ ਵਿੰਡੋ Name[pl]=Okno e-mailowe Kopete Name[pt]=Janela de E-mail do Kopete @@ -94,7 +94,7 @@ Comment[nds]=Dat Kopete-Nettpostfinster Comment[ne]=कोपेट इमेल सञ्झ्याल Comment[nl]=Het standaard Kopete gespreksvenster -Comment[nn]=E-postvindauget i Kopete +Comment[nn]=Vindauget for e-post i Kopete Comment[pa]=ਕੋਪੀਟੀ ਈਮੇਲ ਵਿੰਡੋ Comment[pl]=Okno e-maila w Kopete Comment[pt]=A janela de e-mail do Kopete diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/kopete/config/accounts/kopete_accountconfig.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/kopete/config/accounts/kopete_accountconfig.desktop --- kdenetwork-4.1.3/kopete/kopete/config/accounts/kopete_accountconfig.desktop 2008-07-08 10:55:25.000000000 +0100 +++ kdenetwork-4.1.4/kopete/kopete/config/accounts/kopete_accountconfig.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -90,6 +90,7 @@ Comment[nb]=Rediger kontoene og identitetene dine Comment[nds]=Dien Kontos un Identiteten plegen Comment[nl]=Beheer uw accounts en identiteiten +Comment[nn]=Handter kontoane og identitetane dine Comment[pa]=ਆਪਣੇ ਅਕਾਊਂਟ ਅਤੇ ਪਛਾਣ ਦਾ ਪਰਬੰਧ ਕਰੋ Comment[pl]=Zarządzenie kontami i tożsamościami Comment[pt]=Gerir as Suas Contas e Identidades diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop --- kdenetwork-4.1.3/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop 2008-06-10 12:41:27.000000000 +0100 +++ kdenetwork-4.1.4/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -31,6 +31,7 @@ Name[nb]=Kontaktliste Name[nds]=Kontaktenlist Name[nl]=Contactlijst +Name[nn]=Kontaktliste Name[oc]=Tièra de contactes Name[pa]=ਸੰਪਰਕ ਲਿਸਟ Name[pl]=Lista kontaktów @@ -67,6 +68,7 @@ Comment[nb]=Sett opp utseende og oppførsel for kontaktlista Comment[nds]=Dat Utsehn vun de Kontaktenlist instellen Comment[nl]=Uiterlijk en gedrag van contactlijst instellen +Comment[nn]=Endra utsjånaden til kontaktlista Comment[pl]=Tutaj można zmienić wygląd i zachowanie listy kontaktów Comment[pt]=Configurar a Aparência e Comportamento da Lista de Contactos Comment[pt_BR]=Configure sua lista de contatos diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop --- kdenetwork-4.1.3/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop 2008-07-23 09:26:27.000000000 +0100 +++ kdenetwork-4.1.4/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -53,6 +53,7 @@ Comment[nb]=Sett opp videoenheter Comment[nds]=Videoreedschappen instellen Comment[nl]=Video-apparaten instellen +Comment[nn]=Set opp videoeiningar Comment[pa]=ਵਿਡੀਓ ਜੰਤਰ ਸੰਰਚਨਾ Comment[pl]=Konfiguracja urządzeń wideo Comment[pt]=Configurar os Dispositivos de Vídeo diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop --- kdenetwork-4.1.3/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop 2008-07-15 20:50:43.000000000 +0100 +++ kdenetwork-4.1.4/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -94,6 +94,7 @@ Comment[nds]=Kopete sien Bedregen topassen Comment[ne]=कोपेटको व्यवहारलाई अस्तित्व दिनुहोस् Comment[nl]=Het gedrag van Kopete instellen +Comment[nn]=Vel dine eigne innstillingar for åtferda til Kopete Comment[pl]=Tutaj możesz dostosować Kopete do osobistych preferencji Comment[pt]=Personalizar o Comportamento do Kopete Comment[pt_BR]=Personalização do comportamento do Kopete diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/kopete/config/chatwindow/kopete_chatwindowconfig.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/kopete/config/chatwindow/kopete_chatwindowconfig.desktop --- kdenetwork-4.1.3/kopete/kopete/config/chatwindow/kopete_chatwindowconfig.desktop 2008-07-15 20:50:44.000000000 +0100 +++ kdenetwork-4.1.4/kopete/kopete/config/chatwindow/kopete_chatwindowconfig.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -31,6 +31,7 @@ Name[nb]=Pratevindu Name[nds]=Klöönfinster Name[nl]=Gespreksvenster +Name[nn]=Pratevindauge Name[pa]=ਗੱਲਬਾਤ ਵਿੰਡੋ Name[pl]=Okno rozmowy Name[pt]=Janela de Conversação @@ -66,6 +67,7 @@ Comment[nb]=Sett opp pratevinduets utseende og oppførsel Comment[nds]=Dat Utsehn vun't Klöönfinster topassen Comment[nl]=Uiterlijk en gedrag van gespreksvenster instellen +Comment[nn]=Endra utsjånaden til pratevindauget Comment[pl]=Tutaj można zmienić wygląd i zachowanie okna rozmowy Comment[pt]=Configurar a Aparência e Comportamento da Janela de Conversação Comment[pt_BR]=Configure a aparência da janela de bate-papo diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/kopete/config/plugins/kopete_pluginconfig.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/kopete/config/plugins/kopete_pluginconfig.desktop --- kdenetwork-4.1.3/kopete/kopete/config/plugins/kopete_pluginconfig.desktop 2008-06-10 12:41:27.000000000 +0100 +++ kdenetwork-4.1.4/kopete/kopete/config/plugins/kopete_pluginconfig.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -36,6 +36,7 @@ Name[nb]=Programtillegg Name[nds]=Modulen Name[ne]=प्लगइन +Name[nn]=Programtillegg Name[oc]=Ajustons Name[pa]=ਪਲੱਗਇਨਾਂ Name[pl]=Wtyczki @@ -72,6 +73,7 @@ Comment[nb]=Velg og sett opp programtillegg Comment[nds]=Modulen utsöken un instellen Comment[nl]=Plugins selecteren en instellen +Comment[nn]=Vel og set opp programtillegg Comment[pa]=ਪਲੱਗਇਨ ਚੁਣੋ ਅਤੇ ਸੰਰਚਨਾ ਕਰੋ Comment[pl]=Wybór i konfiguracja wtyczek Comment[pt]=Seleccionar e Configurar os 'Plugins' diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/kopete/config/status/kopete_statusconfig.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/kopete/config/status/kopete_statusconfig.desktop --- kdenetwork-4.1.3/kopete/kopete/config/status/kopete_statusconfig.desktop 2008-08-28 09:08:02.000000000 +0100 +++ kdenetwork-4.1.4/kopete/kopete/config/status/kopete_statusconfig.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -53,6 +53,7 @@ Comment[nb]=Rediger dine statuser Comment[nds]=Dien Statussen plegen Comment[nl]=Beheer uw statussen +Comment[nn]=Handter statusane dine Comment[pl]=Zarządzanie statusami Comment[pt]=Gerir os Seus Estados Comment[pt_BR]=Gerencie todas as suas contas diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/kopete/kopete.notifyrc /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/kopete/kopete.notifyrc --- kdenetwork-4.1.3/kopete/kopete/kopete.notifyrc 2008-10-30 13:23:51.000000000 +0000 +++ kdenetwork-4.1.4/kopete/kopete/kopete.notifyrc 2009-01-06 16:21:30.000000000 +0000 @@ -22,6 +22,7 @@ Comment[mk]=Kopete гласник Comment[nb]=Kopete lynmeldingsprogram Comment[nds]=Kopete-Kortnarichtendeenst +Comment[nn]=Lynmeldingsprogrammet Kopete Comment[pa]=ਕੋਪੀਟੀ ਮੈਸੈਂਜਰ Comment[pl]=Komunikator Kopete Comment[pt]=Mensageiro Kopete @@ -63,6 +64,7 @@ Name[nb]=Gruppe Name[nds]=Koppel Name[nl]=Groep +Name[nn]=Gruppe Name[oc]=Grop Name[pa]=ਗਰੁੱਪ Name[pl]=Groupa @@ -100,6 +102,7 @@ Comment[nb]=Gruppa der kontakten holder til Comment[nds]=De Koppel vun den Kontakt Comment[nl]=De groep waarin de contact zich bevindt +Comment[nn]=Gruppa kontaktane ligg i Comment[pl]=Grupa, w której znajdują się kontakty Comment[pt]=O grupo onde reside o contacto Comment[pt_BR]=O grupo no qual o contato está inserido @@ -135,6 +138,7 @@ Name[lv]=Kontakts Name[nb]=Kontakt Name[nds]=Kontakt +Name[nn]=Kontakt Name[oc]=Contacte Name[pa]=ਸੰਪਰਕ Name[pl]=Kontakt @@ -172,6 +176,7 @@ Comment[nb]=Den oppgitte kontakten Comment[nds]=De angeven Kontakt Comment[nl]=De opgegeven contactpersoon +Comment[nn]=Den oppgjevne kontakten Comment[pa]=ਦਿੱਤਾ ਸੰਪਰਕ Comment[pl]=Podany kontakt Comment[pt]=O contacto indicado @@ -211,6 +216,7 @@ Name[nb]=Klasse Name[nds]=Klass Name[nl]=Klasse +Name[nn]=Klasse Name[pa]=ਕਲਾਸ Name[pl]=Klasa Name[pt]=Classe @@ -247,6 +253,7 @@ Comment[nb]=Meldingsklassen Comment[nds]=De Naricht ehr Klass Comment[nl]=De berichtenklasse +Comment[nn]=Meldingsklassen Comment[pl]=Klasa wiadomości Comment[pt]=A classe da mensagem Comment[pt_BR]=A classe de mensagens @@ -286,6 +293,7 @@ Name[nb]=Innkommende melding Name[nds]=Ankamen Naricht Name[nl]=Inkomend bericht +Name[nn]=Innkommande melding Name[pa]=ਆ ਰਿਹਾ ਸੁਨੇਹਾ Name[pl]=Wiadomość przychodząca Name[pt]=Mensagem Recebida @@ -328,6 +336,7 @@ Comment[nb]=En innkommende melding er mottatt Comment[nds]=En Naricht keem rin Comment[nl]=Er is een inkomend bericht ontvangen +Comment[nn]=Du har fått ei melding Comment[pl]=Nadeszła nowa wiadomość Comment[pt]=Foi recebida uma mensagem Comment[pt_BR]=chegou nova mensagem @@ -372,6 +381,7 @@ Name[nb]=Innkommende melding i aktiv prat Name[nds]=Ankamen Naricht binnen aktiev Klöönsnack Name[nl]=Inkomend bericht in actief gesprek +Name[nn]=Innkommande melding i aktiv prat Name[pl]=Wiadomość przychodząca na aktywnym czacie Name[pt]=Mensagem Recebida na Conversa Activa Name[pt_BR]=Mensagem recebida no bate-papo ativo @@ -404,6 +414,7 @@ Comment[nb]=En innkommende melding er mottatt i et aktivt pratevindu Comment[nds]=En Naricht keem na't aktive Klöönfinster rin Comment[nl]=Er is een inkomend bericht ontvangen in het actieve gespreksvenster +Comment[nn]=Du har fått ei melding i det aktive pratevindauget Comment[pl]=Nadeszła nowa wiadomość w aktywnym oknie czatu Comment[pt]=Foi recebida uma mensagem na janela de conversação activa Comment[pt_BR]=Uma mensagem chegou na janela de bate-papo ativa @@ -444,6 +455,7 @@ Name[nb]=Utgående melding Name[nds]=Rutgahn Naricht Name[nl]=Uitgaand bericht +Name[nn]=Utgåande melding Name[pa]=ਜਾ ਰਿਹਾ ਸੁਨੇਹਾ Name[pl]=Wiadomość wychodząca Name[pt]=Mensagem Enviada @@ -486,6 +498,7 @@ Comment[nb]=En utgående melding er sendt Comment[nds]=En Naricht wöör afschickt Comment[nl]=Er is een uitgaand bericht verzonden +Comment[nn]=Du har sendt ei melding Comment[pl]=Wiadomość została wysłana Comment[pt]=Foi enviada uma mensagem Comment[pt_BR]=mensagem enviada @@ -532,6 +545,7 @@ Name[nb]=Kontakt er på nett Name[nds]=Kontakt hett sik tokoppelt Name[nl]=Contactpersoon online gegaan +Name[nn]=Kontakten er tilkopla Name[pa]=ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਇਆ Name[pl]=Użytkownik stał się dostępny Name[pt]=Notas do Contacto @@ -574,6 +588,7 @@ Comment[nb]=En kontakt har koblet seg til nettet Comment[nds]=En Kontakt hett sik tokoppelt Comment[nl]=Er is een contactpersoon online gegaan +Comment[nn]=Ein kontakt er no tilkopla Comment[pa]=ਇੱਕ ਸੰਪਰਕ ਆਨ-ਲਾਇਨ ਹੋ ਗਿਆ ਹੈ Comment[pl]=Użytkownik stał się dostępny Comment[pt]=Ligou-se um contacto @@ -622,6 +637,7 @@ Name[mk]=Не на линија Name[nb]=Frakoblet Name[nds]=Afkoppelt +Name[nn]=Fråkopla Name[oc]=Desconnectat Name[pa]=ਆਫਲਾਇਨ Name[pl]=Niedostępny @@ -670,6 +686,7 @@ Comment[nb]=En kontakt er frakoblet nettet Comment[nds]=En Kontakt hett sik afkoppelt Comment[nl]=Er is een contactpersoon offline gegaan +Comment[nn]=Ein kontakt er no fråkopla Comment[pa]=ਇੱਕ ਸੰਪਰਕ ਆਫਲਾਇਨ ਹੋਇਆ Comment[pl]=Użytkownik stał się niedostępny Comment[pt]=Desligou-se um contacto @@ -721,6 +738,7 @@ Name[nb]=Statusendring Name[nds]=Statusännern Name[nl]=Statuswijziging +Name[nn]=Statusendring Name[pl]=Zmiana statusu Name[pt]=Mudança de Estado Name[pt_BR]=Mudança de Status @@ -768,6 +786,7 @@ Comment[nb]=En kontakts nettstatus er endret Comment[nds]=De Tokoppel-Status vun en Kontakt hett sik ännert Comment[nl]=De online status van een contactpersoon is gewijzigd +Comment[nn]=Ein kontakt har endra statusen sin Comment[pl]=Użytkownik zmienił swój stan Comment[pt]=Mudou o estado de ligação de um contacto Comment[pt_BR]=O usuário mudou o seu status de on-line @@ -823,7 +842,7 @@ Name[nds]=Rutheven Name[ne]=हाइलाइट Name[nl]=Aanwijzen -Name[nn]=Marker +Name[nn]=Markert melding Name[pa]=ਹਾਈਲਾਇਟ Name[pl]=Podświetlenie Name[pt]=Realce @@ -874,6 +893,7 @@ Comment[nb]=En framhevet melding er mottatt Comment[nds]=En rutheevt Naricht keem rin Comment[nl]=Er is een geaccentueerd bericht ontvangen +Comment[nn]=Du har fått ei markert melding Comment[pl]=Podświetlona wiadomość została odebrana Comment[pt]=Foi recebida uma mensagem realçada Comment[pt_BR]=Uma mensagem de destaque foi recebida @@ -919,6 +939,7 @@ Name[nb]=Meldinger med lav prioritet Name[nds]=Narichten mit siet Prioriteet Name[nl]=Berichten met lage prioriteit +Name[nn]=Melding med låg prioritet Name[pa]=ਘੱਟ ਤਰਜੀਹ ਸੁਨੇਹੇ Name[pl]=Wiadomości o niskim priorytecie Name[pt]=Mensagens de Baixa Prioridade @@ -960,6 +981,7 @@ Comment[nb]=En melding merket med lav prioritet er mottatt Comment[nds]=En Naricht mit siete Prioriteet keem rin Comment[nl]=Een bericht gemarkeerd met een lage prioriteit is ontvangen +Comment[nn]=Du har fått ei melding med låg prioritet Comment[pl]=Otrzymana została wiadomość o niskim priorytecie Comment[pt]=Foi recebida uma mensagem marcada com prioridade baixa Comment[pt_BR]=Chegou uma mensagem marcada com baixa prioridade @@ -994,6 +1016,7 @@ Name[he]=דוא"ל של Yahoo Name[hi]=याहू मेल Name[is]=Yahoo póstur +Name[it]=Posta Yahoo Name[ja]=Yahoo メール Name[km]=សំបុត្រ​យ៉ាហ៊ូ Name[ko]=Yahoo 메일 @@ -1044,6 +1067,7 @@ Comment[nb]=Ny e-post er mottatt i Yahoo-innkurven. Comment[nds]=Du hest niege Nettpost in Dien Yahoo-Postingang Comment[nl]=Er is een nieuw bericht gearriveerd in uw Yahoo-postbus +Comment[nn]=Du har fått ein ny e-post i Yahoo-innboksen din Comment[pl]=Nadeszła nowa wiadomość do Twojej skrzynki odbiorczej w Yahoo Comment[pt]=Foi recebido um e-mail novo na sua caixa de correio do Yahoo Comment[pt_BR]=Chegou um novo e-mail em sua caixa de entrada do Yahoo @@ -1133,6 +1157,7 @@ Comment[nb]=Ny e-post er mottatt i MSN-innkurven Comment[nds]=Du hest niege Nettpost in Dien MSN-Postingang Comment[nl]=Er is een nieuw bericht gearriveerd in uw MSN-postbus +Comment[nn]=Du har fått ein ny e-post i MSN-innboksen din Comment[pl]=Nadeszła nowa wiadomość do Twojej skrzynki odbiorczej w MSN Comment[pt]=Foi recebido um e-mail novo na sua caixa de correio do MSN Comment[pt_BR]=chegou um novo e-mail em sua caixa de entrada MSN @@ -1181,6 +1206,7 @@ Name[nb]=ICQ-autorisasjon Name[nds]=ICQ-Identifikatschoon Name[nl]=ICQ-autorisatie +Name[nn]=ICQ-godkjenning Name[pa]=ICQ ਪਰਮਾਣਕਿਤਾ Name[pl]=Autoryzacja ICQ Name[pt]=Autorização do ICQ @@ -1224,6 +1250,7 @@ Comment[nb]=En ICQ-bruker har autorisert/avvist din forespørsel om autorisasjon Comment[nds]=En ICQ-Bruker hett Dien Identifikatschoonanfraag tolaten/afwiest Comment[nl]=Een ICQ-gebruiker heeft uw autorisatieverzoek geaccepteerd of verworpen +Comment[nn]=Ein ICQ-brukar har godkjent/avslått førespurnaden din Comment[pl]=Użytkownik ICQ zaakceptował/odrzucił Twoje żądanie autoryzacji Comment[pt]=Um utilizador do ICQ autorizou/recusou o seu pedido de autorização Comment[pt_BR]=Um usuário do ICQ aceitou/declinou seu pedido de autorização @@ -1269,6 +1296,7 @@ Name[nb]=IRC-hendelse Name[nds]=Klöön-Begeefnis Name[nl]=IRC-gebeurtenis +Name[nn]=IRC-hending Name[pa]=IRC ਈਵੈਂਟ Name[pl]=Zdarzenie IRC Name[pt]=Evento do IRC @@ -1313,6 +1341,7 @@ Comment[nb]=Det har foregått en IRC-hendelse Comment[nds]=Dat hett en IRC-Begeefnis geven Comment[nl]=Er deed zich een IRC-gebeurtenis voor +Comment[nn]=Det har skjedd ei IRC-hending Comment[pl]=Wystąpiło zdarzenie IRC-a Comment[pt]=Ocorreu um evento do IRC Comment[pt_BR]=Um evento do IRC ocorreu @@ -1359,6 +1388,7 @@ Name[nb]=Tilkoblingsfeil Name[nds]=Verbinnen-Fehler Name[nl]=Verbindingsfout +Name[nn]=Tilkoplingsfeil Name[oc]=Error de connexion Name[pa]=ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ Name[pl]=Błąd łączenia @@ -1404,6 +1434,7 @@ Comment[nb]=Det har oppstått en tilkoblingsfeil Comment[nds]=Dat hett en Verbinnenfehler geven Comment[nl]=Er deed zich een fout in de verbinding voor +Comment[nn]=Det oppstod ein feil med tilkoplinga Comment[pl]=Wystąpił błąd przy łączeniu Comment[pt]=Ocorreu um erro na ligação Comment[pt_BR]=Ocorreu um erro na conexão @@ -1453,6 +1484,7 @@ Name[nb]=Forbindelse gått ned Name[nds]=Verbinnen afreten Name[nl]=Verbinding verbroken +Name[nn]=Mista tilkoplinga Name[pa]=ਕੁਨੈਕਸ਼ਨ ਟੁੱਟਿਆ Name[pl]=Połączenie utracone Name[pt]=Ligação Perdida @@ -1493,6 +1525,7 @@ Comment[nb]=Forbindelsen er gått ned Comment[nds]=De Verbinnen is afreten Comment[nl]=De verbinding is verbroken +Comment[nn]=Tilkoplinga vart mista Comment[pl]=Połączenie zostało przerwane Comment[pt]=A ligação perdeu-se Comment[pt_BR]=A conexão caiu @@ -1536,6 +1569,7 @@ Name[nb]=Kan ikke koble til Name[nds]=Tokoppeln nich mööglich Name[nl]=Verbinden niet mogelijk +Name[nn]=Klarer ikkje kopla til Name[pa]=ਕੁਨੈਕਟ ਨਹੀਂ ਹੋ ਸਕਦਾ Name[pl]=Nie można się połączyć Name[pt]=Não é Possível Ligar-se @@ -1580,6 +1614,7 @@ Comment[nb]=Kopete kan ikke koble til tjenesten Comment[nds]=Kopete kann sik nich na den Deenst tokoppeln Comment[nl]=Kopete kan geen verbinding met de dienst maken +Comment[nn]=Kopete klarer ikkje kopla til tenesta Comment[pl]=Kopete nie może się połączyć z usługą Comment[pt]=O Kopete não se consegue ligar ao serviço Comment[pt_BR]=O Kopete não pode conectar-se ao serviço @@ -1627,6 +1662,7 @@ Name[nb]=Nettverksproblemer Name[nds]=Nettwarkproblemen Name[nl]=Netwerkproblemen +Name[nn]=Nettverksproblem Name[pa]=ਨੈੱਟਵਰਕ ਸਮੱਸਿਆ Name[pl]=Problemy sieci Name[pt]=Problemas de Rede @@ -1671,6 +1707,7 @@ Comment[nb]=Det er problemer på nettverket Comment[nds]=As dat lett gifft dat Nettwarkproblemen Comment[nl]=Het netwerk ondervindt problemen +Comment[nn]=Det er problem med nettverket Comment[pl]=W sieci występują problemy Comment[pt]=A rede está com problemas Comment[pt_BR]=A rede está com problemas @@ -1714,6 +1751,7 @@ Name[nb]=Intern tjenerfeil Name[nds]=Serverintern Fehler Name[nl]=Interne serverfout +Name[nn]=Internfeil på tenaren Name[pa]=ਸਰਵਰ ਅੰਦਰੂਨੀ ਗਲਤੀ Name[pl]=Wewnętrzny błąd serwera Name[pt]=Erro Interno do Servidor @@ -1752,6 +1790,7 @@ Comment[nb]=Det har oppstått en intern feil på tjenesten Comment[nds]=Dat hett binnen den Deenst en Fehler geven Comment[nl]=Er deed zich een interne fout voor op de server +Comment[nn]=Det oppstod ein internfeil på tenaren Comment[pl]=Wystąpił błąd wewnętrzny usługi Comment[pt]=Ocorreu um erro interno do serviço Comment[pt_BR]=Ocorreu um erro interno de serviço @@ -1791,6 +1830,7 @@ Name[nb]=Ring/dytt Name[nds]=Anstoot Name[nl]=Buzzer +Name[nn]=Rist Name[pl]=Pobudka/kuksaniec Name[pt]=Apito/Abanão Name[pt_BR]=Pedir Atenção (Buzinar/Tremer) @@ -1829,6 +1869,7 @@ Comment[nb]=En kontakt har sendt deg en dytt/ringesignal Comment[nds]=En Bruker will wat vun Di. Comment[nl]=Een contactpersoon heeft u een buzzer gestuurd. +Comment[nn]=Ein kontakt har rista deg. Comment[pl]=Użytkownik wysłał ci pobudkę/kuksańca. Comment[pt]=Um contacto enviou-lhe um apito/abanão. Comment[pt_BR]=Um contato lhe enviou um pedido de atenção. @@ -1870,6 +1911,7 @@ Name[nb]=Melding filtrert ut Name[nds]=Naricht utschutert Name[nl]=Bericht geweigerd +Name[nn]=Fjerna melding Name[pl]=Wiadomość odrzucona Name[pt]=Mensagem Perdida Name[pt_BR]=Mensagem descartada @@ -1905,9 +1947,10 @@ Comment[nb]=Programtillegget for personvern filtrerte bort en melding Comment[nds]=En Naricht wöör vun dat Privaatrebeetmoduul utschutert Comment[nl]=Er is een bericht gefilterd door de privacyplugin +Comment[nn]=Ei melding vart filtrert vekk av personvernstillegget Comment[pl]=Wiadomość została odrzucona przez wtyczkę do ochrony prywatności Comment[pt]=Foi filtrada uma mensagem pelo 'Plugin' de Privacidade -Comment[pt_BR]=Uma mensagem foi filtrada pelo plugin de privacidade +Comment[pt_BR]=Uma mensagem foi filtrada pelo plug-in de privacidade Comment[ru]=Сообщение было отфильтровано модулем Comment[sl]=Sporočilo je ostalo na filtru vstavka Zasebnost Comment[sv]=Ett meddelande filtrerades av integritetsinsticksprogrammet @@ -1943,6 +1986,7 @@ Name[nb]=ICQ leser status Name[nds]=ICQ-Status leest Name[nl]=ICQ-leesstatus +Name[nn]=ICQ-statuslesing Name[pl]=Odczyt statusu ICQ Name[pt]=Estado da leitura do ICQ Name[pt_BR]=Estado de leitura do ICQ @@ -1978,6 +2022,7 @@ Comment[nb]=En ICQ-bruker leser din statusmelding Comment[nds]=En ICQ-Bruker leest Dien Statusbescheed Comment[nl]=Een ICQ-gebruiker leest uw statusbericht +Comment[nn]=Ein ICQ-brukar les statusmeldinga di Comment[pl]=Użytkownik ICQ odczytuje Twoją wiadomość statusu Comment[pt]=Um utilizador de ICQ está a ler a sua mensagem de estado Comment[pt_BR]=Um usuário do ICQ está lendo sua mensagem de estado @@ -2013,6 +2058,7 @@ Name[nb]=Tjenestemelding Name[nds]=Deenst-Mellen Name[nl]=Dienstmededeling +Name[nn]=Tenestemelding Name[pl]=Wiadomość usługowa Name[pt]=Mensagem do Serviço Name[pt_BR]=Mensagem do serviço @@ -2036,7 +2082,7 @@ Comment[ga]=Fuarthas teachtaireacht sheirbhíse (m.sh. iarratas údaraithe) Comment[gl]=Recibeuse unha mensaxe do servizo (p. ex. un pedido de autorización) Comment[hu]=Szolgáltatásüzenet érkezett (pl. felhasználóazonosítási kérés) -Comment[it]=È stato ricevuto un messaggio di servizio (ad es, una richiesta di autorizzazione) +Comment[it]=È stato ricevuto un messaggio di servizio (ad es una richiesta di autorizzazione) Comment[ja]=サービスメッセージ (例: 認可要求) を受け取りました Comment[km]=បាន​ទទួល​សារ​សេវា (ឧ. សំណើ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ) Comment[ko]=인증 요청 같은 서비스 메시지를 받음 @@ -2045,6 +2091,7 @@ Comment[nb]=En tjenestemelding er mottatt (f.eks. forespørsel om autorisasjon) Comment[nds]=En Deenst-Mellen keem rin (a.B. en Identifikatschoonanfraag) Comment[nl]=Er is een dienstmededeling (zoals een autorisatieverzoek) ontvangen +Comment[nn]=Du har fått ei tenestemelding (for eksempel ein førespurnad om godkjenning) Comment[pl]=Otrzymano wiadomość usługową (np. żądanie uwierzytelnienia) Comment[pt]=Foi recebida uma mensagem do serviço (p.ex., um pedido de autorização) Comment[pt_BR]=Uma mensagem de serviço foi recebida (p.e. pedido de autorização) diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/kopete/kopetewindow.cpp /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/kopete/kopetewindow.cpp --- kdenetwork-4.1.3/kopete/kopete/kopetewindow.cpp 2008-07-17 22:32:55.000000000 +0100 +++ kdenetwork-4.1.4/kopete/kopete/kopetewindow.cpp 2009-01-06 16:21:30.000000000 +0000 @@ -572,7 +572,7 @@ d->autoHideTimeout = Kopete::AppearanceSettings::self()->contactListAutoHideTimeout(); - QString tmp = cg.readEntry ( "State", "Shown" ); + QString tmp = cg.readEntry ( "WindowState", "Shown" ); if ( tmp == "Minimized" && Kopete::BehaviorSettings::self()->showSystemTray() ) { showMinimized(); @@ -603,15 +603,15 @@ if ( isMinimized() ) { - cg.writeEntry ( "State", "Minimized" ); + cg.writeEntry ( "WindowState", "Minimized" ); } else if ( isHidden() ) { - cg.writeEntry ( "State", "Hidden" ); + cg.writeEntry ( "WindowState", "Hidden" ); } else { - cg.writeEntry ( "State", "Shown" ); + cg.writeEntry ( "WindowState", "Shown" ); } Kopete::Identity *identity = d->identitywidget->identity(); diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/libkopete/CMakeLists.txt /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/libkopete/CMakeLists.txt --- kdenetwork-4.1.3/kopete/libkopete/CMakeLists.txt 2008-08-28 09:08:01.000000000 +0100 +++ kdenetwork-4.1.4/kopete/libkopete/CMakeLists.txt 2009-01-06 16:21:30.000000000 +0000 @@ -140,7 +140,7 @@ set_target_properties(kopete PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} - ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kdeui" + ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "${KDE4_KDEUI_LIBS}" ) if(MSVC) set_target_properties(kopete PROPERTIES diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/libkopete/avdevice/videodevice.cpp /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/libkopete/avdevice/videodevice.cpp --- kdenetwork-4.1.3/kopete/libkopete/avdevice/videodevice.cpp 2008-02-14 14:36:22.000000000 +0000 +++ kdenetwork-4.1.4/kopete/libkopete/avdevice/videodevice.cpp 2009-01-06 16:21:30.000000000 +0000 @@ -985,6 +985,9 @@ break; case IO_METHOD_READ: // kDebug() << "Using IO_METHOD_READ.File descriptor: " << descriptor << " Buffer address: " << &m_currentbuffer.data[0] << " Size: " << m_currentbuffer.data.size(); + if (m_currentbuffer.data.isEmpty()) + return EXIT_FAILURE; + bytesread = read (descriptor, &m_currentbuffer.data[0], m_currentbuffer.data.size()); if (-1 == bytesread) // must verify this point with ov511 driver. { @@ -1027,8 +1030,10 @@ /* if (v4l2buffer.index < m_streambuffers) return EXIT_FAILURE;*/ //it was an assert() // kDebug() << "m_rawbuffers[" << v4l2buffer.index << "].start: " << (void *)m_rawbuffers[v4l2buffer.index].start << " Size: " << m_currentbuffer.data.size(); + if (m_currentbuffer.data.isEmpty() || v4l2buffer.index < 0 || m_rawbuffers.size() <= v4l2buffer.index) + return EXIT_FAILURE; -memcpy(&m_currentbuffer.data[0], m_rawbuffers[v4l2buffer.index].start, m_currentbuffer.data.size()); + memcpy(&m_currentbuffer.data[0], m_rawbuffers[v4l2buffer.index].start, m_currentbuffer.data.size()); if (-1 == xioctl (VIDIOC_QBUF, &v4l2buffer)) return errnoReturn ("VIDIOC_QBUF"); #endif @@ -1053,6 +1058,9 @@ return errnoReturn ("VIDIOC_DQBUF"); } } + if (m_rawbuffers.size() < m_streambuffers) + return EXIT_FAILURE; + for (i = 0; i < m_streambuffers; ++i) if (v4l2buffer.m.userptr == (unsigned long) m_rawbuffers[i].start && v4l2buffer.length == m_rawbuffers[i].length) break; @@ -1446,7 +1454,8 @@ { kDebug() << " Device is open. Trying to properly shutdown the device."; stopCapturing(); - kDebug() << "::close() returns " << ::close(descriptor); + int ret = ::close(descriptor); + kDebug() << "::close() returns " << ret; } descriptor = -1; return EXIT_SUCCESS; diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/libkopete/kopetepluginmanager.cpp /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/libkopete/kopetepluginmanager.cpp --- kdenetwork-4.1.3/kopete/libkopete/kopetepluginmanager.cpp 2008-10-30 13:23:52.000000000 +0000 +++ kdenetwork-4.1.4/kopete/libkopete/kopetepluginmanager.cpp 2009-01-06 16:21:30.000000000 +0000 @@ -62,14 +62,17 @@ if ( shutdownMode != DoneShutdown ) kWarning( 14010 ) << "Destructing plugin manager without going through the shutdown process! Backtrace is: " << endl << kBacktrace(); - // Quick cleanup of the remaining plugins, hope it helps - // Note that deleting it.value() causes slotPluginDestroyed to be called, which - // removes the plugin from the list of loaded plugins. + // Clean up loadedPlugins manually, because PluginManager can't access our global + // static once this destructor has started. while ( !loadedPlugins.empty() ) { InfoToPluginMap::ConstIterator it = loadedPlugins.begin(); kWarning( 14010 ) << "Deleting stale plugin '" << it.value()->objectName() << "'"; - delete it.value(); + KPluginInfo info = it.key(); + Plugin *plugin = it.value(); + loadedPlugins.remove(info); + plugin->disconnect(&instance, SLOT(slotPluginDestroyed(QObject*))); + delete plugin; } } @@ -245,10 +248,6 @@ { kDebug( 14010 ) ; - // Disconnect any remaining plugins (bug 172011). - for ( PluginManagerPrivate::InfoToPluginMap::ConstIterator it = _kpmp->loadedPlugins.begin(); it != _kpmp->loadedPlugins.end(); ++it ) - disconnect( it.value(), SIGNAL(destroyed(QObject*)), this, 0 ); - _kpmp->shutdownMode = PluginManagerPrivate::DoneShutdown; KGlobal::deref(); diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/libkopete/kopeteprotocol.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/libkopete/kopeteprotocol.desktop --- kdenetwork-4.1.3/kopete/libkopete/kopeteprotocol.desktop 2008-06-10 12:41:30.000000000 +0100 +++ kdenetwork-4.1.4/kopete/libkopete/kopeteprotocol.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -26,7 +26,7 @@ Comment[hr]=Umetak za Kopete protokol Comment[hu]=Kopete protokollkezelő modul Comment[is]=Íforrit fyrir Kopete samskiptamátann -Comment[it]=Estensione del protocollo di Kopete +Comment[it]=Estensione di protocollo di Kopete Comment[ja]=Kopete プロトコルプラグイン Comment[kk]=Kopete протоколының плагин модулі Comment[km]=កម្មវិធី​ជំនួយ​ពិធីការ Kopete @@ -42,7 +42,7 @@ Comment[pa]=ਕੋਪੀਟੀ ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ Comment[pl]=Wtyczka protokołu Kopete Comment[pt]='Plugin' de Protocolo do Kopete -Comment[pt_BR]=Plugin do Protocolo do Kopete +Comment[pt_BR]=Plug-in do Protocolo do Kopete Comment[ru]=Модуль протокола Kopete Comment[se]=Kopete protokollalassemoduvla Comment[sk]=Modul protokolu Kopete diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/libkopete/kopeteui.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/libkopete/kopeteui.desktop --- kdenetwork-4.1.3/kopete/libkopete/kopeteui.desktop 2008-06-10 12:41:30.000000000 +0100 +++ kdenetwork-4.1.4/kopete/libkopete/kopeteui.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -25,7 +25,7 @@ Comment[hr]=Umetak za Kopeteovo korisničko sučelje Comment[hu]=Kopete-modul a grafikus felülethez Comment[is]=Viðmótsíforrit fyrir Kopete -Comment[it]=Estensione per UI di Kopete +Comment[it]=Estensione di interfaccia di Kopete Comment[ja]=Kopete UI プラグイン Comment[kk]=Kopete интерфейсінің плагин модулі Comment[km]=កម្មវិធី​ជំនួយ​ចំណុច​ប្រទាក់​អ្នក​ប្រើ​របស់ Kopete diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/libkopete/kopeteversion.h /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/libkopete/kopeteversion.h --- kdenetwork-4.1.3/kopete/libkopete/kopeteversion.h 2008-10-30 13:23:52.000000000 +0000 +++ kdenetwork-4.1.4/kopete/libkopete/kopeteversion.h 2009-01-06 16:21:30.000000000 +0000 @@ -14,10 +14,10 @@ #ifndef _KOPETE_VERSION_H_ #define _KOPETE_VERSION_H_ -#define KOPETE_VERSION_STRING "0.60.3" +#define KOPETE_VERSION_STRING "0.60.4" #define KOPETE_VERSION_MAJOR 0 #define KOPETE_VERSION_MINOR 60 -#define KOPETE_VERSION_RELEASE 3 +#define KOPETE_VERSION_RELEASE 4 #define KOPETE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define KOPETE_VERSION \ diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/addbookmarks/kopete_addbookmarks.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/addbookmarks/kopete_addbookmarks.desktop --- kdenetwork-4.1.3/kopete/plugins/addbookmarks/kopete_addbookmarks.desktop 2008-07-08 10:55:19.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/addbookmarks/kopete_addbookmarks.desktop 2009-01-06 16:21:27.000000000 +0000 @@ -77,7 +77,7 @@ Comment[hi]=आनेवाले संदेशों में कड़ियों को स्वचालित पसंदीदा बनाएँ Comment[hu]=Könyvjelző létrehozása a bejövő üzenetekben található linkekhez Comment[is]=Setja sjálfkrafa bókamerki á tengla í skilaboðum -Comment[it]=Aggiungi automaticamente al segnalibro i collegamenti nei messaggi in entrata +Comment[it]=Aggiunge automaticamente ai segnalibri i collegamenti nei messaggi in entrata Comment[ja]=受信メッセージ中のリンクを自動的にブックマークに追加 Comment[kk]=Кіріс хабарламалардағы сілтемелерді автоматты түрде бетбелгілеу Comment[km]=ចំណាំ​តំណ​នៅ​ក្នុង​សារ​ចូល ដោយ​ស្វ័យប្រវត្តិ @@ -89,7 +89,7 @@ Comment[nds]=Links in rinkamen Narichten automaatsch de Leestekens tofögen Comment[ne]=आगमन सन्देशमा स्वचालित पुस्तकचिनो लिङ्क Comment[nl]=Koppelingen in inkomende berichten automatisch als bladwijzer opslaan -Comment[nn]=Lag automatisk bokmerke til lenkjer i innkomande meldingar +Comment[nn]=Lag automatisk bokmerke til lenkjer i innkommande meldingar Comment[pl]=Automatycznie dodawaj zakładkę dla odnośników w nadchodzących komunikatach Comment[pt]=Adicionar automaticamente aos favoritos as ligações em mensagens recebidas Comment[pt_BR]=Adiciona automaticamente aos favoritos os links em mensagens recebidas diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop --- kdenetwork-4.1.3/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop 2008-07-08 10:55:19.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop 2009-01-06 16:21:27.000000000 +0000 @@ -77,7 +77,7 @@ Comment[hi]=आनेवाले संदेशों में कड़ियों को स्वचालित पसंदीदा बनाएँ Comment[hu]=Könyvjelző létrehozása a bejövő üzenetekben található linkekhez Comment[is]=Setja sjálfkrafa bókamerki á tengla í skilaboðum -Comment[it]=Aggiungi automaticamente al segnalibro i collegamenti nei messaggi in entrata +Comment[it]=Aggiunge automaticamente ai segnalibri i collegamenti nei messaggi in entrata Comment[ja]=受信メッセージ中のリンクを自動的にブックマークに追加 Comment[kk]=Кіріс хабарламалардағы сілтемелерді автоматты түрде бетбелгілеу Comment[km]=ចំណាំ​តំណ​នៅ​ក្នុង​សារ​ចូល ដោយ​ស្វ័យប្រវត្តិ @@ -89,7 +89,7 @@ Comment[nds]=Links in rinkamen Narichten automaatsch de Leestekens tofögen Comment[ne]=आगमन सन्देशमा स्वचालित पुस्तकचिनो लिङ्क Comment[nl]=Koppelingen in inkomende berichten automatisch als bladwijzer opslaan -Comment[nn]=Lag automatisk bokmerke til lenkjer i innkomande meldingar +Comment[nn]=Lag automatisk bokmerke til lenkjer i innkommande meldingar Comment[pl]=Automatycznie dodawaj zakładkę dla odnośników w nadchodzących komunikatach Comment[pt]=Adicionar automaticamente aos favoritos as ligações em mensagens recebidas Comment[pt_BR]=Adiciona automaticamente aos favoritos os links em mensagens recebidas diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/autoreplace/kopete_autoreplace.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/autoreplace/kopete_autoreplace.desktop --- kdenetwork-4.1.3/kopete/plugins/autoreplace/kopete_autoreplace.desktop 2008-07-08 10:55:20.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/autoreplace/kopete_autoreplace.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -36,7 +36,7 @@ Name[hr]=Automatska zamijena Name[hu]=Automatikus szövegcsere Name[is]=Skipta sjálfkrafa út -Name[it]=Sostituisci automaticamente +Name[it]=Sostituzione automatica Name[ja]=自動置換 Name[kk]=Авто алмастыру Name[km]=ជំនួស​ស្វ័យប្រវត្តិ @@ -93,7 +93,7 @@ Comment[hr]=Automatska zamjena teksta kojeg odaberete Comment[hu]=A beállított szövegeket automatikusan lecseréli Comment[is]=Skiptir sjálfkrafa út þeim texta sem þú velur -Comment[it]=Sostituisci automaticamente del testo a scelta +Comment[it]=Sostituisce automaticamente del testo a scelta Comment[ja]=選択したテキストを自動置換 Comment[kk]=Таңдаған мәтінді автоматты түрде алмастыру Comment[km]=ជំនួស​អត្ថបទ​ដែល​អ្នក​អាច​ជ្រើស ដោយ​ស្វ័យប្រវត្តិ diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/autoreplace/kopete_autoreplace_config.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/autoreplace/kopete_autoreplace_config.desktop --- kdenetwork-4.1.3/kopete/plugins/autoreplace/kopete_autoreplace_config.desktop 2008-07-08 10:55:20.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/autoreplace/kopete_autoreplace_config.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -30,7 +30,7 @@ Name[hr]=Automatska zamijena Name[hu]=Automatikus szövegcsere Name[is]=Skipta sjálfkrafa út -Name[it]=Sostituisci automaticamente +Name[it]=Sostituzione automatica Name[ja]=自動置換 Name[kk]=Авто алмастыру Name[km]=ជំនួស​ស្វ័យប្រវត្តិ @@ -87,7 +87,7 @@ Comment[hr]=Automatska zamjena teksta kojeg odaberete Comment[hu]=A kiválasztott szövegeket automatikusan lecseréli Comment[is]=Skiptir sjálfkrafa út þeim texta sem þú velur -Comment[it]=Sostituisci automaticamente del testo a scelta +Comment[it]=Sostituisce automaticamente del testo a scelta Comment[ja]=選択したテキストを自動置換 Comment[kk]=Таңдаған мәтінді автоматты түрде алмастыру Comment[km]=ជំនួស​អត្ថបទ​ដែល​អ្នក​អាច​ជ្រើស ដោយ​ស្វ័យប្រវត្តិ diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/highlight/kopete_highlight.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/highlight/kopete_highlight.desktop --- kdenetwork-4.1.3/kopete/plugins/highlight/kopete_highlight.desktop 2008-06-10 12:41:27.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/highlight/kopete_highlight.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -49,7 +49,7 @@ Name[nds]=Rutheven Name[ne]=हाइलाइट Name[nl]=Aanwijzen -Name[nn]=Marker +Name[nn]=Markert melding Name[pa]=ਹਾਈਲਾਇਟ Name[pl]=Podświetlenie Name[pt]=Realce diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/highlight/kopete_highlight_config.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/highlight/kopete_highlight_config.desktop --- kdenetwork-4.1.3/kopete/plugins/highlight/kopete_highlight_config.desktop 2008-06-10 12:41:27.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/highlight/kopete_highlight_config.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -43,7 +43,7 @@ Name[nds]=Rutheven Name[ne]=हाइलाइट Name[nl]=Aanwijzen -Name[nn]=Marker +Name[nn]=Markert melding Name[pa]=ਹਾਈਲਾਇਟ Name[pl]=Podświetlenie Name[pt]=Realce @@ -86,7 +86,7 @@ Comment[hr]=Isticanje poruka na osnovu filtera Comment[hu]=Szövegkiemelés üzenetekben megadott szempontok szerint Comment[is]=Merkir texta með tilliti til síunar -Comment[it]=Evidenzia i testi attraverso dei filtri +Comment[it]=Evidenzia del testo usando filtri Comment[ja]=条件に従ってテキストを強調 Comment[kk]=Сүзгі көмегімен мәтінді бояулау Comment[km]=សារ​សំខាន់​ដែល​ផ្អែក​លើ​តម្រង diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/history/kopete_history.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/history/kopete_history.desktop --- kdenetwork-4.1.3/kopete/plugins/history/kopete_history.desktop 2008-06-10 12:41:27.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/history/kopete_history.desktop 2009-01-06 16:21:27.000000000 +0000 @@ -96,7 +96,7 @@ Comment[hr]=Upisuje u dnevnik sve poruke kako biste vodili evidenciju o svojim razgovorima Comment[hu]=Az üzenetek eltárolása Comment[is]=Halda til haga samskiptaannál -Comment[it]=Effettua il log di tutti i messaggi in modo da avere traccia delle tue conversazioni +Comment[it]=Registra tutti i messaggi per avere traccia delle tue conversazioni Comment[ja]=会話を残すためにメッセージのログを取る Comment[kk]=Хабарласу барысын журналға жазып отыру Comment[km]=ចុះ​កំណត់​ហេតុ​សារ​ទាំងអស់ ដើម្បី​តាមដាន​ការ​សន្ទនា​របស់​អ្នក diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/history/kopete_history_config.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/history/kopete_history_config.desktop --- kdenetwork-4.1.3/kopete/plugins/history/kopete_history_config.desktop 2008-06-10 12:41:27.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/history/kopete_history_config.desktop 2009-01-06 16:21:27.000000000 +0000 @@ -108,7 +108,7 @@ Comment[pa]=ਅਤੀਤ ਪਲੱਗਇਨ Comment[pl]=Wtyczka historii Comment[pt]='Plugin' de Histórico -Comment[pt_BR]=Plugin de Histórico +Comment[pt_BR]=Plug-in de Histórico Comment[ru]=Модуль журналирования Comment[se]=Historihkkalassemoduvla Comment[sk]=Modul histórie diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/otr/kopete_otr.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/otr/kopete_otr.desktop --- kdenetwork-4.1.3/kopete/plugins/otr/kopete_otr.desktop 2008-08-28 09:08:01.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/otr/kopete_otr.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -34,6 +34,7 @@ Comment[nb]=Krypter prateøkter med Off-The-Record-kryptering Comment[nds]=Verslötelt Klööntörns mit "Off-The-Record"- (engl. Buten-Protokoll-)Verslöteln Comment[nl]=Versleutel gesprekken met Off-The-Record-versleuteling +Comment[nn]=Krypter prateøkter med Off-The-Record-kryptering Comment[pl]=Szyfrowanie sesji czata za pomocą Off-The-Record Comment[pt]=Encriptar as sessões de conversão com encriptação OTR (Off-The-Record - Não Oficial) Comment[pt_BR]=Encriptar sessões de bate-papo com encriptação Off-The_Record diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/otr/kopete_otr_config.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/otr/kopete_otr_config.desktop --- kdenetwork-4.1.3/kopete/plugins/otr/kopete_otr_config.desktop 2008-08-28 09:08:01.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/otr/kopete_otr_config.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -29,6 +29,7 @@ Comment[nb]=Krypter prateøkter med Off-The-Record-kryptering Comment[nds]=Verslötelt Klööntörns mit "Off-The-Record"- (engl. Buten-Protokoll-)Verslöteln Comment[nl]=Versleutel gesprekken met Off-The-Record-versleuteling +Comment[nn]=Krypter prateøkter med Off-The-Record-kryptering Comment[pl]=Szyfrowanie sesji czata za pomocą Off-The-Record Comment[pt]=Encriptar as sessões de conversão com encriptação OTR (Off-The-Record - Não Oficial) Comment[pt_BR]=Encriptar sessões de bate-papo com encriptação Off-The_Record diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/pipes/kopete_pipes.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/pipes/kopete_pipes.desktop --- kdenetwork-4.1.3/kopete/plugins/pipes/kopete_pipes.desktop 2008-08-28 09:08:01.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/pipes/kopete_pipes.desktop 2009-01-06 16:21:27.000000000 +0000 @@ -32,6 +32,7 @@ Name[nb]=Rør Name[nds]=Ümledden Name[nl]=Doorvoeren +Name[nn]=Røyr Name[pl]=Potoki Name[pt]=Canais Name[sl]=Preusmerjanje @@ -62,6 +63,7 @@ Comment[nb]=Send meldinger i rør gjennom et eksternt program eller skript Comment[nds]=Leddt Narichten dör en extern Programm oder Skript Comment[nl]=Voert berichten door naar een extern programma of script +Comment[nn]=Køyr meldingar gjennom eit røyr med eit eksternt program eller skript Comment[pl]=Przekazuje wiadomości potokami do zewnętrznego programu lub skryptu Comment[pt]=Encaminhar as mensagens por um programa externo Comment[pt_BR]=Fazer pipe através de um programa externo ou script diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/pipes/kopete_pipes_config.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/pipes/kopete_pipes_config.desktop --- kdenetwork-4.1.3/kopete/plugins/pipes/kopete_pipes_config.desktop 2008-08-28 09:08:01.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/pipes/kopete_pipes_config.desktop 2009-01-06 16:21:27.000000000 +0000 @@ -27,6 +27,7 @@ Name[nb]=Rør Name[nds]=Ümledden Name[nl]=Doorvoeren +Name[nn]=Røyr Name[pl]=Potoki Name[pt]=Canais Name[sl]=Preusmerjanje @@ -57,6 +58,7 @@ Comment[nb]=Send meldinger i rør gjennom et eksternt program eller skript Comment[nds]=Leddt Narichten dör en extern Programm oder Skript Comment[nl]=Voert berichten door naar een extern programma of script +Comment[nn]=Køyr meldingar gjennom eit røyr med eit eksternt program eller skript Comment[pl]=Przekazuje wiadomości potokami do zewnętrznego programu lub skryptu Comment[pt]=Encaminhar as mensagens por um programa externo Comment[pt_BR]=Fazer pipe através de um programa externo ou script diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/privacy/kopete_privacy.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/privacy/kopete_privacy.desktop --- kdenetwork-4.1.3/kopete/plugins/privacy/kopete_privacy.desktop 2008-07-15 20:50:39.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/privacy/kopete_privacy.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -39,6 +39,7 @@ Name[nb]=Personvern Name[nds]=Privaatrebeet Name[ne]=गोपनीयता +Name[nn]=Personvern Name[pa]=ਪਰਾਈਵੇਸੀ Name[pl]=Prywatność Name[pt]=Privacidade @@ -80,6 +81,7 @@ Comment[nds]=Schutert ankamen Narichten rut Comment[ne]=आगमन सन्देश फिल्टर गर्दछ Comment[nl]=Filtert inkomende berichten +Comment[nn]=Filtrerer innkommande meldingar Comment[pl]=Filtrowanie wiadomości przychodzących Comment[pt]=Realçar as mensagens Comment[pt_BR]=Filtrar mensagens recebidas diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/privacy/kopete_privacy_config.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/privacy/kopete_privacy_config.desktop --- kdenetwork-4.1.3/kopete/plugins/privacy/kopete_privacy_config.desktop 2008-07-15 20:50:39.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/privacy/kopete_privacy_config.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -33,6 +33,7 @@ Name[nb]=Personvern Name[nds]=Privaatrebeet Name[ne]=गोपनीयता +Name[nn]=Personvern Name[pa]=ਪਰਾਈਵੇਸੀ Name[pl]=Prywatność Name[pt]=Privacidade @@ -63,7 +64,7 @@ Comment[gl]=Plugin de intimidade Comment[hi]=प्राइवेसी प्लगइन Comment[hu]=Adatvédelem modul -Comment[it]=Estensione cronologia +Comment[it]=Estensione riservatezza Comment[ja]=プライバシープラグイン Comment[km]=កម្មវិធី​ជំនួយ​ភាព​ឯកជន Comment[ko]=사생활 플러그인 @@ -73,10 +74,11 @@ Comment[nds]=Privaatrebeet-Moduul Comment[ne]=गोपनीयता प्लगइन Comment[nl]=Privacy-plugin +Comment[nn]=Programtillegg for personvern Comment[pa]=ਪਰਾਈਵੇਸੀ ਪਲੱਗਇਨ Comment[pl]=Wtyczka ochrony prywatności Comment[pt]='Plugin' de Privacidade -Comment[pt_BR]=Plugin de privacidade +Comment[pt_BR]=Plug-in de privacidade Comment[ru]=Модуль фильтрации сообщений Comment[sl]=Vstavek Zasebnost Comment[sv]=Integritetsinsticksprogram diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/statistics/kopete_statistics.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/statistics/kopete_statistics.desktop --- kdenetwork-4.1.3/kopete/plugins/statistics/kopete_statistics.desktop 2008-06-10 12:41:27.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/statistics/kopete_statistics.desktop 2009-01-06 16:21:27.000000000 +0000 @@ -48,6 +48,7 @@ Name[nds]=Statistik Name[ne]=तश्याङ्क Name[nl]=Statistieken +Name[nn]=Statistikk Name[oc]=Estadisticas Name[pa]=ਅੰਕੜੇ Name[pl]=Statystyki @@ -98,6 +99,7 @@ Comment[nds]=En poor sinnvulle Statistiken sammeln Comment[ne]=केही अर्थपूर्ण तश्याङ्क भेला गर्नुहोस् Comment[nl]=Verzamel wat betekenisvolle statistieken +Comment[nn]=Hentar inn statistikkar Comment[pl]=Zbieranie niektórych znaczących statystyk Comment[pt]=Recolher algumas estatísticas relevantes Comment[pt_BR]=Coleta estatísticas úteis diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/texteffect/kopete_texteffect.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/texteffect/kopete_texteffect.desktop --- kdenetwork-4.1.3/kopete/plugins/texteffect/kopete_texteffect.desktop 2008-06-10 12:41:27.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/texteffect/kopete_texteffect.desktop 2009-01-06 16:21:27.000000000 +0000 @@ -36,7 +36,7 @@ Name[hr]=Tekstualni efekti Name[hu]=Szövegeffektus Name[is]=Breyta letri -Name[it]=Effetto di testo +Name[it]=Effetti al testo Name[ja]=テキスト効果 Name[kk]=Мәтінді безендіру Name[km]=បែបផែន​អត្ថបទ​ diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/texteffect/kopete_texteffect_config.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/texteffect/kopete_texteffect_config.desktop --- kdenetwork-4.1.3/kopete/plugins/texteffect/kopete_texteffect_config.desktop 2008-06-10 12:41:27.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/texteffect/kopete_texteffect_config.desktop 2009-01-06 16:21:27.000000000 +0000 @@ -30,7 +30,7 @@ Name[hr]=Tekstualni efekti Name[hu]=Szövegeffektus Name[is]=Breyta letri -Name[it]=Effetto di testo +Name[it]=Effetti al testo Name[ja]=テキスト効果 Name[kk]=Мәтінді безендіру Name[km]=បែបផែន​អត្ថបទ​ diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/translator/kopete_translator_config.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/translator/kopete_translator_config.desktop --- kdenetwork-4.1.3/kopete/plugins/translator/kopete_translator_config.desktop 2008-07-08 10:55:19.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/translator/kopete_translator_config.desktop 2009-01-06 16:21:27.000000000 +0000 @@ -89,7 +89,7 @@ Comment[hr]=Prevodi poruke s vašeg maternjeg jezika na neki drugi Comment[hu]=Az üzenetek lefordítása a saját nyelvről egy idegen nyelvre Comment[is]=Þýðir skeyti úr þinni tungu yfir í annað -Comment[it]=Traduci messaggi dalla tua lingua in un'altra +Comment[it]=Traduce i messaggi dalla tua lingua in un'altra Comment[ja]=母国語から他の言語にメッセージを翻訳する Comment[kk]=Хабарларды бір тілден басқа тілге аудару Comment[km]=បកប្រែ​សារ​ពី​ភាសា​កំណើត​របស់​អ្នក​ទៅ​ជា​ភាសា​មួយ​ទៀត diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/urlpicpreview/kopete_urlpicpreview.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/urlpicpreview/kopete_urlpicpreview.desktop --- kdenetwork-4.1.3/kopete/plugins/urlpicpreview/kopete_urlpicpreview.desktop 2008-10-30 13:23:46.000000000 +0000 +++ kdenetwork-4.1.4/kopete/plugins/urlpicpreview/kopete_urlpicpreview.desktop 2009-01-06 16:21:27.000000000 +0000 @@ -28,7 +28,7 @@ Name[gl]=Antever as imaxes nos chats Name[hi]=गपशप में छवियों का पूर्वावलोकन दें Name[hu]=Csevegési képek előnézete -Name[it]=Antemprima di immagini in chat +Name[it]=Anteprima di immagini in chat Name[ja]=チャット中の画像のプレビュー Name[km]=ការ​មើល​រូបភាព​ជាមុន​ក្នុង​ជជែក​កំសាន្ត Name[ko]=대화하면서 그림 보기 @@ -37,6 +37,7 @@ Name[nb]=Forhåndsvis bilder i pratevinduer Name[nds]=Vöransichten vun Biller bi't Klönen Name[nl]=Voorbeeld van afbeeldingen in gesprekken +Name[nn]=Førehandsvising av bilete i prat Name[pa]=ਗੱਲਾਂ 'ਚ ਤਸਵੀਰਾਂ ਦੀ ਝਲਕ Name[pl]=Podgląd obrazków w rozmowie Name[pt]=Antevisão das imagens nas conversas @@ -73,6 +74,7 @@ Comment[nb]=Viser forhåndsvisning av bilder i pratevinduer Comment[nds]=Wiest Vöransichten vun Biller bi't Klönen Comment[nl]=Toont een voorbeeld van afbeeldingen in gesprekken +Comment[nn]=Førehandsviser bilete i praten Comment[pa]=ਗੱਲਾਂ ਵਿੱਚ ਤਸਵੀਰਾਂ ਦੀ ਝਲਕ ਵੇਖੋ Comment[pl]=Pokazuje podgląd obrazków w rozmowie Comment[pt]=Mostra uma antevisão das imagens nas conversas diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/urlpicpreview/kopete_urlpicpreview_config.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/urlpicpreview/kopete_urlpicpreview_config.desktop --- kdenetwork-4.1.3/kopete/plugins/urlpicpreview/kopete_urlpicpreview_config.desktop 2008-08-28 09:08:01.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/urlpicpreview/kopete_urlpicpreview_config.desktop 2009-01-06 16:21:27.000000000 +0000 @@ -31,10 +31,11 @@ Name[nb]=Innstillinger for programtillegget URLPicPreview Name[nds]=Instellen för't Klöön-Bildvöransichtmoduul Name[nl]=URLPicPreview-plugin instellen +Name[nn]=Oppsett av URLPicPreview-tillegg Name[pa]=URLPicPreview ਪਲੱਗਇਨ ਸੰਰਚਨਾ Name[pl]=Konfiguracja wtyczki URLPicPreview Name[pt]=Configuração do 'Plugin' de Antevisão dos URLs -Name[pt_BR]=Configuração do plugin URLPicPreview +Name[pt_BR]=Configuração do plug-in URLPicPreview Name[ru]=Настройка модуля URLPicPreview Name[sl]=Nastavitve vstavka URLPicPreview Name[sv]=Inställning av insticksprogram för förhandsgranskning av bilder @@ -67,10 +68,11 @@ Comment[nb]=Programtillegget URLPicPreview Comment[nds]=Klöön-Bildvöransichtmoduul Comment[nl]=URLPicPreview-plugin +Comment[nn]=URLPicPreview-tillegg Comment[pa]=URLPicPreview ਪਲੱਗਇਨ Comment[pl]=Wtyczka URLPicPreview Comment[pt]='Plugin' de Antevisão dos URLs -Comment[pt_BR]=Configuração do Plugin URLPicPreview +Comment[pt_BR]=Configuração do Plug-in URLPicPreview Comment[ru]=Модуль URLPicPreview Comment[sl]=Vstavek URLPicPreview Comment[sv]=Insticksprogram för förhandsgranskning av bilder diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/plugins/webpresence/kopete_webpresence_config.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/plugins/webpresence/kopete_webpresence_config.desktop --- kdenetwork-4.1.3/kopete/plugins/webpresence/kopete_webpresence_config.desktop 2008-08-28 09:08:01.000000000 +0100 +++ kdenetwork-4.1.4/kopete/plugins/webpresence/kopete_webpresence_config.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -7,10 +7,10 @@ X-KDE-ParentApp=kopete_webpresence X-KDE-ParentComponents=kopete_webpresence -Comment=Show the status of (parts of) your contact list on a web page +Comment=Show the status of (parts of) your contact list on a webpage Comment[bg]=Приставка за показвана състоянието на (част от) списъка с контакти като уеб страница Comment[bn]=একটি ওয়েবপেজে আপনার যোগাযোগ তালিকার (এর অংশের) অবস্থা প্রদর্শন করে -Comment[ca]=Mostra l'estat de (parts de) la vostra llista de contactes sobre una pàgina web +Comment[ca]=Mostra l'estat de (parts de) la vostra llista de contactes a una pàgina web Comment[cs]=Zobrazí stav (části) seznamu kontaktů na webu Comment[cy]=Dangos cyflwr o (rannau o) eich rhestr cysylltiadau ar dudalen wê Comment[da]=Vis status for (dele af) din kontaktliste på en netside @@ -22,24 +22,24 @@ Comment[eu]=Erakutsi zure kontaktu zerrendaren (edo zati baten) egoera web orri batean Comment[fa]=وضعیت )اجزایی از( فهرست تماس شما را روی صفحۀ وب نمایش می‌دهد Comment[fi]=Näytä kontaktien tila verkkosivulla -Comment[fr]=Afficher l'état de connexion de votre liste (ou d'une partie) sur une page internet +Comment[fr]=Affiche l'état de connexion de votre liste (ou d'une partie) sur une page internet Comment[ga]=Taispeáin stádas do theagmhálacha (nó cuid acu) ar leathanach Gréasáin -Comment[gl]=Mostra o estado da (parte da) lista de contactos nunha páxina web +Comment[gl]=Mostra o estado da lista de contactos (ou parte) nunha páxina web Comment[he]=מציא את מצב ההתחברות של חברים ברשימת הקשר שלך )או של חלקם( בעמוד WEB. Comment[hi]=वेब पृष्ठ पर आपकी सम्पर्क सूची की स्थिति (या आंशिक) दिखाएं Comment[hr]=Prikazivanje statusa (dijelova) vaše liste kontakata na web stranici Comment[hu]=Partnerek állapotának megjelenítése weboldalon Comment[is]=Sýnir stöðu (hluta) lista þinna á vefsíðu -Comment[it]=Mostra lo stato (o una parte) della tua lista contatti su una pagina web +Comment[it]=Mostra lo stato della (o parte della) tua lista contatti su una pagina web Comment[ja]=コンタクトリスト (の一部) の状態をウェブページに表示 Comment[kk]=Контакттарыңыздың тізімінің (не оның бөлігінің) күйін веб парақта көрсетеді -Comment[km]=បង្ហាញ​ស្ថានភាព (ផ្នែក) នៃ​បញ្ជី​ទំនាក់​ទំនង​របស់​អ្នក​នៅ​លើ​ទំព័រ​វ៉េប +Comment[km]=បង្ហាញ​ស្ថានភាព (ផ្នែក) នៃ​បញ្ជី​ទំនាក់ទំនង​របស់​អ្នក​នៅ​លើ​ទំព័រ​វ៉េប Comment[ko]=대화 상대 목록의 일부분을 웹 페이지에 보여 줍니다 Comment[lt]=Rodyti kontaktų sąrašo (sąrašo dalies) būklę internetiniame puslapyje Comment[lv]=Rāda jūsu kontaktu saraksta (vai daļas) statusu tīmekļa lapā Comment[mk]=Го прикажува статусот на (деловите на) вашата листа со контакти на вебстраница Comment[nb]=Vis tilstanden til (deler av) kontaktlista de på en nettside -Comment[nds]=Wiest den Status (vun en Reeg) vun Dien Kontakten op en Nettsiet +Comment[nds]=Wiest den Status (vun en poor) vun Dien Kontakten op en Nettsiet Comment[ne]=वेबपृष्ठमा तपाईँको सम्पर्क सूची (भागको) वस्तुस्थिति देखाउनुहोस् Comment[nl]=Toont de status van (delen van) uw contactenlijst op een webpagina Comment[nn]=Vis tilstanden til (delar av) kontaktlista på ei nettside @@ -50,12 +50,12 @@ Comment[sk]=Zobrazenie stavu (časti) zo zoznamu kontaktov na webovej stránke Comment[sl]=Pokaže stanje (dela) vašega seznama stikov na spletni strani Comment[sv]=Visa status för (delar av) din kontaktlista på en webbsida -Comment[ta]=இணைய பக்கத்தில் உங்கள் தொடர்பாளர் நிலைப்பட்டியலை காட்டு +Comment[ta]=இணைய பக்கத்தில் உங்கள் தொடர்பாளரின் நிலைப்பட்டியலை காட்டு Comment[tg]=Ҳолати (қисме аз) рӯйхати пайвастшавии шуморо дар саҳифаи шабака нишон медиҳад Comment[tr]=Bağlantı listesinde web sayfası olanların (bölümler) durumunu göster Comment[uk]=Показує стан вашого списку контактів (або його частини) на сторінці у Тенетах Comment[vi]=Hiển thị trạng thái (một phần) của danh sách liên hệ trên trang Mạng -Comment[x-test]=xxShow the status of (parts of) your contact list on a web pagexx +Comment[x-test]=xxShow the status of (parts of) your contact list on a webpagexx Comment[zh_CN]=在网页上显示您联系人的状态 Comment[zh_HK]=在網頁上顯示您（一部份）聯絡人清單的狀態 Comment[zh_TW]=在網頁上顯示（部份）您的聯絡人的狀態 diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/gadu/kopete_gadu.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/gadu/kopete_gadu.desktop --- kdenetwork-4.1.3/kopete/protocols/gadu/kopete_gadu.desktop 2008-07-15 20:50:39.000000000 +0100 +++ kdenetwork-4.1.4/kopete/protocols/gadu/kopete_gadu.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -43,6 +43,7 @@ Comment[nb]=Gadu-Gadu: den polske lynmeldingstjenesten Comment[nds]=Gadu-Gadu: De poolsche IM-Deenst Comment[nl]=Gadu-Gadu: de Poolse Instant Messenger +Comment[nn]=Gadu-Gadu – den polske lynmeldingstenesta Comment[pl]=Gadu-Gadu: polski komunikator Comment[pt]=Gadu-Gadu: o serviço Polaco de IM Comment[pt_BR]=Gadu-Gadu: O serviço de mensagens instantâneas diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/groupwise/kopete_groupwise.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/groupwise/kopete_groupwise.desktop --- kdenetwork-4.1.3/kopete/protocols/groupwise/kopete_groupwise.desktop 2008-06-10 12:41:27.000000000 +0100 +++ kdenetwork-4.1.4/kopete/protocols/groupwise/kopete_groupwise.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -48,7 +48,7 @@ Comment[nds]=Novell GroupWise-Kortnarichtendeenst Comment[ne]=नोभेल समूहगत मेसेन्जर Comment[nl]=Protocol voor Novell GroupWise Messenger -Comment[nn]=Lynmeldingsprogrammet Novell GroupWise +Comment[nn]=Lynmeldingstenesta Novell GroupWise Comment[pl]=Komunikator Novell GroupWise Comment[pt_BR]=Mensageiro do GroupWise da Novell Comment[ru]=Программа обмена сообщениями Novell GroupWise diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/meanwhile/kopete_meanwhile.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/meanwhile/kopete_meanwhile.desktop --- kdenetwork-4.1.3/kopete/protocols/meanwhile/kopete_meanwhile.desktop 2008-07-15 20:50:41.000000000 +0100 +++ kdenetwork-4.1.4/kopete/protocols/meanwhile/kopete_meanwhile.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -37,7 +37,7 @@ Comment[ga]=Déan cumarsáid san am céanna le Meanwhile Comment[gl]=Comunicarse ao mesmo tempo con Meanwhile Comment[hu]=Párhuzamos kommunikáció a Meanwhile-lal -Comment[it]=Comnica allo stesso tempo con Meanwhile +Comment[it]=Comunica allo stesso tempo con Meanwhile Comment[ja]=Meanwhile で同時コミュニケーション Comment[km]=ទំនាក់ទំនង​នៅ​ពេល​ជាមួយ​គ្នា​ជាមួយ Meanwhile Comment[ko]=Meanwhile로 동시에 대화하기 @@ -46,6 +46,7 @@ Comment[nb]=Kommuniser samtidig med Meanwhile Comment[nds]=To de sülve Tiet över Meanwhile snacken Comment[nl]=Communiceer op hetzelfde moment met Meanwhile +Comment[nn]=Kommuniser samtidig med Meanwhile Comment[pl]=Komunikacja w tym samym czasie za pomocą Meanwhile Comment[pt]=Comunicar ao mesmo tempo com o Meanwhile Comment[pt_BR]=Comunicação em tempo real com o Meanwhile diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/messenger/kopete_messenger.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/messenger/kopete_messenger.desktop --- kdenetwork-4.1.3/kopete/protocols/messenger/kopete_messenger.desktop 2008-07-15 20:50:40.000000000 +0100 +++ kdenetwork-4.1.4/kopete/protocols/messenger/kopete_messenger.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -29,6 +29,7 @@ Name[nds]=Windows Live (MSN)-Kortnarichtenmaker Name[ne]=विन्डोज लाइभ (एमएसएन) मेसेन्जर Name[nl]=Windows Live (MSN) Messenger +Name[nn]=Windows Live (MSN) Messenger Name[pa]=Windows Live(MSN) ਮੈਸੈਂਜ਼ਰ Name[pl]=Komunikator Windows Live (MSN) Name[pt_BR]=Windows Live Messenger - MSN @@ -60,6 +61,7 @@ Comment[nb]=Windows Live Messenger (MSN), ny implementasjon Comment[nds]=Windows Live (MSN)-Kortnarichtenmaker, nieg buut Comment[nl]=Windows Live Messenger (MSN), nieuwe implementatie +Comment[nn]=Windows Live (MSN) Messenger, ny implementasjon Comment[pl]=Komunikator Windows Live (MSN), nowa implementacja Comment[pt]=Windows Live Messenger (MSN), nova implementação Comment[pt_BR]=Windows Live Messenger (MSN), implementação nova diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/msn/kopete_msn.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/msn/kopete_msn.desktop --- kdenetwork-4.1.3/kopete/protocols/msn/kopete_msn.desktop 2008-07-15 20:50:42.000000000 +0100 +++ kdenetwork-4.1.4/kopete/protocols/msn/kopete_msn.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -59,6 +59,7 @@ Comment[nb]=Kompatibilitet med Windows Live Messenger Comment[nds]=Kompatibiliteet to Windows Live-Kortnarichtenmaker Comment[nl]=Compatibiliteit met Windows Live Messenger +Comment[nn]=Windows Live (MSN) Messenger-kompatibilitet Comment[pl]=Kompatybilność z komunikatorem Windows Live Comment[pt]=Compatibilidade com o Windows Live Messenger Comment[pt_BR]=Compatibilidade com Windows Live Messenger (MSN) diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/msn/msnnotifysocket.cpp /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/msn/msnnotifysocket.cpp --- kdenetwork-4.1.3/kopete/protocols/msn/msnnotifysocket.cpp 2008-10-30 13:23:51.000000000 +0000 +++ kdenetwork-4.1.4/kopete/protocols/msn/msnnotifysocket.cpp 2009-01-06 16:21:30.000000000 +0000 @@ -225,6 +225,8 @@ emit errorMessage( MSNSocket::ErrorSorry, msg ); break; } + case 712: //"session is overloaded". This is just a useless error that only annoys the users. ignore it. + break; case 715: { /* diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/oscar/aim/aimaccount.cpp /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/oscar/aim/aimaccount.cpp --- kdenetwork-4.1.3/kopete/protocols/oscar/aim/aimaccount.cpp 2008-10-30 13:23:50.000000000 +0000 +++ kdenetwork-4.1.4/kopete/protocols/oscar/aim/aimaccount.cpp 2009-01-06 16:21:29.000000000 +0000 @@ -705,11 +705,11 @@ oscarSettings->setTimeout( configGroup()->readEntry( "Timeout", 10 ) ); Oscar::DWORD status = protocol()->statusManager()->oscarStatusOf( pres ); - engine()->setStatus( status, mInitialStatusMessage ); updateVersionUpdaterStamp(); Connection* c = setupConnection(); engine()->start( server, port, accountId(), password.left(16) ); + engine()->setStatus( status, mInitialStatusMessage ); engine()->connectToServer( c, server, port, true /* doAuth */ ); mInitialStatusMessage.clear(); diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/oscar/aim/kopete_aim.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/oscar/aim/kopete_aim.desktop --- kdenetwork-4.1.3/kopete/protocols/oscar/aim/kopete_aim.desktop 2008-07-15 20:50:39.000000000 +0100 +++ kdenetwork-4.1.4/kopete/protocols/oscar/aim/kopete_aim.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -40,6 +40,7 @@ Comment[nb]=Et lynmeldingssystem («An Instant Messenger») Comment[nds]=En Kortnarichtenprogramm Comment[nl]=Een instant messenger +Comment[nn]=Ei lynmeldingsteneste Comment[pa]=ਇੱਕ ਤੁਰੰਤ ਮੈਸੈਂਜਰ Comment[pl]=Komunikator Comment[pt]=Um Mensageiro Instantâneo diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/oscar/aimcontactbase.cpp /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/oscar/aimcontactbase.cpp --- kdenetwork-4.1.3/kopete/protocols/oscar/aimcontactbase.cpp 2008-10-30 13:23:51.000000000 +0000 +++ kdenetwork-4.1.4/kopete/protocols/oscar/aimcontactbase.cpp 2009-01-06 16:21:29.000000000 +0000 @@ -112,8 +112,14 @@ QTextCharFormat defaultCharFormat; for ( QTextBlock it = doc.begin(); it != doc.end(); it = it.next() ) { - s += brMargin( it.blockFormat().topMargin(), defaultCharFormat.fontPointSize() ); + QTextBlockFormat blockFormat = it.blockFormat(); + // Plain text message has p tags without margin attributes and Qt's topMargin() + // returns default margins so we will end up with line break before text. + if ( message.format() != Qt::PlainText || it.blockNumber() != 0 ) + s += brMargin( blockFormat.topMargin(), defaultCharFormat.fontPointSize() ); + + bool lastFragmentHasLineSeparator = false; for ( QTextBlock::iterator it2 = it.begin(); !(it2.atEnd()); ++it2 ) { QTextFragment currentFragment = it2.fragment(); @@ -151,12 +157,14 @@ s += ( format.hasProperty(QTextFormat::FontItalic) ) ? "" : ""; if ( format.fontUnderline() != defaultCharFormat.fontUnderline() ) s += ( format.hasProperty(QTextFormat::FontUnderline) ) ? "" : ""; - - s += Qt::escape(currentFragment.text()); + + QString text = currentFragment.text(); + lastFragmentHasLineSeparator = text.endsWith( QChar::LineSeparator ); + s += Qt::escape( text ); defaultCharFormat = format; } } - s += brMargin( it.blockFormat().bottomMargin(), defaultCharFormat.fontPointSize(), true ); + s += brMargin( blockFormat.bottomMargin(), defaultCharFormat.fontPointSize(), !lastFragmentHasLineSeparator ); } s.replace( QChar::LineSeparator, "
" ); @@ -263,13 +271,13 @@ return 7; } -QString AIMContactBase::brMargin( int margin, int fontPointSize, bool endBlock ) const +QString AIMContactBase::brMargin( int margin, int fontPointSize, bool forceBr ) const { int brHeight = ( fontPointSize == 0 ) ? 12 : fontPointSize; int brCount = margin / brHeight; if ( brCount <= 0 ) - return ( endBlock ) ? "
" : ""; + return ( forceBr ) ? "
" : ""; QString s; while ( brCount-- > 0 ) diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/oscar/aimcontactbase.h /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/oscar/aimcontactbase.h --- kdenetwork-4.1.3/kopete/protocols/oscar/aimcontactbase.h 2008-06-03 10:34:49.000000000 +0100 +++ kdenetwork-4.1.4/kopete/protocols/oscar/aimcontactbase.h 2009-01-06 16:21:29.000000000 +0000 @@ -53,7 +53,7 @@ private: int aimFontSize( int size ) const; - QString brMargin( int margin, int fontPointSize, bool endBlock = false ) const; + QString brMargin( int margin, int fontPointSize, bool forceBr = false ) const; QDateTime m_lastAutoresponseTime; diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/oscar/icq/icqaccount.cpp /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/oscar/icq/icqaccount.cpp --- kdenetwork-4.1.3/kopete/protocols/oscar/icq/icqaccount.cpp 2008-10-30 13:23:51.000000000 +0000 +++ kdenetwork-4.1.4/kopete/protocols/oscar/icq/icqaccount.cpp 2009-01-06 16:21:29.000000000 +0000 @@ -253,12 +253,12 @@ if ( mWebAware ) status |= Oscar::StatusCode::WEBAWARE; - engine()->setStatus( status, mInitialStatusMessage.message(), - pres.xtrazStatus(), mInitialStatusMessage.title() ); updateVersionUpdaterStamp(); Connection* c = setupConnection(); engine()->start( server, port, accountId(), password.left(8) ); + engine()->setStatus( status, mInitialStatusMessage.message(), + pres.xtrazStatus(), mInitialStatusMessage.title() ); engine()->connectToServer( c, server, port, true /* doAuth */ ); mInitialStatusMessage = Kopete::StatusMessage(); @@ -300,9 +300,9 @@ { using namespace Oscar; if ( (presence().flags() & Presence::Invisible) == Presence::Invisible ) - setPresenceFlags( presence().flags() & ~Presence::Invisible ); + setPresenceFlags( presence().flags() & ~Presence::Invisible, myself()->statusMessage() ); else - setPresenceFlags( presence().flags() | Presence::Invisible ); + setPresenceFlags( presence().flags() | Presence::Invisible, myself()->statusMessage() ); } void ICQAccount::slotUserInfo() diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/oscar/icq/kopete_icq.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/oscar/icq/kopete_icq.desktop --- kdenetwork-4.1.3/kopete/protocols/oscar/icq/kopete_icq.desktop 2008-08-28 09:08:02.000000000 +0100 +++ kdenetwork-4.1.4/kopete/protocols/oscar/icq/kopete_icq.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -42,6 +42,7 @@ Comment[nb]=Søk og prat med ICQ Comment[nds]=Söken un Klönen över ICQ Comment[nl]=Zoeken en converseren met ICQ +Comment[nn]=Leit og prat med ICQ Comment[pl]=Szukaj i rozmawiaj za pomocą ICQ Comment[pt]=Procurar e Conversar com o ICQ Comment[pt_BR]=Procurar e bater papo com o ICQ diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/oscar/liboscar/tasks/messagereceivertask.cpp /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/oscar/liboscar/tasks/messagereceivertask.cpp --- kdenetwork-4.1.3/kopete/protocols/oscar/liboscar/tasks/messagereceivertask.cpp 2008-04-10 10:30:47.000000000 +0100 +++ kdenetwork-4.1.4/kopete/protocols/oscar/liboscar/tasks/messagereceivertask.cpp 2009-01-06 16:21:29.000000000 +0000 @@ -159,11 +159,7 @@ break; case 0x0003: { - TLV offlineMessage = Oscar::findTLV( messageTLVList, 0x0006 ); - if ( offlineMessage ) - msg.setEncoding( Oscar::Message::UserDefined ); - else - msg.setEncoding( Oscar::Message::LATIN1 ); + msg.setEncoding( Oscar::Message::UserDefined ); break; } default: // 0x0000 should be ASCII but some clients use different encoding. diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/oscar/liboscar/userdetails.cpp /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/oscar/liboscar/userdetails.cpp --- kdenetwork-4.1.3/kopete/protocols/oscar/liboscar/userdetails.cpp 2008-04-10 10:30:47.000000000 +0100 +++ kdenetwork-4.1.4/kopete/protocols/oscar/liboscar/userdetails.cpp 2009-01-06 16:21:29.000000000 +0000 @@ -277,8 +277,8 @@ break; case 0x0004: //idle time m_idleTime = b.getWord() * 60; -#ifdef OSCAR_USERINFO_DEBUG m_idleTimeSpecified = true; +#ifdef OSCAR_USERINFO_DEBUG kDebug(OSCAR_RAW_DEBUG) << "Idle time is " << m_idleTime; #endif break; diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/qq/kopete_qq.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/qq/kopete_qq.desktop --- kdenetwork-4.1.3/kopete/protocols/qq/kopete_qq.desktop 2008-08-28 09:08:01.000000000 +0100 +++ kdenetwork-4.1.4/kopete/protocols/qq/kopete_qq.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -40,6 +40,7 @@ Comment[nb]=Et populært kinesisk lynmeldingssystem Comment[nds]=En breed bruukt chineesch Kortnarichtensysteem Comment[nl]=Een populair Chinees IM-systeem +Comment[nn]=Ei populær kinesisk lynmeldingsteneste Comment[pl]=Popularny chiński komunikator Comment[pt]=Um sistema de IM popular na China Comment[pt_BR]=Um sistema Chines de mensagem instantânea diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/sms/kopete_sms.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/sms/kopete_sms.desktop --- kdenetwork-4.1.3/kopete/protocols/sms/kopete_sms.desktop 2008-07-15 20:50:39.000000000 +0100 +++ kdenetwork-4.1.4/kopete/protocols/sms/kopete_sms.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -46,6 +46,7 @@ Comment[nb]=Send SMS-meldinger til mobiltelefoner Comment[nds]=SMS-Narichten Mobiltelefonen tostüern Comment[nl]=SMS-berichten naar mobiele telefoons verzenden +Comment[nn]=Send tekstmeldingar til mobiltelefonar Comment[pa]=ਮੋਬਾਇਲ ਫੋਨਾਂ ਲਈ SMS ਸੁਨੇਹੇ ਭੇਜੋ Comment[pl]=Wysyłanie wiadomości tekstowych na telefony komórkowe Comment[pt]=Enviar mensagens SMS para telemóveis diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/telepathy/kopete_telepathy.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/telepathy/kopete_telepathy.desktop --- kdenetwork-4.1.3/kopete/protocols/telepathy/kopete_telepathy.desktop 2008-08-28 09:08:01.000000000 +0100 +++ kdenetwork-4.1.4/kopete/protocols/telepathy/kopete_telepathy.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -46,6 +46,7 @@ Comment[nb]=Meldinger ved bruk av Telepathy tilkoblingsbehandlere Comment[nds]=Narichten över Telepathy-Verbinnenplegers afsteed stüern Comment[nl]=Messaging met Telepathy-verbindingsmanagers. +Comment[nn]=Lynmeldingsteneste som brukar Telepathy-tilkopling Comment[pl]=Wiadomości za pomocą Telepathy. Comment[pt]=Mensageiros que usam os gestores de ligações do Telepathy. Comment[pt_BR]=Envio/recebimento de mensagem por conexão Telepathy. diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/testbed/kopete_testbed.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/testbed/kopete_testbed.desktop --- kdenetwork-4.1.3/kopete/protocols/testbed/kopete_testbed.desktop 2008-06-10 12:41:27.000000000 +0100 +++ kdenetwork-4.1.4/kopete/protocols/testbed/kopete_testbed.desktop 2009-01-06 16:21:30.000000000 +0000 @@ -30,7 +30,6 @@ Name[nb]=Testbenk Name[ne]=टेस्टबेड Name[nl]=Testomgeving -Name[nn]=Testbenk Name[pa]=ਟੈਸਟਬੈੱਡ Name[pl]=Testowy Name[pt]=Testes diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/winpopup/kopete_wp.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/winpopup/kopete_wp.desktop --- kdenetwork-4.1.3/kopete/protocols/winpopup/kopete_wp.desktop 2008-07-15 20:50:39.000000000 +0100 +++ kdenetwork-4.1.4/kopete/protocols/winpopup/kopete_wp.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -47,6 +47,7 @@ Comment[nb]=Sender Windows WinPopup -meldinger Comment[nds]=Windows-WinPopup-Narichten loosstüern Comment[nl]=Verzendt Windows WinPopup-berichten +Comment[nn]=Sender Windows-vindaugsmeldingar Comment[pl]=Wysyłanie komunikatów Windows WinPopup Comment[pt]=Envia mensagens de WinPopup do Windows Comment[pt_BR]=Envia mensagens Windows WinPopup diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kopete/protocols/yahoo/kopete_yahoo.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/kopete/protocols/yahoo/kopete_yahoo.desktop --- kdenetwork-4.1.3/kopete/protocols/yahoo/kopete_yahoo.desktop 2008-08-28 09:08:01.000000000 +0100 +++ kdenetwork-4.1.4/kopete/protocols/yahoo/kopete_yahoo.desktop 2009-01-06 16:21:29.000000000 +0000 @@ -47,6 +47,7 @@ Comment[nb]=Yahoo! Messenger LM og video-prat Comment[nds]=Kortnarichten un Videoklönen mit Yahoo! Comment[nl]=Yahoo! Messenger IM en videoconversatie +Comment[nn]=Lynmeldingsteneste og videoprat frå Yahoo Comment[pl]=Komunikator Yahoo! Messenger i rozmowa wideo Comment[pt]=Conversa IM e de vídeo do Yahoo! Messenger Comment[pt_BR]=Mensagens instantâneas e bate-papo com vídeo do Yahoo! Messenger diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kppp/DB/Provider/Austria/.directory /tmp/yhUjnDlui0/kdenetwork-4.1.4/kppp/DB/Provider/Austria/.directory --- kdenetwork-4.1.3/kppp/DB/Provider/Austria/.directory 2008-10-30 13:23:55.000000000 +0000 +++ kdenetwork-4.1.4/kppp/DB/Provider/Austria/.directory 2009-01-06 16:21:31.000000000 +0000 @@ -23,6 +23,7 @@ Name[nds]=Österriek Name[ne]=अष्ट्रिया Name[nl]=Oostenrijk +Name[nn]=Austerrike Name[pt]=Áustria Name[pt_BR]=Áustria Name[ru]=Австрия diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kppp/DB/Provider/Belarus/.directory /tmp/yhUjnDlui0/kdenetwork-4.1.4/kppp/DB/Provider/Belarus/.directory --- kdenetwork-4.1.3/kppp/DB/Provider/Belarus/.directory 2008-10-30 13:23:53.000000000 +0000 +++ kdenetwork-4.1.4/kppp/DB/Provider/Belarus/.directory 2009-01-06 16:21:31.000000000 +0000 @@ -26,6 +26,7 @@ Name[nds]=Wittrussland Name[ne]=बेलारूस Name[nl]=Wit-Rusland +Name[nn]=Kviterussland Name[oc]=Bielorusia Name[pa]=ਬੇਲਾਰੂਸ Name[pl]=Białoruś diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kppp/DB/Provider/Czech_Republic/.directory /tmp/yhUjnDlui0/kdenetwork-4.1.4/kppp/DB/Provider/Czech_Republic/.directory --- kdenetwork-4.1.3/kppp/DB/Provider/Czech_Republic/.directory 2008-08-28 09:08:05.000000000 +0100 +++ kdenetwork-4.1.4/kppp/DB/Provider/Czech_Republic/.directory 2009-01-06 16:21:31.000000000 +0000 @@ -25,6 +25,7 @@ Name[nds]=Tschechien Name[ne]=चेकिया Name[nl]=Tsjechië +Name[nn]=Tsjekkia Name[pa]=ਚੈਕ Name[pl]=Czechy Name[pt]=República Checa diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kppp/DB/Provider/Denmark/.directory /tmp/yhUjnDlui0/kdenetwork-4.1.4/kppp/DB/Provider/Denmark/.directory --- kdenetwork-4.1.3/kppp/DB/Provider/Denmark/.directory 2008-06-10 12:41:31.000000000 +0100 +++ kdenetwork-4.1.4/kppp/DB/Provider/Denmark/.directory 2009-01-06 16:21:31.000000000 +0000 @@ -27,6 +27,7 @@ Name[nds]=Dänmark Name[ne]=डेन्मार्क Name[nl]=Denemarken +Name[nn]=Danmark Name[oc]=Danemarc Name[pa]=ਡੈਨਮਾਰਕ Name[pl]=Dania diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kppp/DB/Provider/France/.directory /tmp/yhUjnDlui0/kdenetwork-4.1.4/kppp/DB/Provider/France/.directory --- kdenetwork-4.1.3/kppp/DB/Provider/France/.directory 2008-06-10 12:41:31.000000000 +0100 +++ kdenetwork-4.1.4/kppp/DB/Provider/France/.directory 2009-01-06 16:21:31.000000000 +0000 @@ -27,6 +27,7 @@ Name[nds]=Frankriek Name[ne]=फ्रान्स Name[nl]=Frankrijk +Name[nn]=Frankrike Name[oc]=França Name[pa]=ਫਰਾਂਸ Name[pl]=Francja diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kppp/DB/Provider/Germany/.directory /tmp/yhUjnDlui0/kdenetwork-4.1.4/kppp/DB/Provider/Germany/.directory --- kdenetwork-4.1.3/kppp/DB/Provider/Germany/.directory 2008-06-10 12:41:31.000000000 +0100 +++ kdenetwork-4.1.4/kppp/DB/Provider/Germany/.directory 2009-01-06 16:21:31.000000000 +0000 @@ -28,6 +28,7 @@ Name[nds]=Düütschland Name[ne]=जर्मनी Name[nl]=Duitsland +Name[nn]=Tyskland Name[oc]=Alemanha Name[pa]=ਜਰਮਨੀ Name[pl]=Niemcy diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kppp/DB/Provider/Ireland/.directory /tmp/yhUjnDlui0/kdenetwork-4.1.4/kppp/DB/Provider/Ireland/.directory --- kdenetwork-4.1.3/kppp/DB/Provider/Ireland/.directory 2008-06-10 12:41:31.000000000 +0100 +++ kdenetwork-4.1.4/kppp/DB/Provider/Ireland/.directory 2009-01-06 16:21:31.000000000 +0000 @@ -27,6 +27,7 @@ Name[nds]=Irland Name[ne]=आयरल्यान्ड Name[nl]=Ierland +Name[nn]=Irland Name[oc]=Irlanda Name[pa]=ਆਈਰਲੈਂਡ Name[pl]=Irlandia diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kppp/DB/Provider/Netherlands/.directory /tmp/yhUjnDlui0/kdenetwork-4.1.4/kppp/DB/Provider/Netherlands/.directory --- kdenetwork-4.1.3/kppp/DB/Provider/Netherlands/.directory 2008-07-08 10:55:28.000000000 +0100 +++ kdenetwork-4.1.4/kppp/DB/Provider/Netherlands/.directory 2009-01-06 16:21:31.000000000 +0000 @@ -26,6 +26,7 @@ Name[nds]=Nedderlannen Name[ne]=नेदरल्यान्ड Name[nl]=Nederland +Name[nn]=Nederland Name[oc]=Holanda Name[pa]=ਨੀਂਦਰਲੈਂਡ Name[pl]=Holandia diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kppp/DB/Provider/Norway/.directory /tmp/yhUjnDlui0/kdenetwork-4.1.4/kppp/DB/Provider/Norway/.directory --- kdenetwork-4.1.3/kppp/DB/Provider/Norway/.directory 2008-06-10 12:41:31.000000000 +0100 +++ kdenetwork-4.1.4/kppp/DB/Provider/Norway/.directory 2009-01-06 16:21:31.000000000 +0000 @@ -26,6 +26,7 @@ Name[nds]=Norwegen Name[ne]=नर्वे Name[nl]=Noorwegen +Name[nn]=Noreg Name[oc]=Norvègia Name[pa]=ਨਾਰਵੇ Name[pl]=Norwegia diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kppp/DB/Provider/Sweden/.directory /tmp/yhUjnDlui0/kdenetwork-4.1.4/kppp/DB/Provider/Sweden/.directory --- kdenetwork-4.1.3/kppp/DB/Provider/Sweden/.directory 2008-06-10 12:41:31.000000000 +0100 +++ kdenetwork-4.1.4/kppp/DB/Provider/Sweden/.directory 2009-01-06 16:21:31.000000000 +0000 @@ -26,6 +26,7 @@ Name[nb]=Sverige Name[ne]=स्वीडेन Name[nl]=Zweden +Name[nn]=Sverige Name[oc]=Suècia Name[pa]=ਸਵੀਡਨ Name[pl]=Szwecja diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kppp/DB/Provider/Switzerland/.directory /tmp/yhUjnDlui0/kdenetwork-4.1.4/kppp/DB/Provider/Switzerland/.directory --- kdenetwork-4.1.3/kppp/DB/Provider/Switzerland/.directory 2008-10-30 13:23:55.000000000 +0000 +++ kdenetwork-4.1.4/kppp/DB/Provider/Switzerland/.directory 2009-01-06 16:21:31.000000000 +0000 @@ -26,6 +26,7 @@ Name[nds]=Swiez Name[ne]=स्वीजरल्यान्ड Name[nl]=Zwitserland +Name[nn]=Sveits Name[oc]=Soïssa Name[pa]=ਸਵਿਟਜ਼ਰਲੈਂਡ Name[pl]=Szwajcaria diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kppp/DB/Provider/Ukraine/.directory /tmp/yhUjnDlui0/kdenetwork-4.1.4/kppp/DB/Provider/Ukraine/.directory --- kdenetwork-4.1.3/kppp/DB/Provider/Ukraine/.directory 2008-06-10 12:41:31.000000000 +0100 +++ kdenetwork-4.1.4/kppp/DB/Provider/Ukraine/.directory 2009-01-06 16:21:31.000000000 +0000 @@ -22,6 +22,7 @@ Name[nb]=Ukraina Name[ne]=युक्रेन Name[nl]=Oekraïne +Name[nn]=Ukraina Name[oc]=Ucraïna Name[pa]=ਯੂਕਰੇਨ Name[pl]=Ukraina diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kppp/DB/Provider/United_Kingdom/.directory /tmp/yhUjnDlui0/kdenetwork-4.1.4/kppp/DB/Provider/United_Kingdom/.directory --- kdenetwork-4.1.3/kppp/DB/Provider/United_Kingdom/.directory 2008-06-10 12:41:31.000000000 +0100 +++ kdenetwork-4.1.4/kppp/DB/Provider/United_Kingdom/.directory 2009-01-06 16:21:31.000000000 +0000 @@ -26,6 +26,7 @@ Name[nds]=Grootbritannien Name[ne]=संयुक्त अधिराज्य Name[nl]=Verenigd Koninkrijk +Name[nn]=Storbritannia Name[oc]=Reialme Unit Name[pa]=ਬਰਤਾਨੀਆ Name[pl]=Wielka Brytania diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/kppp/DB/Provider/Yugoslavia/.directory /tmp/yhUjnDlui0/kdenetwork-4.1.4/kppp/DB/Provider/Yugoslavia/.directory --- kdenetwork-4.1.3/kppp/DB/Provider/Yugoslavia/.directory 2008-08-28 09:08:05.000000000 +0100 +++ kdenetwork-4.1.4/kppp/DB/Provider/Yugoslavia/.directory 2009-01-06 16:21:31.000000000 +0000 @@ -25,6 +25,7 @@ Name[nds]=Jugoslawien Name[ne]=युकोस्लाभिया Name[nl]=Joegoslavië +Name[nn]=Serbia og Montenegro Name[pa]=ਯੂਗੋਸਲਾਵੀਆ Name[pl]=Jugosławia Name[pt]=Jugoslávia diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/krdc/krdc.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/krdc/krdc.desktop --- kdenetwork-4.1.3/krdc/krdc.desktop 2008-08-28 09:08:05.000000000 +0100 +++ kdenetwork-4.1.4/krdc/krdc.desktop 2009-01-06 16:21:27.000000000 +0000 @@ -28,6 +28,7 @@ GenericName[nb]=Tilkobling til annet skrivebord GenericName[nds]=Schriefdisch-Feernverbinnen GenericName[nl]=Client voor verbinding met extern bureaublad +GenericName[nn]=Skrivebordssamband over nettverket GenericName[pl]=Klient zdalnego dostępu do pulpitu GenericName[pt]=Cliente de Ecrãs Remotos GenericName[pt_BR]=Clientes de Trabalho Remotos diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/krdc/mainwindow.cpp /tmp/yhUjnDlui0/kdenetwork-4.1.4/krdc/mainwindow.cpp --- kdenetwork-4.1.3/krdc/mainwindow.cpp 2008-10-30 13:23:45.000000000 +0000 +++ kdenetwork-4.1.4/krdc/mainwindow.cpp 2009-01-06 16:21:27.000000000 +0000 @@ -777,10 +777,10 @@ } } -void MainWindow::quit() +void MainWindow::quit(bool systemEvent) { bool haveRemoteConnections = m_remoteViewList.count(); - if (!haveRemoteConnections || KMessageBox::warningContinueCancel(this, + if (systemEvent || !haveRemoteConnections || KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to quit the KDE Remote Desktop Client?"), i18n("Confirm Quit"), KStandardGuiItem::quit(), KStandardGuiItem::cancel(), @@ -828,12 +828,15 @@ void MainWindow::closeEvent(QCloseEvent *event) { - event->ignore(); - - if (Settings::systemTrayIcon()) { - hide(); // just hide the mainwindow, keep it in systemtray + if (event->spontaneous()) { // Returns true if the event originated outside the application (a system event); otherwise returns false. + event->ignore(); + if (Settings::systemTrayIcon()) { + hide(); // just hide the mainwindow, keep it in systemtray + } else { + quit(); + } } else { - quit(); + quit(true); } } diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/krdc/mainwindow.h /tmp/yhUjnDlui0/kdenetwork-4.1.4/krdc/mainwindow.h --- kdenetwork-4.1.3/krdc/mainwindow.h 2008-04-23 16:51:56.000000000 +0100 +++ kdenetwork-4.1.4/krdc/mainwindow.h 2009-01-06 16:21:27.000000000 +0000 @@ -59,7 +59,7 @@ private slots: void restoreOpenSessions(); - void quit(); + void quit(bool systemEvent = false); void preferences(); void configureNotifications(); void configureKeys(); diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/krfb/kcm_krfb/kcmkrfb.desktop /tmp/yhUjnDlui0/kdenetwork-4.1.4/krfb/kcm_krfb/kcmkrfb.desktop --- kdenetwork-4.1.3/krfb/kcm_krfb/kcmkrfb.desktop 2008-06-10 12:41:26.000000000 +0100 +++ kdenetwork-4.1.4/krfb/kcm_krfb/kcmkrfb.desktop 2009-01-06 16:21:27.000000000 +0000 @@ -35,7 +35,7 @@ Name[hr]=Dijeljenje radne površine Name[hu]=Munkaasztal-megosztás Name[is]=Skjáborðamiðlun -Name[it]=Condivisione Desktop +Name[it]=Condivisione desktop Name[ja]=デスクトップ共有 Name[kk]=Үстелді ортақтастыру Name[km]=ការ​ចែក​រំលែក​ផ្ទៃ​តុ diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/krfb/kinetd/kinetd.notifyrc /tmp/yhUjnDlui0/kdenetwork-4.1.4/krfb/kinetd/kinetd.notifyrc --- kdenetwork-4.1.3/krfb/kinetd/kinetd.notifyrc 2008-06-10 12:41:26.000000000 +0100 +++ kdenetwork-4.1.4/krfb/kinetd/kinetd.notifyrc 2009-01-06 16:21:27.000000000 +0000 @@ -38,6 +38,7 @@ Name[nb]=Innkommende tilkobling Name[nds]=RinkamenVerbinnen Name[nl]=Inkomende_verbinding +Name[nn]=Innkommande tilkopling Name[pl]=Połączenia przychodzące Name[pt_BR]=Conexões de Entrada Name[ru]=Входящее соединение @@ -85,6 +86,7 @@ Comment[nb]=Mottok innkommende tilkobling Comment[nds]=Tokoppelanfraag kregen Comment[nl]=Inkomende verbinding ontvangen +Comment[nn]=Fekk ei innkommande tilkopling Comment[pa]=ਮਿਲੇ ਆ ਰਹੇ ਕੁਨੈਕਸ਼ਨ Comment[pl]=Otrzymano połącznie przychodzące Comment[pt]=Foi recebida uma ligação @@ -134,6 +136,7 @@ Name[nb]=Prosessen mislyktes Name[nds]=PerzessFehlslaan Name[nl]=Proces_mislukt +Name[nn]=Prosessen feila Name[pa]=ਪਰੋਸੈਸ ਫੇਲ੍ਹ Name[pl]=Błąd procesu Name[pt_BR]=Falha de Processo @@ -182,6 +185,7 @@ Comment[nb]=Klarte ikke kalle på prosess for å håndtere tilkobling Comment[nds]=Perzess för't Verarbeiden vun Tokoppelanfragen lett sik nich opropen Comment[nl]=Kon geen proces aanroepen om de verbinding af te handelen +Comment[nn]=Klarte ikkje kalla på prosessen som skulle handtera tilkoplinga Comment[pl]=Nie można było uruchomić procesu obsługi połączenia Comment[pt]=Não foi possível invocar o processo para lidar com as ligações Comment[pt_BR]=Não foi possível chamar o processo de controle da conexão diff -Nru /tmp/3whLddlRfY/kdenetwork-4.1.3/krfb/krfb.notifyrc /tmp/yhUjnDlui0/kdenetwork-4.1.4/krfb/krfb.notifyrc --- kdenetwork-4.1.3/krfb/krfb.notifyrc 2008-10-30 13:23:46.000000000 +0000 +++ kdenetwork-4.1.4/krfb/krfb.notifyrc 2009-01-06 16:21:27.000000000 +0000 @@ -34,6 +34,7 @@ Comment[nb]=Delte skrivebord Comment[nds]=Schriefdisch-Freegaav Comment[nl]=Bureaublad delen +Comment[nn]=Skrivebordsdeling Comment[pa]=ਡੈਸਕਟਾਪ ਸ਼ੇਅਰਿੰਗ Comment[pl]=Współdzielenie pulpitu Comment[pt]=Partilha do Ecrã @@ -78,6 +79,7 @@ Name[nb]=Bruker godtar tilkobling Name[nds]=Bruker lett tokoppeln to Name[nl]=Gebruiker accepteert de verbinding +Name[nn]=Brukar godtek tilkopling Name[pa]=ਯੂਜ਼ਰ ਨੇ ਕੁਨੈਕਸ਼ਨ ਮਨਜ਼ੂਰ ਕੀਤਾ Name[pl]=Połączenie zaakceptowane przez użytkownika Name[pt]=O Utilizador Aceita a Ligação @@ -123,6 +125,7 @@ Comment[nb]=Bruker godtar tilkobling Comment[nds]=Bruker nimmt Tokoppelanfraag an Comment[nl]=Gebruiker accepteert de verbinding +Comment[nn]=Brukaren godtek tilkoplinga Comment[pa]=ਯੂਜ਼ਰ ਨੇ ਕੁਨੈਕਸ਼ਨ ਮੰਨਿਆ Comment[pl]=Użytkownik akceptuje połączenie Comment[pt]=O utilizador aceita a ligação @@ -168,6 +171,7 @@ Name[nb]=Bruker nekter tilkobling Name[nds]=Bruker wiest tokoppeln af Name[nl]=Gebruiker weigert de verbinding +Name[nn]=Brukar avslår tilkopling Name[pa]=ਯੂਜ਼ਰ ਨੇ ਕੁਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ Name[pl]=Połączenie odrzucone przez użytkownika Name[pt]=O Utilizador Recusa a Ligação @@ -213,6 +217,7 @@ Comment[nb]=Bruker nekter tilkobling Comment[nds]=Bruker wiest Tokoppelanfraag af Comment[nl]=Gebruiker weigert de verbinding +Comment[nn]=Brukaren avslår tilkoplinga Comment[pa]=ਯੂਜ਼ਰ ਨੇ ਕੁਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ Comment[pl]=Użytkownik odrzuca połączenie Comment[pt]=O utilizador recusa a ligação @@ -258,6 +263,7 @@ Name[nb]=Forbindelsen lukket Name[nds]=Afkoppelt Name[nl]=Verbinding gesloten +Name[nn]=Tilkopling vart avslutta Name[pa]=ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ Name[pl]=Połączenia zakończone Name[pt]=Ligação Fechada @@ -304,6 +310,7 @@ Comment[nb]=Forbindelsen lukket Comment[nds]=Afkoppelt Comment[nl]=Verbinding verbroken +Comment[nn]=Tilkoplinga vart avslutta Comment[pa]=ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ Comment[pl]=Połączenie zakończone Comment[pt]=A ligação foi encerrada @@ -351,6 +358,7 @@ Name[nb]=Ugyldig passord Name[nds]=Leeg Passwoort Name[nl]=Ongeldig wachtwoord +Name[nn]=Ugyldig passord Name[pa]=ਗਲਤ ਪਾਸਵਰਡ Name[pl]=Błędne hasło Name[pt]=Senha Inválida @@ -397,6 +405,7 @@ Comment[nb]=Ugyldig passord Comment[nds]=Leeg Passwoort Comment[nl]=Ongeldig wachtwoord +Comment[nn]=Passordet var ugyldig Comment[pa]=ਗਲਤ ਪਾਸਵਰਡ Comment[pl]=Błędne hasło Comment[pt]=A senha é inválida @@ -445,6 +454,7 @@ Name[nb]=Ugyldig invitasjonspassord Name[nds]=Leeg Passwoort bi Inladen Name[nl]=Ongeldig wachtwoord uitnodiging +Name[nn]=Ugyldig invitasjonspassord Name[pa]=ਗਲਤ ਪਾਸਵਰਡ ਸੱਦਾ Name[pl]=Informacja o błędnym haśle Name[pt]=Convites de Senha Inválidos @@ -490,6 +500,7 @@ Comment[nb]=Den inviterte brukeren sendte et ugyldig passord. Tilkobling nektet. Comment[nds]=De inlaadt Deel hett en leeg Passwoort angeven. Tokoppeln torüchwiest. Comment[nl]=De uitgenodigde partij stuurde een ongeldig wachtwoord. De verbinding is geweigerd. +Comment[nn]=Ugyldig passordsvar på invitasjon. Tilkoplinga vart avslått. Comment[pl]=Z drugiej strony podano błędne hasło. Połączenie odrzucone. Comment[pt]=O utilizador convidado enviou uma senha inválida. A ligação foi recusada. Comment[pt_BR]=A parte "convidada" enviou uma senha inválida. Conexão recusada. @@ -534,6 +545,7 @@ Name[nb]=Ny tilkobling venter Name[nds]=Nieg Verbinnen töövt Name[nl]=Nieuwe verbinding in de wacht +Name[nn]=Ny tilkopling ventar Name[pa]=ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਹੋਲਡ ਉੱਤੇ ਹੈ Name[pl]=Nowe połączenie wstrzymane Name[pt]=Ligação Nova em Espera @@ -578,6 +590,7 @@ Comment[nb]=Anmodning om tilkobling, bruker må godta Comment[nds]=Tokoppeln anfraagt, Bruker mutt verlöven Comment[nl]=Verbindingsverzoek, gebruiker dient toe te stemmen +Comment[nn]=Ei tilkopling er førespurd. Brukaren må godta. Comment[pl]=Próba połączenia, musi być zaakceptowana przez użytkownika Comment[pt]=Foi pedida uma ligação que o utilizador deverá aceitar Comment[pt_BR]=Conexão requisitada; o usuário deve aceitar @@ -622,6 +635,7 @@ Name[nb]=Ny tilkobling automatisk godtatt Name[nds]=Nieg Verbinnen automaatsch tolaten Name[nl]=Nieuwe verbinding automatisch accepteren +Name[nn]=Ny tilkopling automatisk godteken Name[pa]=ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਆਟੋ ਮਨਜ਼ੂਰ Name[pl]=Nowe połączenie automatycznie przyjęte Name[pt]=Nova Ligação Aceite Automaticamente @@ -667,6 +681,7 @@ Comment[nb]=En ny tilkobling er automatisk opprettet Comment[nds]=Nieg Verbinnen automaatsch inricht Comment[nl]=Nieuwe verbinding automatisch opgebouwd +Comment[nn]=Ei ny tilkopling vart automatisk starta Comment[pa]=ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਆਟੋਮੈਟਿਕ ਹੀ ਬਣਾਇਆ ਗਿਆ Comment[pl]=Nowe połączenie ustanowiono automatycznie Comment[pt]=Foi estabelecida automaticamente uma nova ligação @@ -712,6 +727,7 @@ Name[nb]=For mange tilkoblinger Name[nds]=To vele Verbinnen Name[nl]=Teveel verbindingen +Name[nn]=For mange tilkoplingar Name[pa]=ਬਹੁਤ ਸਾਰੇ ਕੁਨੈਕਸ਼ਨ Name[pl]=Zbyt wiele połączeń Name[pt]=Demasiadas Ligações @@ -758,6 +774,7 @@ Comment[nb]=Opptatt, tilkobling nektet Comment[nds]=Bunnen, Verbinnen torüchwiest Comment[nl]=Bezet, verbinding geweigerd +Comment[nn]=Oppteken, så tilkoplinga vart avslått Comment[pa]=ਬਿਜ਼ੀ, ਕੁਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ Comment[pl]=Zajęte, połączenie odrzucone Comment[pt]=Ocupado, pelo a ligação foi recusada @@ -806,6 +823,7 @@ Name[nb]=Uventet tilkobling Name[nds]=Nich verwacht Tokoppeln Name[nl]=Onverwachte verbinding +Name[nn]=Uventa tilkopling Name[pa]=ਅਣਜਾਣ ਕੁਨੈਕਸ਼ਨ Name[pl]=Niespodziewane połączenie Name[pt]=Ligação Inesperada @@ -851,6 +869,7 @@ Comment[nb]=Mottok uventet tilkobling, avbrutt Comment[nds]=Unverwacht Verbinnen kregen, afbraken Comment[nl]=Ontving een onverwachte verbinding, afgebroken +Comment[nn]=Fekk ei uventa tilkopling, så avbryt no Comment[pl]=Otrzymano niespodziewane połączenie. Przerwane. Comment[pt]=Foi recebida uma ligação inesperada, pelo que foi interrompida Comment[pt_BR]=conexão recebida inesperadamente; abortar