Index: akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop
===================================================================
---- akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -11,6 +11,7 @@
+--- akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -9,7 +9,7 @@
+ Name[de]=Akregator-Unterstützung für Online-Leser
+ Name[el]=Υποστήριξη απομακρυσμένου αναγνώστη ροών
Name[en_GB]=Akregator Online Feed Reader Support
- Name[es]=Soporte para el lector de fuentes en línea de Akregator
+-Name[es]=Soporte para el lector de fuentes en línea de Akregator
++Name[es]=Apoyo para el lector de fuentes en línea de Akregator
Name[et]=Akregatori uudistevoogude võrgulugejate toetus
-+Name[fi]=Akregatorin Online-syötelukijatuki
+ Name[fi]=Akregatorin Online-syötelukijatuki
Name[fr]=Prise en charge des lecteurs en ligne pour Akregator
- Name[ga]=Tacaíocht Akregator do Léitheoirí Fothaí Ar Líne
- Name[gl]=Funcionalidade de lector de fontes en liña do Akregator
-Index: akregator/plugins/onlinesync/akregator_config_onlinesync.desktop
-===================================================================
---- akregator/plugins/onlinesync/akregator_config_onlinesync.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ akregator/plugins/onlinesync/akregator_config_onlinesync.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -22,6 +22,7 @@
- Name[en_GB]=Online Readers
- Name[es]=Lectores en línea
- Name[et]=Võrgulugejad
-+Name[fi]=Online-lukijat
- Name[fr]=Lecteurs en ligne
- Name[ga]=Léitheoirí Ar Líne
- Name[gl]=Lector de novas en liña
-@@ -60,6 +61,7 @@
- Comment[en_GB]=Configure Online Readers
- Comment[es]=Configurar los lectores en línea
- Comment[et]=Võrgulugejate seadistamine
-+Comment[fi]=Online-lukijoiden asetukset
- Comment[fr]=Configurer les lecteurs en ligne
- Comment[ga]=Cumraigh Léitheoirí Ar Líne
- Comment[gl]=Configurar os lectores en liña
-Index: akregator/src/selectioncontroller.cpp
-===================================================================
---- akregator/src/selectioncontroller.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ akregator/src/selectioncontroller.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -143,11 +143,15 @@
-
- Akregator::Article Akregator::SelectionController::currentArticle() const
- {
-+ if ( !m_articleLister || !m_articleLister->articleSelectionModel() )
-+ return Article();
- return ::articleForIndex( m_articleLister->articleSelectionModel()->currentIndex(), m_feedList.get() );
- }
-
- QList<Akregator::Article> Akregator::SelectionController::selectedArticles() const
- {
-+ if ( !m_articleLister || !m_articleLister->articleSelectionModel() )
-+ return QList<Akregator::Article>();
- return ::articlesForIndexes( m_articleLister->articleSelectionModel()->selectedRows(), m_feedList.get() );
- }
-
-Index: akregator/src/akregator.notifyrc
-===================================================================
---- akregator/src/akregator.notifyrc (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ akregator/src/akregator.notifyrc (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -155,7 +155,7 @@
- Comment[uz]=Akregator dasturiga yangi yangiliklar tasmasi qoʻshildi
- Comment[uz@cyrillic]=Akregator дастурига янги янгиликлар тасмаси қўшилди
- Comment[x-test]=xxA new feed was remotely added to Akregatorxx
--Comment[zh_CN]=远程添加新种子进了 Akregator
-+Comment[zh_CN]=一个新种子已通过远程添加进 Akregator
- Comment[zh_TW]=已從遠端新增 Feed 到 Akregator
- Action=Popup
-
-@@ -228,7 +228,7 @@
- Comment[es]=Se han obtenido nuevos artículos
- Comment[et]=Tõmmati uued artiklid
- Comment[eu]=Artikulu berriak eskuratu dira
--Comment[fi]=Uutta postia saapunut
-+Comment[fi]=Uusia artikkeleja noudettiin
- Comment[fr]=Les nouveaux articles ont été relevés
- Comment[fy]=Nije artikels binne ophelle
- Comment[ga]=Fuarthas ailt nua
-Index: akregator/src/articleformatter.cpp
-===================================================================
---- akregator/src/articleformatter.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ akregator/src/articleformatter.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -101,9 +101,9 @@
- virtual bool visitFeed(Feed* node)
- {
- text = QString("<div class=\"headerbox\" dir=\"%1\">\n").arg(QApplication::isRightToLeft() ? "rtl" : "ltr");
--
-- text += QString("<div class=\"headertitle\" dir=\"%1\">").arg(Utils::directionOf(Utils::stripTags(node->title())));
-- text += node->title();
-+ const QString strippedTitle = Utils::stripTags(node->title());
-+ text += QString("<div class=\"headertitle\" dir=\"%1\">").arg(Utils::directionOf(strippedTitle));
-+ text += strippedTitle;
- if(node->unread() == 0)
- text += i18n(" (no unread articles)");
- else
-@@ -173,12 +173,13 @@
- text = QString("<div class=\"headerbox\" dir=\"%1\">\n").arg(QApplication::isRightToLeft() ? "rtl" : "ltr");
- const QString enc = formatEnclosure( *article.enclosure() );
-
-- if (!article.title().isEmpty())
-+ const QString strippedTitle = Utils::stripTags( article.title() );
-+ if (!strippedTitle.isEmpty())
- {
-- text += QString("<div class=\"headertitle\" dir=\"%1\">\n").arg(Utils::directionOf(Utils::stripTags(article.title())));
-+ text += QString("<div class=\"headertitle\" dir=\"%1\">\n").arg(Utils::directionOf(strippedTitle));
- if (article.link().isValid())
- text += "<a href=\""+article.link().url()+"\">";
-- text += article.title().replace('<', "<").replace('>', ">"); // TODO: better leave things escaped in the parser
-+ text += strippedTitle;
- if (article.link().isValid())
- text += "</a>";
- text += "</div>\n";
-@@ -367,12 +368,14 @@
- const QString enc = formatEnclosure( *article.enclosure() );
- text = QString("<div class=\"headerbox\" dir=\"%1\">\n").arg(QApplication::isRightToLeft() ? "rtl" : "ltr");
-
-- if (!article.title().isEmpty())
-+ const QString strippedTitle = Utils::stripTags( article.title() );
-+
-+ if (!strippedTitle.isEmpty())
- {
-- text += QString("<div class=\"headertitle\" dir=\"%1\">\n").arg(Utils::directionOf(Utils::stripTags(article.title())));
-+ text += QString("<div class=\"headertitle\" dir=\"%1\">\n").arg(Utils::directionOf(strippedTitle));
- if (article.link().isValid())
- text += "<a href=\""+article.link().url()+"\">";
-- text += article.title().replace('<', "<").replace('>', ">"); // TODO: better leave things escaped in the parser
-+ text += strippedTitle;
- if (article.link().isValid())
- text += "</a>";
- text += "</div>\n";
-Index: akregator/src/articlemodel.cpp
-===================================================================
---- akregator/src/articlemodel.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ akregator/src/articlemodel.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -58,12 +58,22 @@
-
- };
+Index: akregator/src/aboutdata.h
+===================================================================
+--- akregator/src/aboutdata.h (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ akregator/src/aboutdata.h (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -28,7 +28,7 @@
+ #include "akregator_export.h"
+ #include <kaboutdata.h>
-+//like Syndication::htmlToPlainText, but without linebreaks
-+
-+static QString stripHtml( const QString& html ) {
-+ QString str(html);
-+ //TODO: preserve some formatting, such as line breaks
-+ str.remove(QRegExp("<[^>]*>")); // remove tags
-+ str = Syndication::resolveEntities(str);
-+ return str.simplified();
-+}
-+
- ArticleModel::Private::Private( const QList<Article>& articles_, ArticleModel* qq )
- : q( qq ), articles( articles_ )
- {
- titleCache.resize( articles.count() );
- for ( int i = 0; i < articles.count(); ++i )
-- titleCache[i] = Syndication::htmlToPlainText( articles[i].title() );
-+ titleCache[i] = stripHtml( articles[i].title() );
- }
+-#define AKREGATOR_VERSION "1.6.1"
++#define AKREGATOR_VERSION "1.6.2"
- Akregator::ArticleModel::ArticleModel(const QList<Article>& articles, QObject* parent) : QAbstractTableModel( parent ), d( new Private( articles, this ) )
-Index: akregator/src/akregator.desktop
-===================================================================
---- akregator/src/akregator.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ akregator/src/akregator.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -72,6 +72,7 @@
- GenericName[en_GB]=Feed Reader
- GenericName[es]=Lector de fuentes
- GenericName[et]=Uudistevoogude lugemisvahend
-+GenericName[fi]=Syötelukija
- GenericName[fr]=Lecteur de flux
- GenericName[ga]=Léitheoir Fothaí
- GenericName[gl]=Lector de novas
-@@ -112,6 +113,7 @@
- Comment[en_GB]=A Feed Reader for KDE
- Comment[es]=Un lector de fuentes
- Comment[et]=KDE uudistevoogude lugemisvahend
-+Comment[fi]=KDE:n RSS-syötelukija
- Comment[fr]=Un lecteur de flux pour KDE
- Comment[ga]=Léitheoir Fothaí KDE
- Comment[gl]=Un lector de novas para o KDE
-Index: akregator/configuration/akregator_config_browser.desktop
-===================================================================
---- akregator/configuration/akregator_config_browser.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ akregator/configuration/akregator_config_browser.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -21,6 +21,7 @@
- Name[en_GB]=Browser
- Name[es]=Navegador
- Name[et]=Sirvija
-+Name[fi]=Selain
- Name[fr]=Navigateur
- Name[ga]=Brabhsálaí
- Name[gl]=Navegador
-@@ -61,6 +62,7 @@
- Comment[en_GB]=Configure Internal Browser Component
- Comment[es]=Configurar el componente navegador interno
- Comment[et]=Sisemise sirvimiskomponendi seadistamine
-+Comment[fi]=Sisäisen selainosan asetukset
- Comment[fr]=Configurer le navigateur web interne
- Comment[gl]=Configurar o compoñente do navegador interno
- Comment[hu]=A belső böngészőkomponens beállítása
-Index: akregator/configuration/akregator_config_appearance.desktop
-===================================================================
---- akregator/configuration/akregator_config_appearance.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ akregator/configuration/akregator_config_appearance.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -85,6 +85,7 @@
- Comment[en_GB]=Configure the Feed Reader Appearance
- Comment[es]=Configurar la apariencia del lector de fuentes
- Comment[et]=Uudistevoogude lugeja välimuse seadistamine
-+Comment[fi]=Syötelukijan ulkoasuasetukset
- Comment[fr]=Configurer l'apparence du lecteur de flux
- Comment[gl]=Configurar a aparencia do lector de novas
- Comment[hu]=Beállítások a hírolvasó megjelenéséhez
-Index: akregator/configuration/akregator_config_advanced.desktop
-===================================================================
---- akregator/configuration/akregator_config_advanced.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ akregator/configuration/akregator_config_advanced.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -22,6 +22,7 @@
- Name[eo]=Pliaj
- Name[es]=Avanzado
- Name[et]=Muu
-+Name[fi]=Lisäasetukset
- Name[fr]=Avancé
- Name[ga]=Ardsocruithe
- Name[gl]=Avanzado
-@@ -62,6 +63,7 @@
- Comment[en_GB]=Advanced Feed Reader Settings
- Comment[es]=Configuración avanzada del lector de fuentes
- Comment[et]=Uudistevoogude lugeja muud seadistused
-+Comment[fi]=Syötelukijan lisäasetukset
- Comment[fr]=Configuration avancé du lecteur de flux
- Comment[gl]=Configuración avanzada do lector de novas
- Comment[hu]=Hírolvasó-beállítások
-Index: akregator/configuration/akregator_config_general.desktop
-===================================================================
---- akregator/configuration/akregator_config_general.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ akregator/configuration/akregator_config_general.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -29,7 +29,7 @@
- Name[et]=Üldine
- Name[eu]=Orokorra
- Name[fa]=عمومی
--Name[fi]=Yleinen
-+Name[fi]=Yleistä
- Name[fr]=Général
- Name[fy]=Algemien
- Name[ga]=Ginearálta
-@@ -83,6 +83,7 @@
- Comment[en_GB]=Configure Feeds
- Comment[es]=Configurar fuentes
- Comment[et]=Uudistevoogude seadistamine
-+Comment[fi]=Syötteiden asetukset
- Comment[fr]=Configurer les flux
- Comment[ga]=Cumraigh Fothaí
- Comment[gl]=Configurar as fontes de novas
-Index: akregator/configuration/akregator_config_archive.desktop
-===================================================================
---- akregator/configuration/akregator_config_archive.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ akregator/configuration/akregator_config_archive.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -21,6 +21,7 @@
- Name[en_GB]=Archive
- Name[es]=Archivo
- Name[et]=Arhiveerimine
-+Name[fi]=Arkisto
- Name[fr]=Archive
- Name[ga]=Cartlann
- Name[gl]=Arquivo
-@@ -60,6 +61,7 @@
- Comment[en_GB]=Configure Feed Archive
- Comment[es]=Configurar el archivo de fuentes
- Comment[et]=Uudistevoogude arhiveerimise seadistamine
-+Comment[fi]=Syötearkiston asetukset
- Comment[fr]=Configurer les archives des flux
- Comment[ga]=Cumraigh Cartlann na bhFothaí
- Comment[gl]=Configurar o arquivo de fontes de novas
+ namespace Akregator {
+ /**
Index: libkleo/libkleopatrarc.desktop
===================================================================
---- libkleo/libkleopatrarc.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ libkleo/libkleopatrarc.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -19,6 +19,7 @@
+--- libkleo/libkleopatrarc.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ libkleo/libkleopatrarc.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -15,6 +15,7 @@
+ Name[it]=TAR (compatibile PGP®)
+ Name[ja]=TAR (PGP® 互換)
+ Name[km]=TAR (PGP®-compatible)
++Name[lt]=TAR (suderinama su PGP®)
+ Name[lv]=TAR (PGP®-saderīgs)
Name[nb]=TAR (PGP®-kompatibel)
Name[nds]=TAR (PGP®-kompatibel)
- Name[nl]=TAR (PGP®-compatible)
-+Name[nn]=TAR (PGP®-kompatibel)
- Name[pa]=TAR (PGP®-ਅਨੁਕੂਲ)
- Name[pl]=TAR (kompatybilny z PGP®)
- Name[pt]=TAR (compatível com o PGP®)
-@@ -53,6 +54,7 @@
+@@ -50,6 +51,7 @@
+ Name[it]=ZIP
+ Name[ja]=ZIP
+ Name[km]=ZIP
++Name[lt]=ZIP
+ Name[lv]=ZIP
Name[nb]=ZIP
Name[nds]=Zip
- Name[nl]=ZIP
-+Name[nn]=ZIP
- Name[pa]=ZIP
- Name[pl]=ZIP
- Name[pt]=ZIP
-@@ -86,6 +88,7 @@
+@@ -84,6 +86,7 @@
+ Name[it]=TAR (con compressione bzip2)
+ Name[ja]=TAR (bzip2 圧縮)
+ Name[km]=TAR (with bzip2 compression)
++Name[lt]=TAR (su bzip2 suspaudimu)
+ Name[lv]=TAR (ar bzip2 saspiešanu)
Name[nb]=TAR (med bzip2-komprimering)
Name[nds]=TAR (mit bzip2-Komprimeren)
- Name[nl]=TAR (met bzip2 compressie)
-+Name[nn]=TAR (med bzip2-komprimering)
- Name[pl]=TAR (z kompresją bzip2)
- Name[pt]=TAR (com compressão bzip2)
- Name[pt_BR]=TAR (com compressão em bzip2)
-Index: kleopatra/kleopatra_import.desktop
-===================================================================
---- kleopatra/kleopatra_import.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kleopatra/kleopatra_import.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -78,6 +78,7 @@
- Comment[en_GB]=Certificate Manager and Unified Crypto GUI
- Comment[es]=Gestor de certificados e interfaz gráfica unificada de cifrado
- Comment[et]=Sertifikaadihaldur ja ühendatud krüptimise graafiline kasutajaliides
-+Comment[fi]=Varmenteiden hallinta ja yhtenäinen salauskäyttöliittymä
- Comment[fr]=Interface de gestion des certificats et cryptographie unifiée
- Comment[gl]=Xestor de certificados e interface gráfica unificada de criptografía
- Comment[hu]=Tanúsítványkezelő és egységes kriptográfiai kezelőfelület
-Index: kleopatra/conf/kleopatra_config_smimevalidation.desktop
-===================================================================
---- kleopatra/conf/kleopatra_config_smimevalidation.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kleopatra/conf/kleopatra_config_smimevalidation.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -23,6 +23,7 @@
- Name[en_GB]=S/MIME Validation
- Name[es]=Validación S/MIME
- Name[et]=S/MIME valideerimine
-+Name[fi]=S/MIME-tarkistus
- Name[fr]=Validation S/MIME
- Name[gl]=Validación S/MIME
- Name[hu]=S/MIME-ellenőrzés
-@@ -60,6 +61,7 @@
- Comment[en_GB]=Configuration of S/MIME certificate validation options
- Comment[es]=Configuración de las opciones de los certificados de validación S/MIME
- Comment[et]=S/MIME sertifikaatide valideerimise valikute seadistamine
-+Comment[fi]=S/MIME-varmenteentarkistuksen asetukset
- Comment[fr]=Configuration des options de validation des certificats S/MIME
- Comment[gl]=Configuración das opcións de validación de certificados S/MIME
- Comment[hu]=Az S/MIME-tanúsítványok ellenőrzési beállításai
+@@ -476,7 +479,7 @@
+ is-cardkey=true
+ Name=Smartcard Key
+ Name[ca]=Clau de targeta intel·ligent
+-Name[ca@valencia]=Clau Smartcard
++Name[ca@valencia]=Clau de targeta intel·ligent
+ Name[da]=Smartcard-nøgle
+ Name[de]=Smartcard-Zertifikat
+ Name[el]=Κλειδί έξυπνης κάρτας
+@@ -488,6 +491,7 @@
+ Name[it]=Chiave smartcard
+ Name[ja]=スマートカードの鍵
+ Name[km]=សោ Smartcard
++Name[lt]=Smartcard raktas
+ Name[lv]=Viedkartes atslēga
+ Name[nb]=Smartkort-nøkkel
+ Name[nds]=Smartkoort-Slötel
Index: kleopatra/conf/kleopatra_config_gnupgsystem.desktop
===================================================================
---- kleopatra/conf/kleopatra_config_gnupgsystem.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kleopatra/conf/kleopatra_config_gnupgsystem.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -23,6 +23,7 @@
- Name[en_GB]=GnuPG System
- Name[es]=Sistema GnuPG
- Name[et]=GnuPG süsteem
-+Name[fi]=GnuPG-järjestelmä
- Name[fr]=Système GnuPG
- Name[ga]=Córas GnuPG
- Name[gl]=Sistema GnuPG
-@@ -59,6 +60,7 @@
- Comment[en_GB]=Configuration of GnuPG System options
- Comment[es]=Configuración de las opciones del sistema GnuPG
- Comment[et]=GnuPG süsteemi valikute seadistamine
-+Comment[fi]=GnuPG-järjestelmän asetukset
- Comment[fr]=Configuration des options du système GnuPG
- Comment[gl]=Configuración das opcións do Sistema GnuPG
- Comment[hu]=A GnuPG beállításai
-Index: kleopatra/conf/kleopatra_config_dnorder.desktop
-===================================================================
---- kleopatra/conf/kleopatra_config_dnorder.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kleopatra/conf/kleopatra_config_dnorder.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -28,7 +28,7 @@
- Name[et]=DN-atribuutide järjekord
- Name[eu]=DN-atributu ordena
- Name[fa]=ترتیب خصیصۀ DN
--Name[fi]=DN-attribuuttien järjestys
-+Name[fi]=DN-määritteiden järjestys
- Name[fr]=Ordre des attributs DN
- Name[fy]=DN-Attribuutoarder
- Name[ga]=Ord aitreabúidí DN
-@@ -82,7 +82,7 @@
- Comment[et]=DN-atribuutide näitamise järjekorra seadistamine
- Comment[eu]=Konfiguratu DN atributuak zein ordenetan erakutsiko diren
- Comment[fa]=پیکربندی ترتیبی که خصیصههای DN طبق آن نمایش داده میشوند
--Comment[fi]=Määrittele missä järjestyksessä DN-attribuutit näytetään
-+Comment[fi]=Aseta DN-määritteiden esitysjärjestys
- Comment[fr]=Configurer l'ordre dans lequel les attributs DN sont affichés
- Comment[fy]=De folchoarder fan de DN-atributen ynstelle
- Comment[ga]=Cumraigh an t-ord ina dtaispeánfar aitreabúidí DN
-Index: kleopatra/conf/kleopatra_config_dirserv.desktop
-===================================================================
---- kleopatra/conf/kleopatra_config_dirserv.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kleopatra/conf/kleopatra_config_dirserv.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -79,6 +79,7 @@
- Comment[en_GB]=Configuration of directory services
- Comment[es]=Configuración de los servicios de directorio
- Comment[et]=Kataloogiteenuste seadistused
-+Comment[fi]=Hakemistopalvelujen asetukset
- Comment[fr]=Configuration des annuaires
- Comment[ga]=Cumraíocht seirbhísí eolaire
- Comment[gl]=Configuración dos servizos de directorio
-Index: kleopatra/kleopatra_decryptverifyfolders.desktop
-===================================================================
---- kleopatra/kleopatra_decryptverifyfolders.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kleopatra/kleopatra_decryptverifyfolders.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -13,6 +13,7 @@
- Name[en_GB]=Kleopatra Decrypt/Verify All Files In Folder
- Name[es]=Kleopatra Descifrar/verificar todos los archivos en la carpeta
- Name[et]=Kleopatra kõigi kataloogi failide lahtikrüptimine/kontrollimine
-+Name[fi]=Kleopatra: pura/varmista kaikki kansion tiedostot
- Name[fr]=Kleopatra vérification et déchiffrement de tous les fichiers dans un dossier
- Name[gl]=Descifrar/Verificar todos os ficheiros do cartafol co Kleopatra
- Name[hu]=Kleopatra - Fájlok dekódolása és ellenőrzése egy mappában
-@@ -53,6 +54,7 @@
- Name[en_GB]=Decrypt/Verify All Files In Folder
- Name[es]=Descifrar/verificar todos los archivos en la carpeta
- Name[et]=Kõigi kataloogi failide lahtikrüptimine/kontrollimine
-+Name[fi]=Pura kaikkien kansion tiedostojen salaus tai tarkista tiedostot
- Name[fr]=Vérifier et déchiffrer tous les fichiers dans un dossier
- Name[gl]=Descifrar/Verificar todos os ficheiros do cartafol
- Name[hu]=Dekódol és ellenőriz minden fájlt egy mappában
+--- kleopatra/conf/kleopatra_config_gnupgsystem.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kleopatra/conf/kleopatra_config_gnupgsystem.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -31,6 +31,7 @@
+ Name[it]=Sistema GnuPG
+ Name[ja]=GnuPG システム
+ Name[km]=ប្រព័ន្ធ GnuPG
++Name[lt]=GnuPG sistema
+ Name[lv]=GnuPG sistēma
+ Name[nb]=GnuPG-system
+ Name[nds]=GnuPG-Systeem
+@@ -67,6 +68,7 @@
+ Comment[it]=Configurazione delle opzioni del sistema GnuPG
+ Comment[ja]=GnuPG システムのオプション設定
+ Comment[km]=ការកំណត់រចនាសម្ព័ន្ធរបស់ជម្រើសប្រព័ន្ធ GnuPG
++Comment[lt]=GnuPG sistemos nustatymų konfigūravimas
+ Comment[lv]=GnuPG sistēmas iestatījumu konfigurēšana
+ Comment[nb]=Oppsett av GnuPG systemvalg
+ Comment[nds]=De GnuPG-Systeemoptschonen instellen
Index: kleopatra/kleopatra.desktop
===================================================================
---- kleopatra/kleopatra.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kleopatra/kleopatra.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -74,6 +74,7 @@
- GenericName[en_GB]=Certificate Manager and Unified Crypto GUI
- GenericName[es]=Gestor de certificados e interfaz gráfica unificada de cifrado
- GenericName[et]=Sertifikaadihaldur ja ühendatud krüptimise graafiline kasutajaliides
-+GenericName[fi]=Varmenteiden hallinta ja yhtenäinen salauskäyttöliittymä
- GenericName[fr]=Interface de gestion des certificats et cryptographie unifiée
- GenericName[gl]=Xestor de certificados e interface gráfica unificada de criptografía
+--- kleopatra/kleopatra.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kleopatra/kleopatra.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -80,6 +80,7 @@
GenericName[it]=Gestore di certificati e interfaccia grafica unificata di crittografia
-Index: kleopatra/kleopatra_decryptverifyfiles.desktop
-===================================================================
---- kleopatra/kleopatra_decryptverifyfiles.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kleopatra/kleopatra_decryptverifyfiles.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -14,6 +14,7 @@
- Name[en_GB]=Kleopatra Decrypt/Verify Files
- Name[es]=Kleopatra Descifrar/verificar archivos
- Name[et]=Kleopatra failide lahtikrüptimine/kontrollimine
-+Name[fi]=Kleopatra: pura/varmista tiedostot
- Name[fr]=Kleopatra vérification et déchiffrement de fichiers
- Name[gl]=Descifrar/Verificar ficheiros con Kleopatra
- Name[hu]=Kleopatra - Fájlok dekódolása és ellenőrzése
-@@ -54,6 +55,7 @@
- Name[en_GB]=Decrypt/Verify File
- Name[es]=Descifrar/verificar archivo
- Name[et]=Faili lahtikrüptimine/kontrollimine
-+Name[fi]=Pura tiedoston salaus tai tarkista tiedosto
- Name[fr]=Vérifier et déchiffrer le fichier
- Name[gl]=Descifrar/Verificar ficheiros
- Name[hu]=Fájlok dekódolása és ellenőrzése
-Index: kleopatra/kleopatra_signencryptfolders.desktop
-===================================================================
---- kleopatra/kleopatra_signencryptfolders.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kleopatra/kleopatra_signencryptfolders.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -14,6 +14,7 @@
- Name[en_GB]=Kleopatra Sign/Encrypt Folders
- Name[es]=Kleopatra Firmar/cifrar carpetas
- Name[et]=Kleopatra kataloogide allkirjastamine/krüptimine
-+Name[fi]=Kleopatra: allekirjoita/salaa kansioita
- Name[fr]=Kleopatra signature et chiffrement de dossiers
- Name[gl]=Asinar/Cifrar cartafoles co Kleopatra
- Name[hu]=Kleopatra - Mappák aláírása és titkosítása
-@@ -53,6 +54,7 @@
- Name[en_GB]=Archive, Sign & Encrypt Folder
- Name[es]=Archivar, firmar y cifrar carpeta
- Name[et]=Kataloogi arhiveerimine, allkirjastamine ja krüptimine
-+Name[fi]=Arkistoi, allekirjoita ja salaa kansio
- Name[fr]=Archiver, signer et chiffrer le dossier
- Name[gl]=Arquivar, asinar e cifrar o cartafol
- Name[hu]=Mappa archiválása, aláírása és titkosítása
-@@ -95,6 +97,7 @@
- Name[eo]=Arkivigi kaj ĉifri dosierujon
- Name[es]=Archivar y cifrar carpeta
- Name[et]=Kataloogi arhiveerimine ja krüptimine
-+Name[fi]=Arkistoi ja salaa kansio
- Name[fr]=Archiver et chiffrer le dossier
- Name[ga]=Cuir Fillteán i gCartlann agus Criptigh É
- Name[gl]=Arquivar e cifrar o cartafol
-Index: kleopatra/kleopatra_signencryptfiles.desktop
-===================================================================
---- kleopatra/kleopatra_signencryptfiles.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kleopatra/kleopatra_signencryptfiles.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -15,6 +15,7 @@
- Name[en_GB]=Kleopatra Sign/Encrypt Files
- Name[es]=Firmar/cifrar archivos con Kleopatra
- Name[et]=Kleopatra failide allkirjastamine/krüptimine
-+Name[fi]=Kleopatra: allekirjoita/salaa tiedostoja
- Name[fr]=Kleopatra signature et chiffrement de fichiers
- Name[gl]=Asinar/Cifrar ficheiros co Kleopatra
- Name[hu]=Kleopatra - Fájlok aláírása és titkosítása
-@@ -55,6 +56,7 @@
- Name[en_GB]=Encrypt & Sign File
- Name[es]=Cifrar y firmar archivo
- Name[et]=Faili krüptimine ja allkirjastamine
-+Name[fi]=Salaa ja allekirjoita tiedosto
- Name[fr]=Chiffrer et signer le fichier
- Name[gl]=Cifrar e asinar o ficheiro
- Name[hu]=Fájl aláírása és titkosítása
-@@ -98,6 +100,7 @@
- Name[eo]=Ĉifri dosieron
- Name[es]=Cifrar archivo
- Name[et]=Faili krüptimine
-+Name[fi]=Salaa tiedosto
- Name[fr]=Chiffrer le fichier
- Name[ga]=Criptigh Comhad
- Name[gl]=Cifrar o ficheiro
-@@ -141,6 +144,7 @@
- Name[en_GB]=OpenPGP-Sign File
- Name[es]=Firmar archivo con OpenPGP
- Name[et]=Faili OpenPGP-allkirjastamine
-+Name[fi]=OpenPGP-allekirjoita tiedosto
- Name[fr]=Signer le fichier avec OpenPGP
- Name[gl]=Asinar o ficheiro con OpenPGP
- Name[hu]=OpenPGP-aláírásfájl
-@@ -182,6 +186,7 @@
- Name[en_GB]=S/MIME-Sign File
- Name[es]=Firmar archivo con S/MIME
- Name[et]=Faili S/MIME-allkirjastamine
-+Name[fi]=S/MIME-allekirjoita tiedosto
- Name[fr]=Signer le fichier avec S/MIME
- Name[gl]=Asinar o ficheiro con S/MIME
- Name[hu]=S/MIME-aláírásfájl
-Index: runtime/tray/akonaditray.desktop
-===================================================================
+ GenericName[ja]=証明書マネージャと、統合された暗号 GUI
+ GenericName[km]=កម្មវិធីគ្រប់គ្រងវិញ្ញាបនបត្រ និង Unified Crypto GUI
++GenericName[lt]=Sertifikatų tvarkyklė ir vieninga kriptografinė sąsaja
+ GenericName[lv]=Sertifikātu pārvaldnieks un vienota kriptofgrāfijas saskarne
+ GenericName[nb]=Sertifikatbehandler og forent krypto-GUI
+ GenericName[nds]=Zertifikatenpleger un eenheitlich Verslötel-Böversiet
Index: runtime/plugins/akonadi_serializer_microblog.desktop
===================================================================
-Index: runtime/plugins/akonadi_serializer_mail.desktop
+Index: runtime/agents/nepomuk_calendar_feeder/nepomukcalendarfeeder.desktop
===================================================================
-Index: runtime/migration/kres/kresmigrator.h
+Index: runtime/agents/maildispatcher/maildispatcheragent.desktop
===================================================================
-Index: runtime/resources/nntp/nntpresource.desktop
+Index: runtime/kresources/kabc/akonadi.desktop
===================================================================
-Index: runtime/resources/pop3/pop3resource.desktop
-===================================================================
-Index: runtime/resources/pop3/accountdialog.cpp
+Index: runtime/kresources/kcal/akonadi.desktop
===================================================================
-Index: runtime/resources/knut/knutresource.desktop
+Index: runtime/migration/kaddressbook/kaddressbookmigrator.desktop
===================================================================
-Index: runtime/resources/maildir/maildirresource.cpp
+Index: runtime/kcm/kcm_akonadi.desktop
===================================================================
-Index: runtime/resources/imap/imapaccount.cpp
+Index: runtime/resources/pop3/pop3resource.desktop
===================================================================
Index: runtime/resources/imap/imapresource.desktop
===================================================================
Index: runtime/resources/birthdays/birthdaysresource.desktop
===================================================================
-Index: runtime/resources/vcarddir/vcarddirresource.desktop
-===================================================================
-Index: runtime/resources/vcard/vcardresource.desktop
+Index: runtime/resources/kolabproxy/kolabproxyresource.desktop
===================================================================
Index: runtime/resources/kabc/kabcresource.desktop
===================================================================
-Index: runtime/resources/kabc/kresourceassistant.cpp
+Index: runtime/resources/localbookmarks/localbookmarksresource.desktop
===================================================================
Index: runtime/resources/mbox/mboxresource.desktop
===================================================================
-Index: runtime/resources/openchange/ocresource.desktop
-===================================================================
-Index: runtime/resources/ical/icalresource.desktop
-===================================================================
Index: runtime/resources/ical/notes/notesresource.desktop
===================================================================
-Index: runtime/resources/nepomuktag/nepomuktagresource.desktop
-===================================================================
-Index: runtime/resources/kcal/kcalresource.desktop
+Index: runtime/resources/mailtransport_dummy/mtdummyresource.desktop
===================================================================
Index: runtime/resources/microblog/microblog.desktop
===================================================================
Index: runtime/resources/contacts/contactsresource.desktop
===================================================================
-Index: kresources/remote/resourceremoteconfig.cpp
+Index: wizards/groupwisewizard.cpp
===================================================================
---- kresources/remote/resourceremoteconfig.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kresources/remote/resourceremoteconfig.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -93,7 +93,7 @@
-
- if ( mUploadUrl->url().isEmpty() && !resource->readOnly() ) {
- KMessageBox::information( this, i18n( "You have specified no upload URL, "
-- "the calendar will be read-only." ), "RemoteResourseNoUploadURL" );
-+ "the calendar will be read-only." ),QString(), "RemoteResourseNoUploadURL");
- resource->setReadOnly( true );
- }
- } else {
+--- wizards/groupwisewizard.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ wizards/groupwisewizard.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -195,7 +195,7 @@
+ {
+ ChangeConfig *c = new ChangeConfig;
+ c->file = "korganizerrc";
+- c->group = "FreeBusy";
++ c->group = "FreeBusy Retrieve";
+ c->name = "FreeBusyRetrieveUrl";
+ c->value = "groupwise://" + GroupwiseConfig::self()->host() + GroupwiseConfig::self()->path() +
+ "/freebusy/";
+Index: wizards/kolabwizard.cpp
+===================================================================
+--- wizards/kolabwizard.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ wizards/kolabwizard.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -176,7 +176,7 @@
+
+ ChangeConfig *c = new ChangeConfig;
+ c->file = "korganizerrc";
+- c->group = "FreeBusy";
++ c->group = "FreeBusy Publish";
+
+ c->name = "FreeBusyPublishUrl";
+
+@@ -201,7 +201,7 @@
+
+ ChangeConfig *c = new ChangeConfig;
+ c->file = "korganizerrc";
+- c->group = "FreeBusy";
++ c->group = "FreeBusy Retrieve";
+ c->name = "FreeBusyRetrieveUrl";
+ c->value = freeBusyBaseUrl.url();
+ changes.append( c );
+@@ -209,7 +209,7 @@
+ // Use full email address for retrieval of free/busy lists
+ c = new ChangeConfig;
+ c->file = "korganizerrc";
+- c->group = "FreeBusy";
++ c->group = "FreeBusy Retrieve";
+ c->name = "FreeBusyFullDomainRetrieval";
+ c->value = "true";
+ changes.append( c );
+Index: wizards/groupwise.kcfg
+===================================================================
+--- wizards/groupwise.kcfg (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ wizards/groupwise.kcfg (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -72,14 +72,14 @@
+ </group>
+
+ <propagation source="groupwiserc/Constants/EnableFreeBusy"
+- target="korganizerrc/FreeBusy/FreeBusyRetrieveAuto" />
++ target="korganizerrc/FreeBusy Retrieve/FreeBusyRetrieveAuto" />
+
+ <propagation source="groupwiserc/General/User"
+- target="korganizerrc/FreeBusy/FreeBusyRetrieveUser" />
++ target="korganizerrc/FreeBusy Retrieve/FreeBusyRetrieveUser" />
+ <propagation source="groupwiserc/General/Password"
+- target="korganizerrc/FreeBusy/FreeBusyRetrievePassword"
++ target="korganizerrc/FreeBusy Retrieve/FreeBusyRetrievePassword"
+ hidevalue="true" />
+ <propagation source="groupwiserc/General/SavePassword"
+- target="korganizerrc/FreeBusy/FreeBusyRetrieveSavePassword" />
++ target="korganizerrc/FreeBusy Retrieve/FreeBusyRetrieveSavePassword" />
+
+ </kcfg>
+Index: wizards/slox.kcfg
+===================================================================
+--- wizards/slox.kcfg (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ wizards/slox.kcfg (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -47,6 +47,6 @@
+ </group>
+
+ <propagation source="sloxrc/Constants/EnableFreeBusy"
+- target="korganizerrc/FreeBusy/FreeBusyRetrieveAuto" />
++ target="korganizerrc/FreeBusy Retrieve/FreeBusyRetrieveAuto" />
+
+ </kcfg>
+Index: wizards/kolab.kcfg
+===================================================================
+--- wizards/kolab.kcfg (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ wizards/kolab.kcfg (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -45,24 +45,24 @@
+ </group>
+
+ <propagation source="kolabrc/General/Kolab1Legacy"
+- target="korganizerrc/FreeBusy/FreeBusyPublishAuto" />
++ target="korganizerrc/FreeBusy Publish/FreeBusyPublishAuto" />
+ <propagation source="kolabrc/Constants/EnableFreeBusy"
+- target="korganizerrc/FreeBusy/FreeBusyRetrieveAuto" />
++ target="korganizerrc/FreeBusy Publish/FreeBusyRetrieveAuto" />
+
+ <propagation source="kolabrc/General/User"
+- target="korganizerrc/FreeBusy/FreeBusyPublishUser" />
++ target="korganizerrc/FreeBusy Publish/FreeBusyPublishUser" />
+ <propagation source="kolabrc/General/Password"
+- target="korganizerrc/FreeBusy/FreeBusyPublishPassword"
++ target="korganizerrc/FreeBusy Publish/FreeBusyPublishPassword"
+ hidevalue="true" />
+ <propagation source="kolabrc/General/SavePassword"
+- target="korganizerrc/FreeBusy/FreeBusyPublishSavePassword" />
++ target="korganizerrc/FreeBusy Publish/FreeBusyPublishSavePassword" />
+
+ <propagation source="kolabrc/General/User"
+- target="korganizerrc/FreeBusy/FreeBusyRetrieveUser" />
++ target="korganizerrc/FreeBusy Retrieve/FreeBusyRetrieveUser" />
+ <propagation source="kolabrc/General/Password"
+- target="korganizerrc/FreeBusy/FreeBusyRetrievePassword"
++ target="korganizerrc/FreeBusy Retrieve/FreeBusyRetrievePassword"
+ hidevalue="true" />
+ <propagation source="kolabrc/General/SavePassword"
+- target="korganizerrc/FreeBusy/FreeBusyRetrieveSavePassword" />
++ target="korganizerrc/FreeBusy Retrieve/FreeBusyRetrieveSavePassword" />
+
+ </kcfg>
+Index: wizards/groupwarewizard.desktop
+===================================================================
+--- wizards/groupwarewizard.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ wizards/groupwarewizard.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -11,7 +11,7 @@
+ Name[de]=KDE Groupware-Assistent
+ Name[el]=Μάγος Groupware του KDE
+ Name[en_GB]=KDE Groupware Wizard
+-Name[es]=Asistente de Groupware de KDE
++Name[es]=Asistente de trabajo en grupo de KDE
+ Name[et]=KDE Groupware nõustaja
+ Name[eu]=KDE groupware morroia
+ Name[fa]=جادوگر KDE Groupware
+Index: kresources/slox/kabc_ox.desktop
+===================================================================
+--- kresources/slox/kabc_ox.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kresources/slox/kabc_ox.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -58,7 +58,7 @@
+ Comment[de]=Ermöglicht den Zugriff auf Kontakte, die auf einem Open-Xchange-Server gespeichert sind.
+ Comment[el]=Προσφέρει πρόσβαση σε επαφές αποθηκευμένες σε έναν εξυπηρετητή Open-Xchange
+ Comment[en_GB]=Provides access to contacts stored on an Open-Xchange server
+-Comment[es]=Provee acceso a los contactos almacenados en un servidor Open-Xchange
++Comment[es]=Proporciona acceso a los contactos almacenados en un servidor Open-Xchange
+ Comment[et]=Võimaldab kasutada kontakte, mis on salvestatud Open-Xchange'i serverisse
+ Comment[fr]=Fourni l'accès aux contacts stockés dans un serveur Open-Xchange
+ Comment[gl]=Permite acceder aos contactos almacenados nun servidor de Open-Xchange
+Index: kresources/groupdav/kabc_groupdav.desktop
+===================================================================
+--- kresources/groupdav/kabc_groupdav.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kresources/groupdav/kabc_groupdav.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -57,7 +57,7 @@
+ Comment[de]=Ermöglicht den Zugriff auf Kontakte, die in einem Adressbuch auf einem GroupDAV-Server wie z. B. OpenGroupware gespeichert sind.
+ Comment[el]=Προσφέρει πρόσβαση σε επαφές αποθηκευμένες σε βιβλία διευθύνσεων εξυπηρετών GroupDAV, π.χ. το OpenGroupware
+ Comment[en_GB]=Provides access to contacts stored in address books on GroupDAV enabled servers, e.g. OpenGroupware
+-Comment[es]=Provee acceso a los contactos almacenados en la libreta de direcciones en un servidor GroupDAV habilitado, por ej. OpenGroupware
++Comment[es]=Provee acceso a los contactos almacenados en la libreta de direcciones en un servidor GroupDAV habilitado, p.e. OpenGroupware
+ Comment[et]=Võimaldab kasutada kontakte, mis on salvestatud aadressiraamatutesse GroupDAVi toetusega serverites (nt OpenGroupware)
+ Comment[fr]=Fourni l'accès aux contacts stockés dans les dossiers du carnet d'adresses d'un serveur prenant en charge GroupDAV comme par exemple OpenGroupware
+ Comment[gl]=Permite acceder aos contactos almacenados nos cadernos de enderezos dos servidores con GroupDAV, p. ex. OpenGroupware
+Index: kresources/kolab/kabc/kolab.desktop
+===================================================================
+--- kresources/kolab/kabc/kolab.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kresources/kolab/kabc/kolab.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -17,6 +17,7 @@
+ Name[it]=Rubrica indirizzi su server IMAP via KMail
+ Name[ja]=KMail 経由 IMAP サーバのアドレス帳
+ Name[km]=សៀវភៅអាសយដ្ឋានលើម៉ាស៊ីនបម្រើ IMAP តាមរយៈ KMail
++Name[lt]=Adresų knygelė IMAP serveryje per KMail
+ Name[lv]=Adrešu grāmata uz IMAP servera, izmantojot KMail
+ Name[nb]=Adressebok på IMAP-tjener via KMail
+ Name[nds]=Adressbook op IMAP-Server över KMail
+Index: kresources/groupware/kabc_groupware.desktop
+===================================================================
+--- kresources/groupware/kabc_groupware.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kresources/groupware/kabc_groupware.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -11,7 +11,7 @@
+ Name[de]=Groupware-Server
+ Name[el]=Εξυπηρετητής Groupware
+ Name[en_GB]=Groupware Server
+-Name[es]=Servidor de Groupware
++Name[es]=Servidor de trabajo en grupo
+ Name[et]=Grupitöö server
+ Name[eu]=Groupware zerbitzaria
+ Name[fa]=کارساز Groupware
+@@ -60,7 +60,7 @@
+ Comment[de]=Ermöglicht den Zugriff auf Kontakte, die auf einem Groupware-Server gespeichert sind.
+ Comment[el]=Προσφέρει πρόσβαση σε επαφές αποθηκευμένες σε έναν εξυπηρετητή Groupware.
+ Comment[en_GB]=Provides access to contacts stored on a Groupware server.
+-Comment[es]=Provee acceso a los contactos almacenados en un servidor Groupware.
++Comment[es]=Proporciona acceso a los contactos almacenados en un servidor de trabajo en grupo.
+ Comment[et]=Võimaldab kasutada grupitöö serverisse salvestatud kontakte.
+ Comment[fr]=Fourni l'accès aux contacts stockés un serveur collaboratif.
+ Comment[gl]=Permite acceder aos contactos almacenados nun servidor de Groupware.
+Index: kresources/groupware/kcal_groupware.desktop
+===================================================================
+--- kresources/groupware/kcal_groupware.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kresources/groupware/kcal_groupware.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -11,7 +11,7 @@
+ Name[de]=Groupware-Server
+ Name[el]=Εξυπηρετητής Groupware
+ Name[en_GB]=Groupware Server
+-Name[es]=Servidor de Groupware
++Name[es]=Servidor de trabajo en grupo
+ Name[et]=Grupitöö server
+ Name[eu]=Groupware zerbitzaria
+ Name[fa]=کارساز Groupware
+Index: kresources/remote/remote.desktop
+===================================================================
+--- kresources/remote/remote.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kresources/remote/remote.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -62,7 +62,7 @@
+ Comment[de]=Ermöglicht den Zugriff auf einen entfernten Kalender über KDEs Netzwerk-Zugriffsystem KIO.
+ Comment[el]=Προσφέρει πρόσβαση ημερολογίου σε ένα απομακρυσμένο αρχείο με τη χρήση του
συστήματος KIO του KDE
+ Comment[en_GB]=Provides access to a calendar in a remote file using KDE's network framework KIO
+-Comment[es]=Provee acceso a un calendario en un archivo remoto utilizando la infraestructura KIO de red de KDE
++Comment[es]=Proporciona acceso a un calendario en un archivo remoto utilizando la infraestructura KIO de red de KDE
+ Comment[et]=Võimaldab kasutada võrgufaili salvestatud kalendrit KDE võrguraamistiku KIO abil
+ Comment[fr]=Fourni l'accès à un calendrier dans un fichier distant en utilisant les composants réseaux KIO de KDE
+ Comment[gl]=Permite acceder a un calendario nun ficheiro remoto empregando a infraestrutura de rede KIO do KDE
Index: blogilo/blogilo.desktop
===================================================================
---- blogilo/blogilo.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ blogilo/blogilo.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -9,6 +9,7 @@
- Name[eo]=Blogilo
- Name[es]=Blogilo
- Name[et]=Blogilo
-+Name[fi]=Blogilo
- Name[fr]=Blogilo
- Name[gl]=Blogilo
+--- blogilo/blogilo.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ blogilo/blogilo.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -15,6 +15,7 @@
Name[it]=Blogilo
-@@ -18,6 +19,7 @@
+ Name[ja]=Blogilo
+ Name[km]=Blogilo
++Name[lt]=Blogilo
+ Name[lv]=Blogilo
Name[nb]=Blogilo
Name[nds]=Blogilo
- Name[nl]=Blogilo
-+Name[nn]=Blogilo
- Name[pl]=Blogilo
- Name[pt]=Blogilo
- Name[pt_BR]=Blogilo
-@@ -41,6 +43,7 @@
+@@ -41,7 +42,7 @@
+ GenericName[de]=Ein Blogging-Programm für KDE
+ GenericName[el]=Μία εφαρμογή του KDE για blogging
GenericName[en_GB]=A KDE Blogging Client
- GenericName[es]=Un cliente de Blog par KDE
+-GenericName[es]=Un cliente de Blog par KDE
++GenericName[es]=Un cliente de Blog para KDE
GenericName[et]=KDE ajaveebiklient
-+GenericName[fi]=KDE:n blogausasiakas
+ GenericName[fi]=KDE:n blogausasiakas
GenericName[fr]=Un client de Blog pour KDE
- GenericName[gl]=Un cliente para blogues de KDE
+@@ -49,6 +50,7 @@
GenericName[it]=Un client KDE per scrivere blog
-@@ -50,6 +53,7 @@
+ GenericName[ja]=KDE のブログ用クライアント
+ GenericName[km]=ម៉ាស៊ីនប្លុករបស់ KDE
++GenericName[lt]=KDE tinklaraštinimo klientas
+ GenericName[lv]=KDE emuāru klients
GenericName[nb]=En KDE-klient for blogging
GenericName[nds]=En Nettdaagbook-Programm för KDE
- GenericName[nl]=Een KDE Blogging-client
-+GenericName[nn]=Bloggklient for KDE
- GenericName[pl]=Klient blogów dla KDE
- GenericName[pt]=Um Cliente de Blogs para o KDE
- GenericName[pt_BR]=Um cliente de blog do KDE
-Index: blogilo/src/addeditblog.cpp
-===================================================================
---- blogilo/src/addeditblog.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ blogilo/src/addeditblog.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -290,6 +290,7 @@
- mFetchAPITimer = 0;
- hideWaitWidget();
- ui.txtId->setEnabled( true );
-+ ui.txtId->setText( QString() );
- KMessageBox::sorry( this, i18n( "The API guess function has failed, \
- please check your Internet connection. Otherwise, you have to set the API type manually on the Advanced tab." ),
- i18n( "Auto Configuration Failed" ) );
-@@ -299,6 +300,7 @@
- {
- kDebug() << " ErrorType: " << type;
- ui.txtId->setEnabled( true );
-+ ui.txtId->setText( QString() );
- hideWaitWidget();
- KMessageBox::detailedError( this, i18n( "Fetching BlogID Failed.\nPlease check your Internet connection." ), errorMsg );
- }
-@@ -347,11 +349,14 @@
- apiUrl = qobject_cast<QLabel*>( blogsList->cellWidget(row, 3) )->text();
- } else
- return;
-+ } else if (list.count() > 0) {
-+ blogId = list.constBegin()->value("id");
-+ blogName = list.constBegin()->value("title");
-+ blogUrl = list.constBegin()->value("url");
-+ apiUrl = list.constBegin()->value("apiUrl");
- } else {
-- blogId = list.begin()->value("id");
-- blogName = list.begin()->value("title");
-- blogUrl = list.begin()->value("url");
-- apiUrl = list.begin()->value("apiUrl");
-+// KMessageBox::sorry(this, i18n("Sorry, No blog found with the specified account info."));
-+ return;
- }
- ui.txtId->setText( blogId );
- ui.txtTitle->setText( blogName );
-Index: blogilo/src/composer/stylegetter.cpp
-===================================================================
---- blogilo/src/composer/stylegetter.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ blogilo/src/composer/stylegetter.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -82,7 +82,6 @@
- b = new Backend( blogid );
- connect( b, SIGNAL( sigPostPublished( int, BilboPost* ) ), this,
- SLOT( sltTempPostPublished( int, BilboPost* ) ) );
--// connect( b, SIGNAL( sigPostFetched( BilboPost * ) ), this, SLOT( sltTempPostFetched( BilboPost * ) ) );
- connect( b, SIGNAL( sigError( const QString& ) ), this, SLOT( sltError( const QString& ) ) );
-
- Q_EMIT sigGetStyleProgress( 10 );
-@@ -160,9 +159,9 @@
-
- mTempPost = post;
- KIO::StoredTransferJob *job = KIO::storedGet( postUrl, KIO::NoReload, KIO::HideProgressInfo );
--
- connect( job, SIGNAL( result( KJob* ) ),
- this, SLOT( sltHtmlCopied( KJob* ) ) );
-+
- }
-
- void StyleGetter::sltHtmlCopied( KJob *job )
-@@ -212,9 +211,9 @@
-
-
- //Remove temp post from the server.
-- b->removePost( *mTempPost );
- connect( b, SIGNAL( sigPostRemoved( int, const BilboPost &) ), this,
- SLOT( sltTempPostRemoved( int, const BilboPost & ) ) );
-+ b->removePost( *mTempPost );
- }
-
- void StyleGetter::sltTempPostRemoved( int blog_id, const BilboPost &post)
-Index: blogilo/src/backend.cpp
-===================================================================
---- blogilo/src/backend.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ blogilo/src/backend.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -422,7 +422,9 @@
- kDebug() << "Emitting sigPostPublished ...";
- Q_EMIT sigPostPublished( mBBlog->id(), pp );
- }
-- delete post;
-+ // TODO crashes stylegetter on GData. Somehow the post gets deleted before
-+ // slotFetchedPost as it seems. Don't get all the pointer copies done here.
-+ //delete post;
- }
-
- KBlog::BlogPost * Backend::preparePost( BilboPost &post )
-Index: akonadiconsole/akonadiconsole.desktop
-===================================================================
---- akonadiconsole/akonadiconsole.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ akonadiconsole/akonadiconsole.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -10,6 +10,7 @@
- Name[en_GB]=Akonadi Console
- Name[es]=Consola de Akonadi
- Name[et]=Akonadi konsool
-+Name[fi]=Akonadi-konsoli
- Name[fr]=Console Akonadi
- Name[ga]=Consól Akonadi
- Name[gl]=Consola de Akonadi
-@@ -51,6 +52,7 @@
- Comment[en_GB]=Akonadi Management and Debugging Console
- Comment[es]=Consola de gestión y depuración de Akonadi
- Comment[et]=Akonadi haldamise ja silumise konsool
-+Comment[fi]=Akonadin hallinta- ja vianjäljityskonsoli
- Comment[fr]=Console de gestion et de déboguage pour Akonadi
- Comment[ga]=Consól Bainisteoireachta agus Dífhabhtaithe Akonadi
- Comment[gl]=Consola de xestión e depuración de Akonadi
+Index: kmail/kmfilterdlg.cpp
+===================================================================
+--- kmail/kmfilterdlg.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kmail/kmfilterdlg.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -268,6 +268,7 @@
+ mKeySeqWidget->setObjectName( "FilterShortcutSelector" );
+ gl->addWidget( mKeySeqWidget, 8, 3, 1, 1);
+ mKeySeqWidget->setEnabled( false );
++ mKeySeqWidget->setModifierlessAllowed( true );
+ mKeySeqWidget->setCheckActionCollections(
+ kmkernel->getKMMainWidget()->actionCollections() );
+ mConfigureToolbar = new QCheckBox( i18n("Additionally add this filter to the toolbar"), mAdvOptsGroup );
Index: kmail/dbusmail.desktop
===================================================================
---- kmail/dbusmail.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kmail/dbusmail.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -12,6 +12,7 @@
- Comment[en_GB]=Mail program with a D-Bus interface
- Comment[es]=Programa de correo con una interfaz D-Bus
- Comment[et]=E-posti rakendus D-Busi liidesega
-+Comment[fi]=D-Bus-rajapintainen sähköpostiohjelma
- Comment[fr]=Programme de messagerie avec une interface D-Bus
- Comment[ga]=Clár ríomhphoist a bhfuil comhéadan D-Bus aige
- Comment[gl]=Programa de correo electrónico cunha interface D-BUS
+--- kmail/dbusmail.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kmail/dbusmail.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -20,6 +20,7 @@
+ Comment[it]=Programma di posta con un'interfaccia D-Bus
+ Comment[ja]=D-Bus インターフェースを持つメールクライアント
+ Comment[km]=កម្មវិធីសំបុត្រដែលមានចំណុចប្រទាក់ D-BUS
++Comment[lt]=Pašto programa su D-Bus sąsaja
+ Comment[lv]=Pasta programma ar D-BUS saskarni
+ Comment[nb]=E-postprogram med D-Bus-grensesnitt
+ Comment[nds]=Nettpostprogramm mit en D-Bus-Koppelsteed
Index: kmail/application_octetstream.desktop
===================================================================
---- kmail/application_octetstream.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kmail/application_octetstream.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -10,6 +10,7 @@
- Name[en_GB]=Application Octet Stream
- Name[es]=Flujo de octetos de la aplicación
- Name[et]=Application Octet Stream
-+Name[fi]=Octet Stream -sovellus
- Name[fr]=Application octetstream
- Name[ga]=Application Octet Stream
- Name[gl]=Aplicación Octet Stream
-Index: kmail/folderselectiontreewidget.cpp
-===================================================================
---- kmail/folderselectiontreewidget.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kmail/folderselectiontreewidget.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -283,9 +283,13 @@
- allowOk = allowCreate = false;
- else
- {
-- const KMFolder *fld = static_cast<FolderSelectionTreeWidgetItem *>( selectedItems().first() )->folder();
-- if ( !fld ) // "Local Folders" root
-+ const FolderSelectionTreeWidgetItem *itemFolderSelection = static_cast<FolderSelectionTreeWidgetItem *>( selectedItems().first() );
-+ const KMFolder *fld = itemFolderSelection->folder();
-+ if ( !fld ) {
-+ // "Local Folders" root
- allowOk = !mLastMustBeReadWrite;
-+ allowCreate = (itemFolderSelection->protocol() != FolderViewItem::Search);
-+ }
- else // any other folder
- {
- allowCreate = !fld->noChildren() && !fld->isReadOnly();
+--- kmail/application_octetstream.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kmail/application_octetstream.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -18,6 +18,7 @@
+ Name[it]=Application Octetstream
+ Name[ja]=アプリケーション/オクテットストリーム
+ Name[km]=ស្ទ្រីម Octet របស់កម្មវិធី
++Name[lt]=Formatas application/octet-stream
+ Name[lv]=Programma oktetu virkne
+ Name[nb]=Program oktettstrøm
+ Name[nds]=Application/Octet-Stream
Index: kmail/kmail.notifyrc
===================================================================
---- kmail/kmail.notifyrc (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kmail/kmail.notifyrc (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -71,6 +71,7 @@
- Name[en_GB]=Error While Checking Mail
- Name[es]=Error al comprobar el correo
- Name[et]=Viga kirjade kontrollimisel
-+Name[fi]=Virhe tarkistettaessa postia
- Name[fr]=Erreur lors de la vérification du courriel
- Name[gl]=Produciuse un erro ao comprobar o correo
+--- kmail/kmail.notifyrc (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kmail/kmail.notifyrc (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -77,6 +77,7 @@
Name[it]=Errore durante il controllo della posta
-@@ -102,6 +103,7 @@
- Comment[en_GB]=There was an error while checking for new mail
- Comment[es]=Ha ocurrido un error mientras se comprobaba el correo nuevo
- Comment[et]=Uute kirjade kontrollimisel tekkis viga
-+Comment[fi]=Sattui virhe tarkistettaessa uutta postia
- Comment[fr]=Il y a eu une erreur lors de la vérification du courriel
- Comment[gl]=Aconteceu un erro cando se comprobaba o correo novo
+ Name[ja]=メールのチェック中にエラー
+ Name[km]=កំហុសខណៈពេលពិនិត្យមើលសំបុត្រថ្មី
++Name[lt]=Klaida tikrinant paštą
+ Name[lv]=Kļūda pārbaudot pastu
+ Name[nb]=Feil under sjekking av e-post
+ Name[nds]=Fehler bi't Kieken na Nettpost
+@@ -109,6 +110,7 @@
Comment[it]=Si è verificato un errore durante il controllo dei nuovi messaggi di posta
-Index: kmail/recipientspicker.h
-===================================================================
---- kmail/recipientspicker.h (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kmail/recipientspicker.h (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -219,6 +219,7 @@
- void insertAddressBook( AddressBook * );
- void slotSearchLDAP();
- void ldapSearchResult();
-+ void slotSelectionChanged();
- private:
- KABC::StdAddressBook *mAddressBook;
+ Comment[ja]=新着メールのチェック中にエラーが発生しました
+ Comment[km]=មានកំហុសខណៈពេលពិនិត្យមើលសំបុត្រថ្មី
++Comment[lt]=Tikrinant paštą įvyko klaida
+ Comment[lv]=Gadījās kļūda pārbaudot ienākošo pastu
+ Comment[nb]=Det oppsto en feil mens det ble sett etter ny e-post
+ Comment[nds]=Bi't Kieken na nieg Nettpost hett dat en Fehler geven
+Index: kmail/kmreadermainwin.cpp
+===================================================================
+--- kmail/kmreadermainwin.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kmail/kmreadermainwin.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -186,6 +186,7 @@
+ mReaderWin->htmlOverride(), mReaderWin->htmlLoadExtOverride(),
+ mReaderWin->isFixedFont(), mReaderWin->overrideEncoding() );
+ command->setOverrideFont( mReaderWin->cssHelper()->bodyFont( mReaderWin->isFixedFont(), true /*printing*/ ) );
++ command->setAttachmentStrategy( mReaderWin->attachmentStrategy() );
+ command->start();
+ }
-Index: kmail/searchwindow.cpp
+Index: kmail/kmreaderwin.cpp
===================================================================
---- kmail/searchwindow.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kmail/searchwindow.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -182,7 +182,6 @@
- } else {
- mChkbxAllFolders->setChecked(true);
- }
-- mFolder = searchFolder;
+--- kmail/kmreaderwin.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kmail/kmreaderwin.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -3087,7 +3087,9 @@
}
- else
- mSearchPattern->append( KMSearchRule::createInstance( "Subject" ) );
-Index: kmail/recipientspicker.cpp
-===================================================================
---- kmail/recipientspicker.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kmail/recipientspicker.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -268,13 +268,13 @@
-
- bool RecipientsCollection::hasEquivalentItem( RecipientItem *item ) const
- {
-- return mKeyMap.find( item->key() ) != mKeyMap.constEnd();
-+ return mKeyMap.constFind( item->key() ) != mKeyMap.constEnd();
- }
- RecipientItem * RecipientsCollection::getEquivalentItem( RecipientItem *item) const
- {
- QMap<QString, RecipientItem *>::ConstIterator it;
-- it = mKeyMap.find( item->key() );
-+ it = mKeyMap.constFind( item->key() );
- if ( it == mKeyMap.constEnd() )
- return 0;
- return (*it);
-@@ -363,6 +363,8 @@
- topLayout->addWidget( mRecipientList );
- topLayout->setStretchFactor( mRecipientList, 1 );
-
-+ connect( mRecipientList, SIGNAL( itemSelectionChanged () ),
-+ SLOT( slotSelectionChanged() ) );
- connect( mRecipientList, SIGNAL( itemDoubleClicked(QTreeWidgetItem*,int) ),
- SLOT( slotPicked() ) );
- connect( mRecipientList, SIGNAL( returnPressed() ),
-@@ -425,6 +427,7 @@
- setTabOrder( mCollectionCombo, mSearchLine );
- setTabOrder( mSearchLine, mRecipientList );
- setTabOrder( closeButton, mCollectionCombo );
-+ slotSelectionChanged();
+ if ( Observable * o = memento ? memento->asObservable() : 0 ) {
+- o->attach( this );
++ if ( o ) {
++ o->attach( this );
++ }
+ }
}
- RecipientsPicker::~RecipientsPicker()
-@@ -437,6 +440,14 @@
- }
+Index: kmail/dbusimap.desktop
+===================================================================
+--- kmail/dbusimap.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kmail/dbusimap.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -20,6 +20,7 @@
+ Comment[it]=Programma di posta con un'interfaccia D-Bus
+ Comment[ja]=D-Bus インターフェースを持つメールクライアント
+ Comment[km]=កម្មវិធីសំបុត្រដែលមានចំណុចប្រទាក់ D-BUS
++Comment[lt]=Pašto programa su D-Bus sąsaja
+ Comment[lv]=Pasta programma ar D-BUS saskarni
+ Comment[nb]=E-postprogram med D-Bus-grensesnitt
+ Comment[nds]=Nettpostprogramm mit en D-Bus-Koppelsteed
+Index: kmail/kmcommands.cpp
+===================================================================
+--- kmail/kmcommands.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kmail/kmcommands.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -1616,6 +1616,7 @@
+ bool useFixedFont, const QString & encoding )
+ : KMCommand( parent, msg ),
+ mHeaderStyle( headerStyle ), mHeaderStrategy( headerStrategy ),
++ mAttachmentStrategy( 0 ),
+ mHtmlOverride( htmlOverride ),
+ mHtmlLoadExtOverride( htmlLoadExtOverride ),
+ mUseFixedFont( useFixedFont ), mEncoding( encoding )
+@@ -1634,6 +1635,10 @@
+ mOverrideFont = font;
}
-+void RecipientsPicker::slotSelectionChanged()
++void KMPrintCommand::setAttachmentStrategy( const KMail::AttachmentStrategy *strategy )
+{
-+ bool hasSelection = !mRecipientList->selectedItems ().isEmpty();
-+ mToButton->setEnabled( hasSelection );
-+ mBccButton->setEnabled( hasSelection );
-+ mCcButton->setEnabled( hasSelection );
++ mAttachmentStrategy = strategy;
+}
-+
- void RecipientsPicker::initCollections()
+
+ KMCommand::Result KMPrintCommand::execute()
{
- mAllRecipients = new RecipientsCollection( i18nc("All collections containing recipients.", "All") );
-@@ -828,7 +839,7 @@
- KABC::Addressee ad;
- ad.setNameFromString( name );
- ad.insertEmail( email );
--
-+
- RecipientItem *item = new RecipientItem;
- item->setAddressee( ad, ad.preferredEmail() );
- emit pickedRecipient( Recipient( item->recipient(), Recipient::Undefined ) );
-Index: kmail/kmreaderwin.cpp
-===================================================================
---- kmail/kmreaderwin.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kmail/kmreaderwin.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -646,6 +646,7 @@
- KAction *action = new KAction(KIcon("edit-find"), i18n("&Find in Message..."), this);
- ac->addAction("find_in_messages", action );
- connect(action, SIGNAL(triggered(bool)), SLOT(slotFind()));
-+ action->setShortcut(KStandardShortcut::find());
+@@ -1649,6 +1654,8 @@
+ printerWin->setOverrideEncoding( mEncoding );
+ printerWin->cssHelper()->setPrintFont( mOverrideFont );
+ printerWin->setDecryptMessageOverwrite( true );
++ if ( mAttachmentStrategy != 0 )
++ printerWin->setAttachmentStrategy( mAttachmentStrategy );
+ printerWin->printMsg( retrievedMessage() );
+
+ return OK;
+Index: kmail/headerstyle.cpp
+===================================================================
+--- kmail/headerstyle.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kmail/headerstyle.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -485,11 +485,11 @@
+
+ QString userHTML;
+
+- Akonadi::ContactSearchJob *job = new Akonadi::ContactSearchJob();
++ /*Akonadi::ContactSearchJob *job = new Akonadi::ContactSearchJob();
+ job->setLimit( 1 );
+ job->setQuery( Akonadi::ContactSearchJob::Email, KPIMUtils::firstEmailAddress( message->from() ) );
+- job->exec();
+- const KABC::Addressee::List addresses = job->contacts();
++ job->exec();*/
++ const KABC::Addressee::List addresses; /*= job->contacts();*/
+
+ QString photoURL;
+ int photoWidth = 60;
+Index: kmail/kmmainwidget.cpp
+===================================================================
+--- kmail/kmmainwidget.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kmail/kmmainwidget.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -142,6 +142,7 @@
+ #include "accountwizard.h"
+ #include "archivefolderdialog.h"
+ #include "folderutil.h"
++#include "csshelper.h"
+
+ #if !defined(NDEBUG)
+ #include "sievedebugdialog.h"
+@@ -2653,12 +2654,16 @@
+ KConfigGroup reader( KMKernel::config(), "Reader" );
+ bool useFixedFont = mMsgView ? mMsgView->isFixedFont() : GlobalSettings::self()->useFixedFont();
+
+- KMCommand *command =
++ // FIXME: Remove code duplication with KMReaderMainWin::slotPrintMsg. Maybe move to MessageActions?
++ KMPrintCommand *command =
+ new KMPrintCommand( this, msg,
+ mMsgView ? mMsgView->headerStyle() : 0,
+ mMsgView ? mMsgView->headerStrategy() : 0,
+ htmlOverride, htmlLoadExtOverride,
+ useFixedFont, overrideEncoding() );
++ command->setAttachmentStrategy( mMsgView ? mMsgView->attachmentStrategy() : 0 );
++ if ( mMsgView )
++ command->setOverrideFont( mMsgView->cssHelper()->bodyFont( mMsgView->isFixedFont(), true /*printing*/ ) );
+ command->start();
+ }
- // open URL
- mUrlOpenAction = new KAction( KIcon( "document-open" ), i18n( "Open URL" ), this );
-Index: kmail/dbusimap.desktop
+Index: kmail/kmcommands.h
===================================================================
---- kmail/dbusimap.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kmail/dbusimap.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -12,6 +12,7 @@
- Comment[en_GB]=Mail program with a D-Bus interface
- Comment[es]=Programa de correo con una interfaz D-Bus
- Comment[et]=E-posti rakendus D-Busi liidesega
-+Comment[fi]=D-Bus-rajapintainen sähköpostiohjelma
- Comment[fr]=Programme de messagerie avec une interface D-Bus
- Comment[ga]=Clár ríomhphoist a bhfuil comhéadan D-Bus aige
- Comment[gl]=Programa de correo electrónico cunha interface D-BUS
-Index: kmail/kmail_config_identity.desktop
-===================================================================
---- kmail/kmail_config_identity.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kmail/kmail_config_identity.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -31,7 +31,7 @@
- Name[et]=Identiteedid
- Name[eu]=Identitateak
- Name[fa]=هویتها
--Name[fi]=Henkilöllisyydet
-+Name[fi]=Henkilöydet
- Name[fr]=Identités
- Name[fy]=Identiteiten
- Name[ga]=Aitheantais
-@@ -93,7 +93,7 @@
- Comment[et]=Identiteetide haldus
- Comment[eu]=Identitateak kudeatu
- Comment[fa]=مدیریت هویتها
--Comment[fi]=Henkilöllisyysasetukset
-+Comment[fi]=Henkilöysasetukset
- Comment[fr]=Gestion des identités
- Comment[fy]=Identiteiten beheare
- Comment[ga]=Bainistiú na nAitheantas
-Index: kmail/kmfolderdialog.cpp
-===================================================================
---- kmail/kmfolderdialog.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kmail/kmfolderdialog.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -354,7 +354,7 @@
- topLayout->setMargin( 0 );
-
- // Musn't be able to edit details for a non-resource, system folder.
-- if ( !mIsLocalSystemFolder || mIsResourceFolder ) {
-+ if ( (!mIsLocalSystemFolder || mIsResourceFolder )&& !mDlg->folder()->isReadOnly()) {
-
- QHBoxLayout *hl = new QHBoxLayout();
- topLayout->addItem( hl );
-@@ -1016,7 +1016,7 @@
- topLayout->setMargin( 0 );
- topLayout->setSpacing( KDialog::spacingHint() );
-
-- QHBoxLayout *topItems = new QHBoxLayout( this );
-+ QHBoxLayout *topItems = new QHBoxLayout;
- topLayout->addLayout( topItems );
-
- mCustom = new QCheckBox( i18n("&Use custom message templates in this folder"), this );
-Index: kmail/kmail_view.desktop
-===================================================================
---- kmail/kmail_view.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kmail/kmail_view.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -10,6 +10,7 @@
- Name[en_GB]=KMail view
- Name[es]=Vista KMail
- Name[et]=KMaili vaade
-+Name[fi]=KMail-näkymä
- Name[fr]=KMail view
- Name[ga]=Amharc KMail
- Name[gl]=Vista KMail
-Index: kmail/configuredialog.cpp
-===================================================================
---- kmail/configuredialog.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kmail/configuredialog.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -2383,7 +2383,7 @@
- mFontRequester->setEnabled( false );
- mIconButton->setEnabled( false );
- mKeySequenceWidget->setEnabled( false );
--
-+ mBackgroundColorCombo->setEnabled( false );
- mEmitChanges = true;
- return;
- }
-Index: kmail/kmail_config_appearance.desktop
-===================================================================
---- kmail/kmail_config_appearance.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kmail/kmail_config_appearance.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -93,7 +93,7 @@
- Comment[et]=Välimuse seadistused
- Comment[eu]=Pertsonalizatu itxura
- Comment[fa]=سفارشی کردن ظاهر تصویری
--Comment[fi]=Ulkonäköasetukset
-+Comment[fi]=Mukauta ulkoasua
- Comment[fr]=Personnalisation de l'apparence
- Comment[fy]=It uterlik oanpasse
- Comment[ga]=Saincheap an Chuma
-Index: knode/knode_config_appearance.desktop
-===================================================================
---- knode/knode_config_appearance.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ knode/knode_config_appearance.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -92,7 +92,7 @@
- Comment[et]=Välimuse seadistused
- Comment[eu]=Pertsonalizatu itxura
- Comment[fa]=سفارشی کردن ظاهر تصویری
--Comment[fi]=Ulkonäköasetukset
-+Comment[fi]=Mukauta ulkoasua
- Comment[fr]=Personnalisation de l'apparence
- Comment[fy]=It uterlik oanpasse
- Comment[ga]=Saincheap an Chuma
-Index: doc/kwatchgnupg/index.docbook
-===================================================================
---- doc/kwatchgnupg/index.docbook (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ doc/kwatchgnupg/index.docbook (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -47,7 +47,7 @@
-
- <legalnotice>&GPLNotice;</legalnotice>
-
--<date>2004-05-09</date>
-+<date>2010-01-12</date>
- <releaseinfo>1.0</releaseinfo>
-
- <abstract>
-@@ -78,7 +78,7 @@
- &watchgnupg;.</para>
-
- <para>&kwatchgnupg; can be started from the
--<menuchoice><guimenu>Tools</guimenu></menuchoice> menu of both
-+<menuchoice><guimenu>Tools</guimenu><guimenuitem>GnuPG Log Viewer</guimenuitem></menuchoice> menu of both
- &kleopatra; and &kmail;, as well as from the command
- line. The &kwatchgnupg; executable is named
- <userinput>kwatchgnupg</userinput>.
-Index: doc/ktimetracker/systray.png
-===================================================================
-Nie można wyświetlić: plik binarny.
-svn:mime-type = image/png
-Index: doc/ktimetracker/index.docbook
-===================================================================
---- doc/ktimetracker/index.docbook (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ doc/ktimetracker/index.docbook (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -141,7 +141,7 @@
- </shortcut>
- <guimenu>Task</guimenu>
- <guimenuitem>New Task...</guimenuitem>
--</menuchoice>
-+</menuchoice>.
-
- To create a subtask, pick the parent task and select
-
-@@ -151,7 +151,7 @@
- </shortcut>
- <guimenu>Task</guimenu>
- <guimenuitem>New Subtask...</guimenuitem>
--</menuchoice>
-+</menuchoice>.
- </para>
-
- <para>When &ktimetracker; exits, the task list is saved to a file on your disk.
-@@ -192,13 +192,14 @@
- <listitem><para>The time spent on the task since the session
- began.</para></listitem> </varlistentry>
-
--<varlistentry> <term><guilabel>Total Session Time</guilabel></term>
--<listitem><para>The time spent on the task and all its subtasks since the
--session began.</para></listitem> </varlistentry>
- <varlistentry> <term><guilabel>Time</guilabel></term> <listitem><para>The time
- spent on the task since all times were reset.</para></listitem>
- </varlistentry>
-
-+<varlistentry> <term><guilabel>Total Session Time</guilabel></term>
-+<listitem><para>The time spent on the task and all its subtasks since the
-+session began.</para></listitem> </varlistentry>
-+
- <varlistentry> <term><guilabel>Total Time</guilabel></term>
- <listitem><para>The time spent on the task and all its subtasks since all
- times were reset.</para></listitem> </varlistentry>
-@@ -309,10 +310,10 @@
-
- <para>As a typical usecase, you might want to plan a project with the project
- management tool Imendio Planner
--(from <ulink url="http://planner.imendio.org">planner.imendio.org</ulink>)
--and import its tasks to &ktimetracker; with <guimenu>File</guimenu>
--<guisubmenu>Import</guisubmenu><guimenuitem>Import Tasks From Planner...</guimenuitem>,
--to have them in the industry standard <ulink
-+(from <ulink url="http://live.gnome.org/Planner">live.gnome.org/Planner</ulink>)
-+and import its tasks to &ktimetracker; with <menuchoice><guimenu>File</guimenu>
-+<guisubmenu>Import</guisubmenu><guimenuitem>Import Tasks From Planner...</guimenuitem>
-+</menuchoice>, to have them in the industry standard <ulink
- url="http://developer.kde.org/documentation/standards/index.html">iCalendar</ulink>
- format. Having done so, you are able to schedule the tasks in &korganizer;, and account your time
- to them in &ktimetracker;. That's one way to help ensure your project stays on time
-@@ -479,8 +480,8 @@
-
- </sect1>
-
--<sect1 id="tool-bar">
--<title>The Toolbar</title>
-+<sect1 id="tool-bar-status-bar">
-+<title>The Toolbar and Statusbar</title>
- <para>The toolbar contains icons for the following commands:</para>
-
- <note><para>(All behave identically to the menu command.)</para></note>
-@@ -494,14 +495,9 @@
- <listitem><para><guiicon>Edit</guiicon></para></listitem>
- </itemizedlist>
-
-+<para>The statusbar reports the name of the file where the data was saved.</para>
- </sect1>
-
--<sect1 id="status-bar">
--<title>The Statusbar</title>
--
--<para>Reports the name of the file where the data was saved.</para>
--</sect1>
--
- </chapter>
-
- <chapter id="credits">
+--- kmail/kmcommands.h (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kmail/kmcommands.h (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -36,6 +36,7 @@
+ class EditorWatcher;
+ class HeaderStyle;
+ class HeaderStrategy;
++ class AttachmentStrategy;
+ }
+ namespace GpgME { class Error; }
+ namespace Kleo { class SpecialJob; }
+@@ -591,12 +592,14 @@
+ const QString & encoding = QString() );
+
+ void setOverrideFont( const QFont& );
++ void setAttachmentStrategy( const KMail::AttachmentStrategy *strategy );
+
+ private:
+ virtual Result execute();
+
+ const KMail::HeaderStyle *mHeaderStyle;
+ const KMail::HeaderStrategy *mHeaderStrategy;
++ const KMail::AttachmentStrategy *mAttachmentStrategy;
+ bool mHtmlOverride;
+ bool mHtmlLoadExtOverride;
+ bool mUseFixedFont;
+Index: kmail/kmfolder.cpp
+===================================================================
+--- kmail/kmfolder.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kmail/kmfolder.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -1009,6 +1009,7 @@
+ int count = mStorage->countUnread();
+ if ( count > 0 ) {
+ mIndicator->setCountProperty( count );
++ mIndicator->setDrawAttentionProperty( true );
+ mIndicator->show();
+ } else {
+ mIndicator->hide();
Index: doc/kontact-admin/kontact-admin.desktop
===================================================================
---- doc/kontact-admin/kontact-admin.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ doc/kontact-admin/kontact-admin.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -9,6 +9,7 @@
- Name[en_GB]=Kontact Administration
- Name[es]=Administración de Kontact
- Name[et]=Kontacti haldur
-+Name[fi]=Kontactin hallinta
- Name[fr]=Administration de Kontact
- Name[gl]=Administración do Akonadi
+--- doc/kontact-admin/kontact-admin.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ doc/kontact-admin/kontact-admin.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -15,6 +15,7 @@
Name[it]=Gestione di Kontact
-@@ -18,6 +19,7 @@
+ Name[ja]=Kontact の管理
+ Name[km]=ការគ្រប់គ្រង Kontact
++Name[lt]=Kontact administravimas
+ Name[lv]=Kontact administrācija
Name[nb]=Kontact-administrasjon
Name[nds]=Kontaktenpleeg
- Name[nl]=Kontactbeheer
-+Name[nn]=Kontakt-administrering
- Name[pa]=ਕੇਸੰਪਰਕ ਪਰਸ਼ਾਸ਼ਨ
- Name[pl]=Administracja Kontact
- Name[pt]=Administração do Kontact
-Index: doc/kmail/using-kmail.docbook
-===================================================================
---- doc/kmail/using-kmail.docbook (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ doc/kmail/using-kmail.docbook (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -210,8 +210,7 @@
- message, click the <guiicon>Send Now</guiicon> icon (the envelope) to send
- the message now, or click the <guiicon>Send Later</guiicon> icon to put
- the message in the outbox. If your message is not finished yet, select
--<menuchoice><guimenu>Message</guimenu><guimenuitem>Save in Drafts
--Folder</guimenuitem></menuchoice>.
-+<menuchoice><guimenu>Message</guimenu><guimenuitem>Save as Draft</guimenuitem></menuchoice>.
- </para></sect2>
-
- <sect2 id="encrypt-sign">
-@@ -1773,9 +1772,9 @@
- <para>Multiple accounts are used to check for messages from more than one email address
- and/or mail server. Select <menuchoice><guimenu>Settings</guimenu>
- <guimenuitem>Configure &kmail;...</guimenuitem></menuchoice> and click on the
--<guilabel>Network</guilabel> page to add or change your account settings. See the
-+<guilabel>Accounts</guilabel> page to add or change your account settings. See the
- <link linkend="getting-started">Getting started</link> section for more
--information on the settings in the <guilabel>Network</guilabel> page.</para>
-+information on the settings in the <guilabel>Accounts</guilabel> page.</para>
-
- <para>To check for messages from a particular account, use the
- <menuchoice><guimenu>File</guimenu><guimenuitem>Check Mail
Index: doc/kmail/configure.docbook
===================================================================
---- doc/kmail/configure.docbook (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ doc/kmail/configure.docbook (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -115,7 +115,7 @@
- identity.</para>
-
- <para>To add a new identity to the identity list, click on the
--<guibutton>New...</guibutton> button.
-+<guibutton>Add...</guibutton> button.
- The <link linkend="configure-identity-newidentitydialog">New identity</link> dialog
- will then appear.</para>
-
-@@ -143,11 +143,9 @@
- <varlistentry>
- <term><guilabel>Use Control Center settings</guilabel></term>
- <listitem>
--<para>Uses the settings of the <application>Control
--Center</application>'s default email profile (you can edit that one
--under <menuchoice><guimenu>Internet & Network</guimenu>
--<guimenuitem>Email</guimenuitem></menuchoice> in the
--<application>Control Center</application>).</para>
-+<para>Uses the values from <menuchoice><guimenu>Personal</guimenu><guimenuitem>About Me</guimenuitem>
-+<guimenuitem>Password & User Account</guimenuitem></menuchoice> in the
-+&systemsettings;.</para>
- </listitem>
- </varlistentry>
-
-@@ -533,12 +531,12 @@
- or similar programs
- you can specify a name and the location of the
- <command>sendmail</command> program. For <acronym>SMTP</acronym> you
--can specify <guilabel>Name</guilabel>, <guilabel>Host</guilabel>, and
-+can specify <guilabel>Name</guilabel>, <guilabel>Outgoing mail server</guilabel>, and
- <guilabel>Port</guilabel> of the server. <guilabel>Server requires
- authentication</guilabel> will enable the <guilabel>Login</guilabel>
- and <guilabel>Password</guilabel> fields and the
- <guilabel>Authentication method</guilabel> buttons on the
--<guilabel>Security</guilabel> tab. If you are not sure about the
-+<guilabel>Advanced</guilabel> tab. If you are not sure about the
- security settings you can make &kmail; test for the best settings by
- using <guibutton>Check What the Server Supports</guibutton>.</para>
-
-@@ -647,13 +645,21 @@
- <guilabel>Recycle colors on deep quoting</guilabel> means that even text that is
- quoted more than three times will appear in color. Note that the
- <guilabel>Quoted text</guilabel> colors only work in the message reader, not in
--the composer.<!-- TODO --></para>
-+the composer. If you want folders which are close to their quota
-+(space allotment, usually used on IMAP servers) to be displayed in a different color,
-+you can specify a percentage value as a threshold for this. The color to be used
-+can be configured along with the other custom colors.<!-- TODO --></para>
-
- </sect2>
-
- <sect2 id="configure-appearance-layout">
- <title>Layout</title>
-
-+<para>If the <guilabel>Close message window after replying or forwarding</guilabel> option is
-+activated, KMail will close the message window after replying to or forwarding the message that
-+is displayed in the window. This only applies to the separate message window, not to the embedded
-+message preview pane.</para>
-+
- <para><guilabel>Show HTML status bar</guilabel> activates a bar at the left side of the reader
- pane that tells you if a message is &html; or not. This is important because
- &html; messages might imitate the look of a signed and encrypted message, so
-@@ -1124,7 +1130,7 @@
- <para>
- Attaches the complete message to the disposition
- notification. Usually, this is overkill. It does
-- not add any valueable information that cannot be
-+ not add any valuable information that cannot be
- deduced from the message headers alone, but people
- sometimes insist on this, since it is much easier
- for humans to correlate the content of the message
-@@ -1298,7 +1304,7 @@
- </term>
- <listitem>
- <para>
-- If checked, everytime you encrypt a message, a dialog
-+ If checked, every time you encrypt a message, a dialog
- will appear that presents you with the encryption keys
- that will be used for each recipient. You can then
- review the choice of keys, change them, and approve or
-@@ -1408,7 +1414,7 @@
- <listitem>
- <para>
- If checked, &kmail; will emit a warning if an &smime;
-- certifciate or &openpgp; key will be used for a recipient
-+ certificate or &openpgp; key will be used for a recipient
- whose email address is not listed in the email addresses
- stored in the certificate.
- </para>
-@@ -1720,7 +1726,7 @@
- backends. Below each backend entry, you can see what protocols
- (&openpgp; and/or &smime;) the backend supports. If a protocol
- is not listed, the backend does not support it. If it is
-- listed, but greyed out, the backend supports the protocol, but
-+ listed, but grayed out, the backend supports the protocol, but
- some required programs were not found, or other errors
- occurred during initialization. If you press
- <guibutton>Rescan</guibutton>, a dialog box will appear that
-@@ -1815,13 +1821,30 @@
- </varlistentry>
-
- <varlistentry>
--<term><guilabel>Jump to first unread message when entering a folder</guilabel></term>
-+
-+<term><guilabel>When entering a folder</guilabel></term>
- <listitem>
--<para>If this option is enabled &kmail; will go to the first unread message
--when you enter a folder; if it is not enabled, &kmail; will go to first
--new message or, if there is no new message, to the message
--that was selected when you last left the folder.</para>
-+<para>This option controls what happens if you open a folder.
-+<itemizedlist>
-+<listitem>
-+<para>If <guilabel>Jump to First New Message</guilabel> is selected then &kmail; will select the
-+first message it finds that is marked as new.
-+</para>
- </listitem>
-+<listitem>
-+<para>If <guilabel>Jump to First Unread or New Message</guilabel> is selected then &kmail; will
-+select the first message it finds that is marked either as new or as unread.
-+</para>
-+</listitem>
-+<listitem>
-+<para>If <guilabel>Jump to Last Selected Message</guilabel> is selected then &kmail; will select
-+the message that was selected when the folder was open the last time.
-+</para>
-+</listitem>
-+</itemizedlist>
-+
-+</para>
-+</listitem>
- </varlistentry>
-
- <varlistentry>
-@@ -1918,6 +1941,14 @@
- <para>You should not need to see the folders that hold the <guilabel>IMAP</guilabel> resources. However if you want to see them, you can set that by enabling this option.</para>
- </listitem>
- </varlistentry>
-+</variablelist>
-+</sect2>
-+
-+<sect2 id="configure-misc-invitation">
-+<title>Invitations</title>
-+
-+<variablelist>
-+
- <varlistentry>
- <term><guilabel>Mangle From:/To: headers in replies to invitations</guilabel></term>
- <listitem>
-@@ -1942,9 +1973,26 @@
- <varlistentry>
- <term><guilabel>Outlook compatible invitation reply comments</guilabel></term>
- <listitem>
--<para>When the user provides comments when responding to invitations, send the comment in way that Microsoft Outlook(tm) understands. If this option is not enabled, the reponse comments will not be seen in Outlook.</para>
-+<para>When the user provides comments when responding to invitations, send the comment in way that Microsoft Outlook(tm) understands. If this option is not enabled, the response comments will not be seen in Outlook.</para>
- </listitem>
- </varlistentry>
-+<varlistentry>
-+<term><guilabel>Automatic invitation sending</guilabel></term>
-+<listitem>
-+<para>When this is checked, you will not see the mail composer window. Instead,
-+all invitation mails are sent automatically. If you want to see the mail
-+before sending it, you can uncheck this option. However, be aware that the
-+text in the composer window is in iCalendar syntax, and you should not try
-+modifying it by hand.</para>
-+</listitem>
-+</varlistentry>
-+<varlistentry>
-+<term><guilabel>Delete invitation emails after the reply to them has been sent</guilabel></term>
-+<listitem>
-+<para>When this is checked, received invitation emails that have been replied to
-+will be moved to the Trash folder, once the reply has been successfully sent.</para>
-+</listitem>
-+</varlistentry>
- </variablelist>
- </sect2>
-
-@@ -1991,7 +2039,7 @@
- to the [MDN] section of the kmail configuration file. If there is no such section, simply add "[MDN]" on
- a line by itself just above the option.
-
--Note that the default setting of "false" strictly speaking violates internet standards, but is
-+Note that the default setting of "false" strictly speaking violates Internet standards, but is
- set that way for practical reasons, to avoid servers rejecting MDNs that KMail
- generates because they think they are SPAM.
- </para>
-@@ -2142,6 +2190,16 @@
- </varlistentry>
-
- <varlistentry>
-+<term><guilabel>AutoLostFoundMove</guilabel></term>
-+<listitem><para>Activate this option to automate the handling of not yet uploaded messages in disconnected IMAP
-+folders that can not be uploaded. This can happen if the folder was removed from the server or your access
-+rights have been restricted. Such messages will automatically moved to a newly created lost+found folder if
-+this option is enabled, you will be ask how to proceed every time otherwise.
-+</para>
-+</listitem>
-+</varlistentry>
-+
-+<varlistentry>
- <term><guilabel>ShowUserAgent</guilabel></term>
- <listitem>
- <para>
-Index: doc/kmail/getting-started.docbook
-===================================================================
---- doc/kmail/getting-started.docbook (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ doc/kmail/getting-started.docbook (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -49,14 +49,14 @@
- messages.</para>
-
- <para>The Configure window consists of six sections:
--<guilabel>Identities</guilabel>, <guilabel>Network</guilabel>,
-+<guilabel>Identities</guilabel>, <guilabel>Accounts</guilabel>,
- <guilabel>Appearance</guilabel>, <guilabel>Composer</guilabel>,
- <guilabel>Security</guilabel>, and
- <guilabel>Misc</guilabel>.</para>
-
- <para>To begin sending and receiving messages you will only have to
- change some settings in the <guilabel>Identities</guilabel> and
--<guilabel>Network</guilabel> pages.</para>
-+<guilabel>Accounts</guilabel> pages.</para>
-
- <sect1 id="setting-your-identity">
- <title>
-@@ -94,7 +94,7 @@
- <sect1 id="setting-up-your-account">
- <title>Setting up your Account</title>
-
--<para>The <guilabel>Network</guilabel> page contains the settings that
-+<para>The <guilabel>Accounts</guilabel> page contains the settings that
- tell &kmail; how to send and receive your email messages. Many of these settings
- can vary greatly depending on the setup of your system and on the kind
- of network that your mail server is located in. If you do not know what
-@@ -116,8 +116,8 @@
- working &Sendmail; configuration, choose
- <guilabel>SMTP</guilabel> and fill in the <guilabel>Name</guilabel>
- field with a descriptive name
--(⪚ <userinput>My Mail Account</userinput>)
--and the <guilabel>Host</guilabel>
-+(⪚ <userinput>My Mail Account</userinput>). Click the <guibutton>Create and Configure</guibutton>
-+and fill the <guilabel>Outgoing mail server</guilabel>
- field with the name and domain of your mail server
- (⪚ <userinput>smtp.provider.com</userinput>). You will probably
- not need to change the <guilabel>Port</guilabel> setting (the default is
-@@ -159,10 +159,10 @@
- about file locking</link>.</para>
-
- <para>You will then be presented with
--the <guilabel>Add account</guilabel> window. First, fill in the
--<guilabel>Name</guilabel> field to name your account. You can choose any name
-+the <guilabel>Add Account</guilabel> window. First, fill in the
-+<guilabel>Account name</guilabel> field to name your account. You can choose any name
- you like. <guilabel>Login</guilabel>, <guilabel>Password</guilabel>, and
--<guilabel>Host</guilabel> should be filled in with the appropriate information
-+<guilabel>Incoming mail server</guilabel> should be filled in with the appropriate information
- from your <acronym>ISP</acronym> or system administrator. You should not
- need to change the <guilabel>Port</guilabel> setting (the default for POP3 is
- <userinput>110</userinput>, the default for <acronym>IMAP</acronym> is
-@@ -234,12 +234,12 @@
- <link linkend="filters">filter</link>, which has nothing to do with this
- option.</para>
-
--<para>With <guilabel>Precommand</guilabel> you can specify any program that &kmail;
-+<para>With <guilabel>Pre-command</guilabel> you can specify any program that &kmail;
- will execute just before fetching mail. Please specify the full path
- (do not use <quote>~</quote>) and note that &kmail; will not continue
- until the program returns.</para>
-
--<para>On the <guilabel>Extras</guilabel> tab you can select <guilabel>Use
-+<para>On the <guilabel>POP Settings</guilabel> tab you can select <guilabel>Use
- pipelining for faster mail download</guilabel> if this is supported by your
- server. You should carefully test this to make sure it works safely.</para>
- </sect3>
-@@ -248,9 +248,9 @@
- <title>Options for both <acronym>IMAP</acronym> and POP3</title>
-
- <!-- TODO: move all this, this isn't important for beginners?! -->
--<para>If you select <guilabel>Store POP password in configuration
--file</guilabel> or <guilabel>Store IMAP password in configuration
--file</guilabel> &kmail; will remember your password so you will not have to
-+<para>If you select <guilabel>Store POP password</guilabel> or
-+<guilabel>Store IMAP Password</guilabel> &kmail; will remember
-+your password so you will not have to
- type it every time you start &kmail; and fetch new mail.</para>
-
- <warning><para>Be warned that &kmail; cannot really encrypt your password, so
-@@ -282,7 +282,7 @@
- authentication methods. Additionally, for <acronym>IMAP</acronym>
- <guilabel>Anonymous</guilabel> is supported, but <guilabel>APOP</guilabel>
- is not. Use the <guibutton>Check what the server supports</guibutton> button
--on the <guilabel>Extras</guilabel> or <guilabel>Security</guilabel> tab
-+on the <guilabel>Security</guilabel> tab
- to automatically select the most secure settings supported by your server.</para>
-
- <para>You are now ready to send and receive mail. For
-@@ -310,7 +310,7 @@
- <link linkend="the-composer-window">composer window</link> will appear. Fill in the
- <guilabel>To:</guilabel> field with your email address and type
- something in the <guilabel>Subject</guilabel> field. Send the message by
--selecting <menuchoice><guimenu>Message</guimenu> <guimenuitem>Send</guimenuitem>
-+selecting <menuchoice><guimenu>Message</guimenu> <guimenuitem>Send Mail</guimenuitem>
- </menuchoice>.</para>
-
- <para>To check your email, select
+--- doc/kmail/configure.docbook (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ doc/kmail/configure.docbook (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -708,7 +708,7 @@
+
+ <para>With <guilabel>Date Display</guilabel> you can choose between several
+ date formats. The <guilabel>Localized Format</guilabel> is the one you can
+-specify under <guilabel>Country & Language</guilabel> in &kcontrol;.
++specify under <guilabel>Country/Region & Language</guilabel> in the &systemsettings;.
+ For the <guilabel>Custom</guilabel> format you can get
+ a description of the possible values by pressing
+ <keycombo action="simul">&Shift;<keycap>F1</keycap></keycombo>
Index: doc/kmail/faq.docbook
===================================================================
---- doc/kmail/faq.docbook (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ doc/kmail/faq.docbook (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -492,7 +492,7 @@
- <answer><para>See the <link linkend="popfilters">Download filters</link> chapter.
- If you want to leave all messages on the server: open up the
- <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kmail;...</guimenuitem>
--</menuchoice> window. Click on the <guilabel>Network</guilabel> page. Select your
-+</menuchoice> window. Click on the <guilabel>Accounts</guilabel> page. Select your
- account from the account list and click the <guibutton>Modify...</guibutton>
- button. This dialog contains the <guilabel>Leave fetched messages on the server</guilabel>
- setting which you must enable.</para></answer>
-Index: doc/kmail/menus.docbook
-===================================================================
---- doc/kmail/menus.docbook (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ doc/kmail/menus.docbook (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -83,6 +83,22 @@
- <varlistentry>
- <term>
- <menuchoice>
-+<guimenu>Tools</guimenu>
-+<guimenuitem>Import Messages...</guimenuitem>
-+</menuchoice>
-+</term>
-+<listitem>
-+<para>
-+Starts up <application>kmailcvt</application> (which is
-+part of kdepim). This application lets you import
-+messages from several email clients &kmail;.
-+</para>
-+</listitem>
-+</varlistentry>
-+
-+<varlistentry>
-+<term>
-+<menuchoice>
- <shortcut><keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo></shortcut>
- <guimenu>File</guimenu>
- <guimenuitem>Print...</guimenuitem>
-@@ -92,7 +108,7 @@
- <para>Display a dialog that lets you prints the currently displayed message.</para>
- </listitem>
- </varlistentry>
--
-+<!-- NOT IN 4.4.0
- <varlistentry>
- <term>
- <menuchoice>
-@@ -104,7 +120,7 @@
- on disk according to how you have moved and deleted them in &kmail;.</para>
- </listitem>
- </varlistentry>
--
-+-->
- <varlistentry>
- <term>
- <menuchoice>
-@@ -233,22 +249,8 @@
- <varlistentry>
- <term>
- <menuchoice>
--<shortcut><keycap>T</keycap></shortcut>
-+<shortcut><keycap>Del</keycap></shortcut>
- <guimenu>Edit</guimenu>
--<guimenuitem>Edit Message</guimenuitem>
--</menuchoice>
--</term>
--<listitem>
--<para>Edits the selected message if it is editable. Only messages in the
--<guilabel>outbox</guilabel> and <guilabel>drafts</guilabel> folder can be edited.</para>
--</listitem>
--</varlistentry>
--
--<varlistentry>
--<term>
--<menuchoice>
--<shortcut><keycap>Delete</keycap></shortcut>
--<guimenu>Edit</guimenu>
- <guimenuitem>Move to Trash</guimenuitem>
- </menuchoice>
- </term>
-@@ -257,7 +259,7 @@
- messages are already in the trash folder, they will really be deleted.</para>
- </listitem>
- </varlistentry>
--
-+<!-- not in 440
- <varlistentry>
- <term>
- <menuchoice>
-@@ -271,7 +273,7 @@
- once they are deleted with this command.</para>
- </listitem>
- </varlistentry>
--
-+-->
- <varlistentry>
- <term>
- <menuchoice>
-@@ -301,9 +303,9 @@
- <varlistentry>
- <term>
- <menuchoice>
--<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>A</keycap></keycombo></shortcut>
-+<shortcut><keycombo action="simul">&Ctrl;<keycap>T</keycap></keycombo></shortcut>
- <guimenu>Edit</guimenu>
--<guimenuitem>Select Message Text</guimenuitem>
-+<guimenuitem>Select All Text</guimenuitem>
- </menuchoice>
- </term>
- <listitem>
-@@ -356,7 +358,7 @@
- </para>
- </listitem>
- </varlistentry>
--
-+<!-- not in 440
- <varlistentry>
- <term>
- <menuchoice>
-@@ -384,7 +386,7 @@
- of messages per folder.</para>
- </listitem>
- </varlistentry>
--
-+-->
- <varlistentry>
- <term>
- <menuchoice>
-@@ -559,7 +561,7 @@
- <varlistentry>
- <term>
- <menuchoice>
--<shortcut><keycombo action="simul">&Ctrl;<keycap>+</keycap></keycombo></shortcut>
-+<shortcut><keycombo action="simul">&Alt;<keycap>+</keycap></keycombo></shortcut>
- <guimenu>Go</guimenu>
- <guimenuitem>Next Unread Folder</guimenuitem>
- </menuchoice>
-@@ -572,7 +574,7 @@
- <varlistentry>
- <term>
- <menuchoice>
--<shortcut><keycombo action="simul">&Ctrl;<keycap>-</keycap></keycombo></shortcut>
-+<shortcut><keycombo action="simul">&Alt;<keycap>-</keycap></keycombo></shortcut>
- <guimenu>Go</guimenu>
- <guimenuitem>Previous Unread Folder</guimenuitem>
- </menuchoice>
-@@ -634,14 +636,14 @@
- <varlistentry>
- <term>
- <menuchoice>
-+<shortcut><keycap>F5</keycap></shortcut>
- <guimenu>Folder</guimenu>
--<guimenuitem>Compact</guimenuitem>
-+<guimenuitem>Check Mail in This Folder</guimenuitem>
- </menuchoice>
- </term>
- <listitem>
--<para>Compacts the folder file to reduce its disk space usage. Usually
--&kmail; compacts all folders automatically, but under certain circumstances
--you might want to compact a folder manually.</para>
-+<para>Checks whether new mail arrived in the currently selected folder.
-+This is only available for &imap; folders.</para>
- </listitem>
- </varlistentry>
-
-@@ -649,59 +651,60 @@
- <term>
- <menuchoice>
- <guimenu>Folder</guimenu>
--<guimenuitem>Expire</guimenuitem>
-+<guimenuitem>Move All Messages to Trash</guimenuitem>
- </menuchoice>
- </term>
- <listitem>
--<para>Deletes old messages from the current folder or moves them to another
--folder, according to the rules in the folder's <guilabel>Properties</guilabel> dialog (the default is not to delete or move old messages). Usually &kmail;
--does this automatically, but under certain circumstances you might want to
--expire a folder manually...</para>
-+<para>Moves all of the messages in the selected folder into the trash folder.
-+This is only available if the currently selected folder is not a trash
-+folder.</para>
- </listitem>
- </varlistentry>
-
-+<!-- not in 440
- <varlistentry>
- <term>
- <menuchoice>
--<shortcut><keycombo action="simul">&Ctrl;<keycap>*</keycap></keycombo></shortcut>
- <guimenu>Folder</guimenu>
--<guimenuitem>Remove Duplicate Messages</guimenuitem>
-+<guimenuitem>Compact</guimenuitem>
- </menuchoice>
- </term>
- <listitem>
--<para>Searches the folder for duplicate messages and deletes the
--duplicates.</para>
-+<para>Compacts the folder file to reduce its disk space usage. Usually
-+&kmail; compacts all folders automatically, but under certain circumstances
-+you might want to compact a folder manually.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>
- <menuchoice>
--<shortcut><keycap>F5</keycap></shortcut>
- <guimenu>Folder</guimenu>
--<guimenuitem>Check Mail in This Folder</guimenuitem>
-+<guimenuitem>Expire</guimenuitem>
- </menuchoice>
- </term>
- <listitem>
--<para>Checks whether new mail arrived in the currently selected folder.
--This is only available for &imap; folders.</para>
-+<para>Deletes old messages from the current folder or moves them to another
-+folder, according to the rules in the folder's <guilabel>Properties</guilabel> dialog (the default is not to delete or move old messages). Usually &kmail;
-+does this automatically, but under certain circumstances you might want to
-+expire a folder manually...</para>
- </listitem>
- </varlistentry>
+--- doc/kmail/faq.docbook (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ doc/kmail/faq.docbook (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -182,7 +182,7 @@
+ open links in messages?</para></question>
+ <answer>
+ <para>Change the <guilabel>File Associations</guilabel> for HTML files
+-using &kcontrol;.</para>
++using &systemsettings;.</para>
+ </answer>
+ </qandaentry>
+
+Index: kalarm/alarmcalendar.cpp
+===================================================================
+--- kalarm/alarmcalendar.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kalarm/alarmcalendar.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -31,8 +31,6 @@
+ #include "preferences.h"
+
+ #include <kcal/calendarlocal.h>
+-#include <kcal/vcaldrag.h>
+-#include <kcal/vcalformat.h>
+ #include <kcal/icalformat.h>
+
+ #include <kglobal.h>
+@@ -44,16 +42,8 @@
+ #include <kio/netaccess.h>
+ #include <kfileitem.h>
+ #include <ktemporaryfile.h>
+-#include <kfiledialog.h>
+ #include <kdebug.h>
+
+-#include <QFile>
+-#include <QTextStream>
+-#include <QRegExp>
-
-+-->
- <varlistentry>
- <term>
- <menuchoice>
-+<shortcut><keycombo action="simul">&Ctrl;<keycap>*</keycap></keycombo></shortcut>
- <guimenu>Folder</guimenu>
--<guimenuitem>Move All Messages to Trash</guimenuitem>
-+<guimenuitem>Remove Duplicate Messages</guimenuitem>
- </menuchoice>
- </term>
- <listitem>
--<para>Moves all of the messages in the selected folder into the trash folder.
--This is only available if the currently selected folder is not a trash
--folder.</para>
-+<para>Searches the folder for duplicate messages and deletes the
-+duplicates.</para>
- </listitem>
- </varlistentry>
+-#include <unistd.h>
+-#include <time.h>
-
-+<!-- not in 440
- <varlistentry>
- <term>
- <menuchoice>
-@@ -714,7 +717,7 @@
- currently selected folder is a trash folder.</para>
- </listitem>
- </varlistentry>
--
-+-->
- <varlistentry>
- <term>
- <menuchoice>
-@@ -742,7 +745,7 @@
- activate this for folders which only contain trusted messages.</para>
- </listitem>
- </varlistentry>
--
-+<!-- not in 440
- <varlistentry>
- <term>
- <menuchoice>
-@@ -773,7 +776,7 @@
- </para>
- </listitem>
- </varlistentry>
--
-+-->
- <varlistentry>
- <term>
- <menuchoice>
-@@ -873,6 +876,7 @@
- <menuchoice>
- <shortcut><keycombo action="simul">&Shift;<keycap>A</keycap></keycombo></shortcut>
- <guimenu>Message</guimenu>
-+<guisubmenu>Reply Special</guisubmenu>
- <guimenuitem>Reply to Author...</guimenuitem>
- </menuchoice>
- </term>
-@@ -890,6 +894,7 @@
- <menuchoice>
- <shortcut><keycap>L</keycap></shortcut>
- <guimenu>Message</guimenu>
-+<guisubmenu>Reply Special</guisubmenu>
- <guimenuitem>Reply to Mailing-List...</guimenuitem>
- </menuchoice>
- </term>
-@@ -910,6 +915,7 @@
- <menuchoice>
- <shortcut><keycombo action="simul">&Shift;<keycap>R</keycap></keycombo></shortcut>
- <guimenu>Message</guimenu>
-+<guisubmenu>Reply Special</guisubmenu>
- <guimenuitem>Reply Without Quote...</guimenuitem>
- </menuchoice>
- </term>
-@@ -956,7 +962,21 @@
- <varlistentry>
- <term>
- <menuchoice>
-+<shortcut><keycap>T</keycap></shortcut>
- <guimenu>Message</guimenu>
-+<guimenuitem>Edit Message</guimenuitem>
-+</menuchoice>
-+</term>
-+<listitem>
-+<para>Edits the selected message if it is editable. Only messages in the
-+<guilabel>outbox</guilabel> and <guilabel>drafts</guilabel> folder can be edited.</para>
-+</listitem>
-+</varlistentry>
-+
-+<varlistentry>
-+<term>
-+<menuchoice>
-+<guimenu>Message</guimenu>
- <guisubmenu>Copy To</guisubmenu>
- </menuchoice>
- </term>
-@@ -1071,7 +1091,7 @@
- <guimenuitem>Mark Message</guimenuitem></menuchoice>.</para>
- </listitem>
- </varlistentry>
--
-+<!-- not in 440
- <varlistentry>
- <term>
- <menuchoice>
-@@ -1097,7 +1117,7 @@
- to this thread will automatically be marked as read.</para>
- </listitem>
- </varlistentry>
--
-+-->
- <varlistentry>
- <term>
- <menuchoice>
-@@ -1214,21 +1234,6 @@
- </listitem>
- </varlistentry>
-
-- <varlistentry id="reader-tools-import-messages">
-- <term>
-- <menuchoice>
-- <guimenu>Tools</guimenu>
-- <guimenuitem>Import Messages...</guimenuitem>
-- </menuchoice>
-- </term>
-- <listitem>
-- <para>
-- Starts up <application>kmailcvt</application> (which is
-- part of kdepim). This application lets you import
-- messages from several email clients &kmail;.
-- </para>
-- </listitem>
-- </varlistentry>
- <varlistentry>
- <term>
- <menuchoice>
-@@ -1273,7 +1278,6 @@
- </listitem>
- </varlistentry>
-
--<!--
- <varlistentry>
- <term>
- <menuchoice>
-@@ -1286,7 +1290,6 @@
- you to set up scanning messages for viruses.</para>
- </listitem>
- </varlistentry>
---->
-
- </variablelist>
-
-@@ -1310,7 +1313,7 @@
- to compose a new message &etc;).</para>
- </listitem>
- </varlistentry>
--
-+<!-- not in 440
- <varlistentry>
- <term>
- <menuchoice>
-@@ -1323,7 +1326,7 @@
- for messages matching a search text is visible.</para>
- </listitem>
- </varlistentry>
--
-+-->
- <varlistentry>
- <term>
- <menuchoice>
-@@ -1482,7 +1485,7 @@
- <menuchoice>
- <shortcut><keycombo action="simul">&Ctrl;<keycap>Return</keycap></keycombo></shortcut>
- <guimenu>Message</guimenu>
--<guimenuitem>Send Now</guimenuitem>
-+<guimenuitem>Send Mail</guimenuitem>
- </menuchoice>
- </term>
- <listitem>
-@@ -1645,6 +1648,18 @@
- <varlistentry>
- <term>
- <menuchoice>
-+<guimenu>Edit</guimenu>
-+<guimenuitem>Paste as Quotation</guimenuitem>
-+</menuchoice>
-+</term>
-+<listitem>
-+<para>Pastes the text from the clipboard marked as quotation.</para>
-+</listitem>
-+</varlistentry>
-+
-+<varlistentry>
-+<term>
-+<menuchoice>
- <shortcut><keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo></shortcut>
- <guimenu>Edit</guimenu>
- <guimenuitem>Select All</guimenuitem>
-@@ -1671,7 +1686,7 @@
- <varlistentry>
- <term>
- <menuchoice>
--<shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut>
-+<shortcut><keycap>F3</keycap></shortcut>
- <guimenu>Edit</guimenu>
- <guimenuitem>Find Next</guimenuitem>
- </menuchoice>
-@@ -1711,18 +1726,6 @@
- <term>
- <menuchoice>
- <guimenu>Edit</guimenu>
--<guimenuitem>Paste as Quotation</guimenuitem>
--</menuchoice>
--</term>
--<listitem>
--<para>Pastes the text from the clipboard marked as quotation.</para>
--</listitem>
--</varlistentry>
--
--<varlistentry>
--<term>
--<menuchoice>
--<guimenu>Edit</guimenu>
- <guimenuitem>Add Quote Characters</guimenuitem>
- </menuchoice>
- </term>
-@@ -2100,24 +2103,12 @@
- <term>
- <menuchoice>
- <guimenu>Settings</guimenu>
--<guimenuitem>Show Main Toolbar</guimenuitem>
-+<guimenuitem>Toolbars Shown</guimenuitem>
- </menuchoice>
- </term>
- <listitem>
--<para>If enabled, the Main Toolbar is visible, &ie; the one with the icon
--to send the message &etc;.</para>
--</listitem>
--</varlistentry>
--
--<varlistentry>
--<term>
--<menuchoice>
--<guimenu>Settings</guimenu>
--<guimenuitem>Show HTML Toolbar</guimenuitem>
--</menuchoice>
--</term>
--<listitem>
--<para>If enabled, the &html; Toolbar is visible, &ie; the one which with the
-+<para>Enables and disables the Main Toolbar, &ie; the one with the icon
-+to send the message &etc; and the &html; Toolbar, &ie; the one which with the
- tools to change certain properties of the composed text.</para>
- </listitem>
- </varlistentry>
-Index: doc/kmail/importing.docbook
-===================================================================
---- doc/kmail/importing.docbook (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ doc/kmail/importing.docbook (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -25,8 +25,8 @@
- <title>Using other Mailbox Files with &kmail;</title>
-
- <para>&kmail; offers an import tool for the messages and address books of some
--other email clients. You can access it using <menuchoice><guimenu>Tools</guimenu>
--<guimenuitem>Import...</guimenuitem></menuchoice>. Please make sure that you
-+other email clients. You can access it using <menuchoice><guimenu>File</guimenu>
-+<guimenuitem>Import Messages</guimenuitem></menuchoice>. Please make sure that you
- compact your folders in the other email client, no matter if you are going to use
- the import utility or if you are going to copy files manually.
- You only need to read this chapter if this tool does not work for you.</para>
-@@ -46,7 +46,7 @@
- &kmail;. The mailboxes should now show up correctly in &kmail;.</para>
-
- <para>Please have a look at the
--<ulink url="http://kontact.kde.org/kmail/tools.html">Tools section of &kmail;'s
-+<ulink url="http://userbase.kde.org/KMail/Tools">Tools section of &kmail;'s
- homepage</ulink> first, to see if there is a tool that imports your mailbox
- and maybe even address book.</para>
-
-@@ -241,7 +241,7 @@
- <term>Maildir / Outlook Express / xfmail</term>
- <listitem>
- <para>Tools to convert these formats are available at the
--<ulink url="http://kontact.kde.org/kmail/tools.html">Tools section of &kmail;'s
-+<ulink url="http://userbase.kde.org/KMail/Tools">Tools section of &kmail;'s
- homepage</ulink>.</para>
- </listitem>
- </varlistentry>
-@@ -251,7 +251,7 @@
- Mail</application>, &etc;...</term>
- <listitem>
- <para>First you should have a look at <ulink
--url="http://kontact.kde.org/kmail/tools.html">Tools section of &kmail;'s homepage</ulink> if
-+url="http://userbase.kde.org/KMail/Tools">Tools section of &kmail;'s homepage</ulink> if
- there are tools to convert your messages.</para>
- <para>Mail programs not listed here or on the homepage probably do not work with &kmail; as they use
- proprietary mail formats that &kmail; cannot understand. However, there is no
-Index: doc/kmail/intro.docbook
-===================================================================
---- doc/kmail/intro.docbook (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ doc/kmail/intro.docbook (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -45,7 +45,7 @@
- </itemizedlist>
-
- <para>&kmail;'s homepage can be found at <ulink
--url="http://kontact.kde.org/kmail/">http://kontact.kde.org/kmail/</ulink>. There you will
-+url="http://userbase.kde.org/KMail">http://userbase.kde.org/KMail</ulink>. There you will
- find useful links, ⪚ to the user and developer mailing lists.
- Please report bugs in &kmail; using
- <menuchoice><guimenu>Help</guimenu><guimenuitem>Report
-Index: kalarm/editdlgtypes.cpp
-===================================================================
---- kalarm/editdlgtypes.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kalarm/editdlgtypes.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
+ using namespace KCal;
+
+ static const QString displayCalendarName = QLatin1String("displaying.ics");
+Index: kalarm/messagewin.cpp
+===================================================================
+--- kalarm/messagewin.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kalarm/messagewin.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
@@ -1,7 +1,7 @@
/*
- * editdlgtypes.cpp - dialogs to create or edit alarm or alarm template types
+ * messagewin.cpp - displays an alarm message
* Program: kalarm
- * Copyright © 2001-2009 by David Jarvie <djarvie@kde.org>
+ * Copyright © 2001-2010 by David Jarvie <djarvie@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
-@@ -846,6 +846,7 @@
- */
- void EditCommandAlarmDlg::setAction(KAEventData::Action action, const AlarmText& alarmText)
- {
-+ Q_UNUSED(action);
- Q_ASSERT(action == KAEventData::COMMAND);
- mCmdEdit->setText(alarmText);
- }
-@@ -1177,6 +1178,7 @@
- */
- void EditEmailAlarmDlg::setAction(KAEventData::Action action, const AlarmText& alarmText)
+@@ -1361,7 +1361,7 @@
{
-+ Q_UNUSED(action);
- Q_ASSERT(action == KAEventData::EMAIL);
- if (alarmText.isEmail())
- {
-@@ -1505,6 +1507,7 @@
- */
- void EditAudioAlarmDlg::setAction(KAEventData::Action action, const AlarmText& alarmText)
- {
-+ Q_UNUSED(action);
- Q_ASSERT(action == KAEventData::AUDIO);
- mSoundConfig->set(alarmText.displayText(), Preferences::defaultSoundVolume());
+ kDebug();
+ if (mAudioThread)
+- mAudioThread->stop();
++ mAudioThread->stop(wait);
}
-Index: kalarm/resources/localdir.desktop
-===================================================================
---- kalarm/resources/localdir.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kalarm/resources/localdir.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -53,6 +53,7 @@
- Comment[en_GB]=Provides access to an alarm calendar stored in a local directory, in which each calendar item is stored in a separate file
- Comment[es]=Provee acceso a un calendario de alarmas almacenado en un directorio local, en el cual cada elemento del calendario es almacenado en un archivo separado
- Comment[et]=Võimaldab kasutada kohalikku kataloogi salvestatud häirete kalendrit, kus iga kalender on salvestatud eraldi faili
-+Comment[fi]=Tarjoaa pääsyn paikalliseen kansioon tallennettuun hälytyskalenteriin, jossa jokainen kalenteritietue on erillinen tiedosto
- Comment[fr]=Fourni l'accès aux alarmes de calendrier stockées dans un dossier ; chaque entrée du calendrier étant stockée dans un fichier distinct
- Comment[gl]=Permite acceder a un calendario de alarmas almacenado nun directorio local no que cada elemento do calendario se almacena nun ficheiro diferente
- Comment[hu]=Helyi mappában tárolt emlékeztetőkhöz biztosít hozzáférést (minden bejegyzés külön fájlban található)
-Index: kalarm/resources/local.desktop
-===================================================================
---- kalarm/resources/local.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kalarm/resources/local.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -53,6 +53,7 @@
- Comment[en_GB]=Provides access to an alarm calendar stored in a single local file
- Comment[es]=Provee acceso al calendario de alarmas almacenado en un solo archivo local
- Comment[et]=Võimaldab kasutada kohalikku faili salvestatud häirete kalendrit
-+Comment[fi]=Tarjoaa pääsyn yksittäiseen paikalliseen tiedostoon tallennettuun hälytyskalenteriin
- Comment[fr]=Fourni l'accès aux alarmes de calendrier stockées dans un unique fichier
- Comment[gl]=Dá aceso a un calendario de alarmas gardado nun ficheiro local
- Comment[hu]=Helyi fájlban tárolt emlékeztetőkhöz biztosít hozzáférést
-Index: kalarm/resources/remote.desktop
-===================================================================
---- kalarm/resources/remote.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kalarm/resources/remote.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -53,6 +53,7 @@
- Comment[en_GB]=Provides access to an alarm calendar in a remote file using KDE's network framework KIO
- Comment[es]=Provee acceso a un calendario de alarmas en un archivo remoto utilizando la infraestructura KIO de red de KDE
- Comment[et]=Võimaldab kasutada võrgufailis leiduvat häirete kalendrit KDE võrguraamistiku KIO vahendusel
-+Comment[fi]=Tarjoaa pääsyn etätiedostoon tallennettuun hälytyskalenteriin käyttäen KDE:n verkkorajapintaa (KIO)
- Comment[fr]=Fourni l'accès aux alarmes de calendrier stockées dans un fichier distant en utilisant les composants réseaux KIO de KDE
- Comment[gl]=Permite acceder a un calendario de alarmas dun ficheiro remoto empregando a infraestrutura de rede KIO do KDE
- Comment[hu]=Távoli fájlban tárolt emlékeztetőkhöz biztosít hozzáférést a KIO keretrendszer segítségével
-Index: kalarm/kalarm.autostart.desktop
-===================================================================
---- kalarm/kalarm.autostart.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kalarm/kalarm.autostart.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -77,6 +77,7 @@
- Comment[en_GB]=KAlarm autostart at login
- Comment[es]=Inicio automático de KAlarm al iniciar sesión
- Comment[et]=KAlarmi automaatne käivitamine sisselogimisel
-+Comment[fi]=KAlarmin automaattikäynnistys kirjauduttaessa
- Comment[fr]=Démarrage à la connexion de KAlarm
- Comment[ga]=Tosaigh KAlarm go huathoibríoch ag am logála isteach
- Comment[gl]=Inicio automático do KAlarm
+
+ /******************************************************************************
Index: kalarm/akonadi/kalarmresource_active.desktop
===================================================================
---- kalarm/akonadi/kalarmresource_active.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kalarm/akonadi/kalarmresource_active.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[en_GB]=KAlarm Active Alarms
- Name[es]=Alarmas activas en KAlarm
- Name[et]=KAlarmi aktiivsed häired
-+Name[fi]=KAlarmin aktiiviset hälytykset
- Name[fr]=Alarmes actives KAlarm
- Name[gl]=Alarmas activas do KAlarm
+--- kalarm/akonadi/kalarmresource_active.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kalarm/akonadi/kalarmresource_active.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -14,6 +14,7 @@
Name[it]=Avvisi attivi di KAlarm
-@@ -37,6 +38,7 @@
- Comment[en_GB]=Loads data from a KAlarm active alarm calendar file
- Comment[es]=Carga datos de un archivo de calendario de alarmas activas de KAlarm
- Comment[et]=Andmete laadimine KAlarmi aktiivsete häirete kalendrifailist
-+Comment[fi]=Noutaa tietoa KAlarmin aktiivisten hälytysten kalenteritiedostosta
- Comment[fr]=Charge les données d'une alarme active KAlarm depuis un fichier d'agenda
- Comment[gl]=Carrega datos desde un ficheiro de calendario de alarmas activas do KAlarm
+ Name[ja]=KAlarm アクティブなアラーム
+ Name[km]=ការជូនដំណឹងសកម្មរបស់ KAlarm
++Name[lt]=KAlarm aktyvūs priminimai
+ Name[lv]=KAlarm aktīvie atgādinājumi
+ Name[nb]=KAlarm aktive varslinger
+ Name[nds]=Aktiev KAlarm-Alarms
+@@ -45,6 +46,7 @@
Comment[it]=Carica dati da un calendario per avvisi attivi di KAlarm
+ Comment[ja]=KAlarm のアクティブなアラームのカレンダーファイルからデータを読み込みます
+ Comment[km]=ផ្ទុកទិន្នន័យពីឯកសារប្រតិទិនជូនដំណឹងសកម្មរបស់ KAlarm
++Comment[lt]=Įkelia duomenis iš KAlarm aktyvių priminimų kalendoriaus failo
+ Comment[lv]=Ielādē datus no KAlarm aktīvo atgādinājumu kalendāra faila
+ Comment[nb]=Laster data fra en KAlarm kalenderfil med aktive varslinger
+ Comment[nds]=Laadt Daten ut en KAlarm-Kalennerdatei för aktiev Alarms
Index: kalarm/akonadi/kalarmresource_template.desktop
===================================================================
---- kalarm/akonadi/kalarmresource_template.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kalarm/akonadi/kalarmresource_template.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[en_GB]=KAlarm Templates
- Name[es]=Plantillas de KAlarm
- Name[et]=KAlarmi mallid
-+Name[fi]=KAlarm-mallipohjat
- Name[fr]=Modèles KAlarm
- Name[gl]=Modelos do KAlarm
+--- kalarm/akonadi/kalarmresource_template.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kalarm/akonadi/kalarmresource_template.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -14,6 +14,7 @@
Name[it]=Modelli di KAlarm
-@@ -37,6 +38,7 @@
- Comment[en_GB]=Loads data from a KAlarm alarm template file
- Comment[es]=Carga datos de un archivo de plantillas de alarmas de KAlarm
- Comment[et]=Andmete laadimine KAlarmi häiremallide failist
-+Comment[fi]=Noutaa tietoa KAlarmin mallipohjatiedostosta
- Comment[fr]=Charge des données depuis un fichier modèle KAlarm
- Comment[gl]=Carrega datos desde un ficheiro de de modelos de alarma do KAlarm
+ Name[ja]=KAlarm テンプレート
+ Name[km]=ពុម្ពរបស់ KAlarm
++Name[lt]=KAlarm šablonai
+ Name[lv]=KAlarm sagataves
+ Name[nb]=KAlarm-maler
+ Name[nds]=KAlarm-Vörlagen
+@@ -45,6 +46,7 @@
Comment[it]=Carica dati da un modello di avviso di KAlarm
+ Comment[ja]=KAlarm のアラームテンプレートファイルからデータを読み込みます
+ Comment[km]=ផ្ទុកទិន្នន័យពីឯកសារពុម្ពជូនដំណឹងរបស់ KAlarm
++Comment[lt]=Įkelia duomenis iš KAlarm šablono failo
+ Comment[lv]=Ielādē datus no KAlarm atgādinājumu sagatavju faila
+ Comment[nb]=Laster data fra en KAlarm kalenderfil med varslingsmaler
+ Comment[nds]=Laadt Daten ut en KAlarm-Alarmvörlagendatei
Index: kalarm/akonadi/kalarmresource.desktop
===================================================================
---- kalarm/akonadi/kalarmresource.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kalarm/akonadi/kalarmresource.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[en_GB]=KAlarm Calendar File
- Name[es]=Archivo de calendario de KAlarm
- Name[et]=KAlarmi kalendrifail
-+Name[fi]=KAlarm-kalenteritiedosto
- Name[fr]=Fichier d'agenda KAlarm
- Name[gl]=Ficheiro de calendario de KAlarm
+--- kalarm/akonadi/kalarmresource.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kalarm/akonadi/kalarmresource.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -14,6 +14,7 @@
Name[it]=Calendario di KAlarm
-@@ -17,6 +18,7 @@
+ Name[ja]=KAlarm カレンダーファイル
+ Name[km]=ឯកសារប្រតិទិនរបស់ KAlarm
++Name[lt]=KAlarm kalendoriaus failas
+ Name[lv]=KAlarm kalendāra fails
Name[nb]=KAlarm kalenderfil
Name[nds]=KAlarm-Kalennerdatei
- Name[nl]=KAlarm-agendabestand
-+Name[nn]=KAlarm-kalenderfil
- Name[pa]=ਕੇ-ਅਲਾਰਮ ਕੈਲੰਡਰ ਫਾਇਲ
- Name[pl]=Plik kalendarza KAlarm
- Name[pt]=Ficheiro de Calendário do KAlarm
-@@ -37,6 +39,7 @@
- Comment[en_GB]=Loads data from a KAlarm calendar file
- Comment[es]=Carga datos de un archivo de calendario de KAlarm
- Comment[et]=Andmete laadimine KAlarmi kalendrifailist
-+Comment[fi]=Noutaa tietoa KAlarmin kalenteritiedostosta
- Comment[fr]=Charge les données depuis un fichier d'agenda KAlarm
- Comment[gl]=Carrega datos desde un ficheiro de calendario do KAlarm
+@@ -45,6 +46,7 @@
Comment[it]=Carica dati da un calendario di KAlarm
+ Comment[ja]=KAlarm のカレンダーファイルからデータを読み込みます
+ Comment[km]=ផ្ទុកទិន្នន័យពីឯកសារប្រតិទិនរបស់ KAlarm
++Comment[lt]=Įkelia duomenis iš KAlarm kalendoriaus failo
+ Comment[lv]=Ielādē datus no KAlarm kalendāra faila
+ Comment[nb]=Laster data fra en KAlarm kalenderfil
+ Comment[nds]=Laadt Daten ut en KAlarm-Kalennerdatei
Index: kalarm/akonadi/kalarmresource_archived.desktop
===================================================================
---- kalarm/akonadi/kalarmresource_archived.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kalarm/akonadi/kalarmresource_archived.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[en_GB]=KAlarm Archived Alarms
- Name[es]=Alarmas archivadas de KAlarm
- Name[et]=KAlarmi aegunud häired
-+Name[fi]=KAlarmin arkistoidut hälytykset
- Name[fr]=Alarmes KAlarm archivées
- Name[gl]=Alarmas arquivadas do KAlarm
+--- kalarm/akonadi/kalarmresource_archived.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kalarm/akonadi/kalarmresource_archived.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -14,6 +14,7 @@
Name[it]=Avvisi archiviati di KAlarm
-@@ -36,6 +37,7 @@
- Comment[en_GB]=Loads data from a KAlarm archived alarm calendar file
- Comment[es]=Carga datos de un archivo de calendario de alarmas archivadas de KAlarm
- Comment[et]=Andmete laadimine KAlarmi aegunud häirete kalendrifailist
-+Comment[fi]=Noutaa tietoa KAlarmin arkistoitujen hälytysten kalenteritiedostosta
- Comment[fr]=Charge les données d'une alarme archivée KAlarm depuis un fichier d'agenda
- Comment[gl]=Carrega datos desde un ficheiro de calendario de alarmas arquivadas do KAlarm
+ Name[ja]=KAlarm アーカイブのアラーム
+ Name[km]=ការជូនដំណឹងប័ណ្ណសាររបស់ KAlarm
++Name[lt]=KAlarm archyvuoti priminimai
+ Name[lv]=KAlarm arhivētie atgādinājumi
+ Name[nb]=KAlarm arkiverte varslinger
+ Name[nds]=Aflopen KAlarm-Alarms
+@@ -44,6 +45,7 @@
Comment[it]=Carica dati da un calendario per avvisi archiviati di KAlarm
+ Comment[ja]=KAlarm のアーカイブされたアラームのカレンダーファイルからデータを読み込みます
+ Comment[km]=ផ្ទុកទិន្នន័យពីឯកសារប្រតិទិនជូនដំណឹងប័ណ្ណសាររបស់ KAlarm
++Comment[lt]=Įkelia duomenis iš KAlarm aktyvių archyvuotų priminimų kalendoriaus failo
+ Comment[lv]=Ielādē datus no KAlarm arhivēto atgādinājumu kalendāra faila
+ Comment[nb]=Laster data fra en KAlarm kalenderfil med arkiverte varslinger
+ Comment[nds]=Laadt Daten ut en KAlarm-Kalennerdatei för aflopen Alarms
Index: kalarm/akonadi/akonadi_serializer_kalarm.desktop
===================================================================
---- kalarm/akonadi/akonadi_serializer_kalarm.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kalarm/akonadi/akonadi_serializer_kalarm.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[en_GB]=KAlarm Event Serialiser
- Name[es]=Serializador de eventos de KAlarm
- Name[et]=KAlarmi sündmuste jadasti
-+Name[fi]=KAlarm-tapahtumasarjoittaja
- Name[fr]=Sérialiseur d'évènement KAlarm
- Name[gl]=Serializador de Eventos KAlarm
+--- kalarm/akonadi/akonadi_serializer_kalarm.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kalarm/akonadi/akonadi_serializer_kalarm.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -14,6 +14,7 @@
Name[it]=Serializzatore degli eventi di KAlarm
-@@ -17,6 +18,7 @@
+ Name[ja]=KAlarm イベント用シリアライザ
+ Name[km]=កម្មវិធីបោះពុម្ពព្រឹត្តិការណ៍ KAlarm
++Name[lt]=KAlarm įvykių serializatorius
+ Name[lv]=KAlarm notikumu serializētājs
Name[nb]=KAlarm hendelsesserialiserer
Name[nds]=KAlarm-Begeefnis-Reegmoduul
- Name[nl]=KAlarm gebeurtenissen in volgorde zetten
-+Name[nn]=Serialisator for KAlarm-hendingar
- Name[pa]=ਕੇਅਲਾਰਮ ਈਵੈਂਟ ਸੀਰੀਅਲਾਈਜ਼ਰ
- Name[pl]=Serializacja zdarzeń KAlarm
- Name[pt]=Serializador de Eventos do KAlarm
-@@ -36,6 +38,7 @@
- Comment[en_GB]=An Akonadi serialiser plugin for KAlarm events
- Comment[es]=Un complemento serializador de Akonadi para eventos de KAlarm
- Comment[et]=Akonadi KAlarmi sündmuste jadastamisplugin
-+Comment[fi]=Akonadi-sarjoitusliitännäinen KAlarmin tapahtumille
- Comment[fr]=Un module externe Akonadi pour la sérialisation des évènements KAlarm
- Comment[gl]=Un engadido serializador de Akonadi para os eventos de KAlarm
+@@ -44,6 +45,7 @@
Comment[it]=Un'estensione di Akonadi per la serializzazione di eventi di KAlarm
-@@ -45,6 +48,7 @@
+ Comment[ja]=KAlarm のイベントのための Akonadi シリアライザプラグイン
+ Comment[km]=កម្មវិធីជំនួយរបស់កម្មវិធីបោះពុម្ព Akonadi សម្រាប់ព្រឹត្តិការណ៍ KAlarm
++Comment[lt]=Akonadi serializatoriaus priedas KAlarm įvykiams
+ Comment[lv]=Akonadi KAlarm notikumu serializēšanas spraudnis
Comment[nb]=Et Akonadi serialiserer-programtillegg for KAlarm-hendelser
Comment[nds]=Akonadi-Inreegmoduul för KAlarm-Begeefnissen
- Comment[nl]=Een Akonadi-plugin voor het in volgorde zetten van KAlarm gebeurtenissen
-+Comment[nn]=Eit Akonadi-serialisatortillegg for KAlarm-hendingar
- Comment[pl]=Wtyczka Akonadi do serializowania zdarzeń KAlarm
- Comment[pt]=Um 'plugin' de serialização do Akonadi para os eventos do KAlarm
- Comment[pt_BR]=Um plug-in de serialização do Akonadi para eventos do KAlarm
-Index: kaddressbook/kaddressbookpart.desktop
-===================================================================
---- kaddressbook/kaddressbookpart.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kaddressbook/kaddressbookpart.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -18,7 +18,7 @@
- Name[es]=KAddressBook
- Name[et]=KDE aadressiraamat
- Name[eu]=Helbide-liburua
--Name[fi]=Osoitekirja
-+Name[fi]=KAddressBook
- Name[fr]=Carnet d'adresses
- Name[fy]=KAddressBook
- Name[ga]=KAddressBook
-Index: kaddressbook/kaddressbook.desktop
-===================================================================
---- kaddressbook/kaddressbook.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kaddressbook/kaddressbook.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -17,7 +17,7 @@
- Name[es]=KAddressBook
- Name[et]=KDE aadressiraamat
- Name[eu]=Helbide-liburua
--Name[fi]=Osoitekirja
-+Name[fi]=KAddressBook
- Name[fr]=Carnet d'adresses
- Name[fy]=KAddressBook
- Name[ga]=KAddressBook
+Index: kalarm/kaevent.cpp
+===================================================================
+--- kalarm/kaevent.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kalarm/kaevent.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -82,7 +82,8 @@
+ }
+
+ KAEvent::Private::Private(const KAEvent::Private& e)
+- : QSharedData(e)
++ : KAEventData::Observer(e),
++ QSharedData(e)
+ {
+ copy(e, false);
+ mEventData = new KAEventData(this, *e.mEventData);
Index: kaddressbook/xxport/ldap/kcmldap.desktop
===================================================================
---- kaddressbook/xxport/ldap/kcmldap.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kaddressbook/xxport/ldap/kcmldap.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -19,6 +19,7 @@
- Name[en_GB]=LDAP Server Settings
- Name[es]=Configuración del servidor LDAP
- Name[et]=LDAP serveri seadistused
-+Name[fi]=LDAP-palvelimen asetukset
- Name[fr]=Configuration du serveur LDAP
- Name[gl]=Configuración do servidor de LDAP
+--- kaddressbook/xxport/ldap/kcmldap.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kaddressbook/xxport/ldap/kcmldap.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -25,6 +25,7 @@
Name[it]=Impostazioni server LDAP
-@@ -28,6 +29,7 @@
+ Name[ja]=LDAP サーバの設定
+ Name[km]=ការកំណត់ម៉ាស៊ីនបម្រើ LDAP
++Name[lt]=LDAP serverio nustatymai
+ Name[lv]=LDAP serveru iestatījumi
Name[nb]=LDAP tjenerinnstillinger
Name[nds]=LDAP-Server instellen
- Name[nl]=LDAP-serverinstellingen
-+Name[nn]=Innstillingar for LDAP-tenar
- Name[pa]=LDAP ਸਰਵਰ ਸੈਟਿੰਗ
- Name[pl]=Ustawienia serwera LDAP
- Name[pt]=Configuração do Servidor de LDAP
-@@ -49,6 +51,7 @@
- Comment[en_GB]=Configure the available LDAP servers
- Comment[es]=Configurar los servidores LDAP disponibles
- Comment[et]=Saadaolevate LDAP serverite seadistamine
-+Comment[fi]=Käytössä olevien LDAP-palvelinten asetukset
- Comment[fr]=Configurer les serveurs LDAP disponibles
- Comment[gl]=Configurar os servidores de LDAP dispoñíbeis
+@@ -57,6 +58,7 @@
Comment[it]=Configura i server LDAP disponibili
-@@ -58,6 +61,7 @@
+ Comment[ja]=利用可能な LDAP サーバの設定
+ Comment[km]=កំណត់រចនាសម្ព័ន្ធម៉ាស៊ីនបម្រើ LDAP ដែលអាចប្រើបាន
++Comment[lt]=Konfigūruoti prieinamus LDAP serverius
+ Comment[lv]=Konfigurē pieejamos LDAP serverus
Comment[nb]=Sett opp de tilgjengelige LDAP-tjenerne
Comment[nds]=De verföögboren LDAP-Servers instellen
- Comment[nl]=De beschikbare LDAP-servers configureren
-+Comment[nn]=Set opp dei tilgjengelege LDAP-tenarane
- Comment[pl]=Konfiguracja dostępnych serwerów LDAP
- Comment[pt]=Configurar os servidores de LDAP disponíveis
- Comment[pt_BR]=Configura os servidores LDAP disponíveis
-Index: ktimetracker/timetrackerstorage.cpp
-===================================================================
---- ktimetracker/timetrackerstorage.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ ktimetracker/timetrackerstorage.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -779,7 +779,7 @@
- // use the internal table itab to create the return value retval
- for ( int y=0; y<=(taskview->count()); y++ )
- {
-- if (itab->item(y,0)) retval.append(itab->item(y,0)->text()); // task names
-+ if (itab->item(y,0)) retval.append("\"").append(itab->item(y,0)->text().replace("\"","\"\"")).append("\""); // task names
- for ( int x=1; x<=from.daysTo(to)+1; x++ )
- {
- retval.append(rc.delimiter);
-Index: ktimetracker/taskview.h
-===================================================================
---- ktimetracker/taskview.h (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ ktimetracker/taskview.h (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -259,6 +259,7 @@
- protected:
- void mouseMoveEvent( QMouseEvent* );
- void mousePressEvent( QMouseEvent* );
-+ void dropEvent ( QDropEvent * event );
-
- protected Q_SLOTS:
- void minuteUpdate();
-Index: ktimetracker/ktimetracker_config_storage.desktop
-===================================================================
---- ktimetracker/ktimetracker_config_storage.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ ktimetracker/ktimetracker_config_storage.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -61,7 +61,7 @@
- Comment[et]=Salvesti seadistamine
- Comment[fr]=Configuration du stockage
- Comment[ga]=Cumraigh Stóras
--Comment[gl]=Configurar o almacenamento
-+Comment[gl]=Configure o almacenamento
- Comment[hu]=A tároló beállításai
- Comment[it]=Configura la memorizzazione
- Comment[ja]=保存の設定
-Index: ktimetracker/taskview.cpp
+Index: CMakeLists.txt
===================================================================
---- ktimetracker/taskview.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ ktimetracker/taskview.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -583,6 +583,8 @@
- }
- }
- }
-+ for (int i=0; i<count(); i++) itemAt(i)->recalculatetotaltime();
-+ for (int i=0; i<count(); i++) itemAt(i)->recalculatetotalsessiontime();
- refresh();
- kDebug(5970) << "Leaving TaskView::reFreshTimes()";
- return err;
-@@ -642,7 +644,12 @@
- long TaskView::count()
- {
- long n = 0;
-- for (Task* t = itemAt(n); t; t=itemAt(++n)){};
-+ QTreeWidgetItemIterator item( this );
-+ while( *item )
-+ {
-+ ++item;
-+ ++n;
-+ }
- return n;
- }
+--- CMakeLists.txt (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ CMakeLists.txt (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -210,7 +210,7 @@
-@@ -668,6 +675,12 @@
- return result;
- }
+ include( SopranoAddOntology )
+ add_subdirectory( ontologies )
+- add_subdirectory( nepomuk_email_feeder )
++# add_subdirectory( nepomuk_email_feeder )
+ endif(QGPGME_FOUND)
-+void TaskView::dropEvent ( QDropEvent * event )
-+ {
-+ QTreeWidget::dropEvent(event);
-+ reFreshTimes();
-+ }
-+
- void TaskView::scheduleSave()
- {
- _manualSaveTimer->start( 10 );
-Index: ktimetracker/ktimetracker_config_display.desktop
-===================================================================
---- ktimetracker/ktimetracker_config_display.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ ktimetracker/ktimetracker_config_display.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -90,7 +90,7 @@
- Comment[et]=Välimuse seadistamine
- Comment[fr]=Configuration de l'apparence
- Comment[ga]=Cumraigh Cuma
--Comment[gl]=Configurar a aparencia
-+Comment[gl]=Configure a aparencia
- Comment[hu]=A megjelenés beállítása
- Comment[it]=Configura l'aspetto
- Comment[ja]=外観の設定
-Index: ktimetracker/version.h
-===================================================================
---- ktimetracker/version.h (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ ktimetracker/version.h (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -20,5 +20,5 @@
- */
-
- #ifndef KTIMETRACKER_VERSION
--#define KTIMETRACKER_VERSION "4.4.0"
-+#define KTIMETRACKER_VERSION "4.4.1"
- #endif
-Index: ktimetracker/task.cpp
+ if(KDEPIM_BUILD_EVERYTHING)
+Index: ktimetracker/ktimetracker_config_storage.desktop
===================================================================
---- ktimetracker/task.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ ktimetracker/task.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -346,7 +346,30 @@
- kDebug(5970) << "Leaving function";
- return err;
- }
-+ long Task::recalculatetotaltime()
-+ {
-+ long result=0;
-+ setTotalTime(0);
-+ Task* child;
-+ for (int i=0; i<this->childCount(); ++i)
-+ child=(Task*)this->child(i);
-+ addTotalTime(time());
-+ result=totalTime();
-+ return result;
-+ }
-
-+QString Task::recalculatetotalsessiontime()
-+ {
-+ QString result;
-+ setTotalSessionTime(0);
-+ Task* child;
-+ for (int i=0; i<this->childCount(); ++i)
-+ child=(Task*)this->child(i);
-+ addTotalSessionTime(time());
-+ return result;
-+ }
-+
-+
- QString Task::setSessionTime( long minutes )
- {
- kDebug(5970) << "Entering function";
-Index: ktimetracker/main.cpp
-===================================================================
---- ktimetracker/main.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ ktimetracker/main.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -165,7 +165,6 @@
- sto->load( 0, icsfile( args ) );
- const QString& s=args->getOption("addtask");
- QVector<int> vec;
-- vec.push_back(0);
- DesktopList dl=vec;
- Task* task=new Task( s,(long int) 0,(long int) 0, dl, 0, true );
- sto->addTask( task );
-Index: ktimetracker/task.h
-===================================================================
---- ktimetracker/task.h (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ ktimetracker/task.h (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -154,7 +154,15 @@
- *
- */
- QString addSessionTime( long minutes );
-+
-+ /** Sets the total time, does not change the parent's total time.
-+ This means the parent's total time can run out of sync.
-+ */
-+ void setTotalTime( long minutes ) { mTotalTime=minutes; };
-
-+ /** A recursive function to calculate the total time of a task. */
-+ long recalculatetotaltime();
-+
- /** Adds minutes to the task's and its supertasks' total session time. This does not add an event.
- *
- * @param minutes minutes to add to the session time
-@@ -163,6 +171,10 @@
- */
- QString addTotalSessionTime( long minutes );
-
-+ void setTotalSessionTime( long minutes ) { mTotalSessionTime=minutes; };
-+
-+ QString recalculatetotalsessiontime();
-+
- /** Sets the time (not session time). This does not add an event.
- *
- * @param minutes minutes to set time to
+--- ktimetracker/ktimetracker_config_storage.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ ktimetracker/ktimetracker_config_storage.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -31,6 +31,7 @@
+ Name[it]=Memorizzazione
+ Name[ja]=保存
+ Name[km]=ឧបករណ៍ផ្ទុក
++Name[lt]=Saugojimas
+ Name[lv]=Glabāšana
+ Name[nb]=Lagring
+ Name[nds]=Sekern
+@@ -66,6 +67,7 @@
+ Comment[it]=Configura la memorizzazione
+ Comment[ja]=保存の設定
+ Comment[km]=កំណត់រចនាសម្ព័ន្ធឧបករណ៍ផ្ទុក
++Comment[lt]=Konfigūruoti saugojimą
+ Comment[lv]=Konfigurēt glabāšanu
+ Comment[nb]=Sett opp lagring
+ Comment[nds]=Sekern instellen
Index: ktimetracker/ktimetracker_config_behavior.desktop
===================================================================
---- ktimetracker/ktimetracker_config_behavior.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ ktimetracker/ktimetracker_config_behavior.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -62,7 +62,7 @@
- Comment[et]=Käitumise seadistamine
- Comment[fr]=Configuration du comportement
- Comment[ga]=Cumraigh Oibriú
--Comment[gl]=Configurar o comportamento
-+Comment[gl]=Configure o comportamento
- Comment[hu]=A működési mód beállítása
- Comment[it]=Configura il comportamento
- Comment[ja]=挙動の設定
-Index: kjots/Kjots.desktop
-===================================================================
---- kjots/Kjots.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kjots/Kjots.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -12,6 +12,7 @@
- Name[en_GB]=KJots
- Name[es]=KJots
- Name[et]=KJots
-+Name[fi]=KJots
- Name[fr]=KJots
- Name[ga]=KJots
- Name[gl]=KJots
-@@ -50,6 +51,7 @@
- GenericName[en_GB]=Note Taker
- GenericName[es]=Apuntador de notas
- GenericName[et]=Märkmete rakendus
-+GenericName[fi]=Note Taker
- GenericName[fr]=Prise de note
- GenericName[ga]=Eagarthóir Nótaí
- GenericName[gl]=Caderno de notas
-Index: kjots/kjotspart.desktop
-===================================================================
---- kjots/kjotspart.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kjots/kjotspart.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -11,6 +11,7 @@
- Name[en_GB]=KJotsPart
- Name[es]=KJotsPart
- Name[et]=KJotsPart
-+Name[fi]=KJots-osa
- Name[fr]=KJotsPart
- Name[ga]=KJotsPart
- Name[gl]=KJotsPart
+--- ktimetracker/ktimetracker_config_behavior.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ ktimetracker/ktimetracker_config_behavior.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -32,6 +32,7 @@
+ Name[it]=Comportamento
+ Name[ja]=挙動
+ Name[km]=ឥរិយាបទ
++Name[lt]=Elgsena
+ Name[lv]=Izturēšanās
+ Name[nb]=Oppførsel
+ Name[nds]=Bedregen
Index: kjots/kjots_config_misc.desktop
===================================================================
---- kjots/kjots_config_misc.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kjots/kjots_config_misc.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -83,6 +83,7 @@
- Comment[en_GB]=Setup misc for KJots
- Comment[es]=Configuraciones varias de KJots
- Comment[et]=KJotsi muud seadistused
-+Comment[fi]=KJotsin sekalaiset asetukset
- Comment[fr]=Configuration (divers) de KJots
- Comment[gl]=Configuración de opcións varias do KJots
- Comment[hu]=KJots-beállító
-Index: libkdepim/contactsfilterproxymodel.cpp
-===================================================================
---- libkdepim/contactsfilterproxymodel.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ libkdepim/contactsfilterproxymodel.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -39,6 +39,8 @@
- ContactsFilterModel::ContactsFilterModel( QObject *parent )
- : QSortFilterProxyModel( parent ), d( new Private )
- {
-+ // contact names should be sorted correctly
-+ setSortLocaleAware( true );
+--- kjots/kjots_config_misc.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kjots/kjots_config_misc.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -90,6 +90,7 @@
+ Comment[it]=Impostazioni varie per KJots
+ Comment[ja]=KJots のオプション設定
+ Comment[km]=ការដំឡើងផ្សេងៗសម្រាប់ KJots
++Comment[lt]=Papildomi KJots nustatymai
+ Comment[lv]=Dažādi KJots iestatījumi
+ Comment[nb]=Sett opp diverse for KJots
+ Comment[nds]=Anner Saken binnen KJots instellen
+Index: nepomuk_email_feeder/shared/nepomukfeederagentbase.cpp
+===================================================================
+--- nepomuk_email_feeder/shared/nepomukfeederagentbase.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ nepomuk_email_feeder/shared/nepomukfeederagentbase.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -320,7 +320,7 @@
+ emit status( Broken, i18n( "Nepomuk not operational" ) );
+ if ( !QDBusConnection::sessionBus().registerService( QLatin1String( "org.kde.pim.nepomukfeeder.selftestreport" ) ) )
+ return;
+- KMessageBox::error( 0, message, i18n( "Nepomuk Indexing Disabled" ), KMessageBox::Notify | KMessageBox::AllowLink );
++ //KMessageBox::error( 0, message, i18n( "Nepomuk Indexing Disabled" ), KMessageBox::Notify | KMessageBox::AllowLink );
+ QDBusConnection::sessionBus().unregisterService( QLatin1String( "org.kde.pim.nepomukfeeder.selftestreport" ) );
}
- ContactsFilterModel::~ContactsFilterModel()
-Index: libkdepim/categoryeditdialog_base.ui
-===================================================================
---- libkdepim/categoryeditdialog_base.ui (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ libkdepim/categoryeditdialog_base.ui (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -21,6 +21,9 @@
- </property>
- <item row="1" column="0" colspan="2" >
- <widget class="KLineEdit" name="mEdit" >
-+ <property name="ClearButtonShown" >
-+ <bool>true</bool>
-+ </property>
- <property name="toolTip" >
- <string>New category entry</string>
- </property>
+Index: nepomuk_email_feeder/nepomukemailfeeder.desktop
+===================================================================
+--- nepomuk_email_feeder/nepomukemailfeeder.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ nepomuk_email_feeder/nepomukemailfeeder.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -7,7 +7,7 @@
+ Name[de]=E-Mail-Modul für Nepomuk
+ Name[el]=Τροφοδότης EMail του Nepomuk
+ Name[en_GB]=Nepomuk EMail Feeder
+-Name[es]=Proveedor de correos electrónicos de Nepomuk
++Name[es]=Proveedor de correo de Nepomuk
+ Name[et]=Nepomuki e-kirjade söötur
+ Name[fr]=Connecteur Nepomuk pour les courriels
+ Name[ga]=Fothaire Ríomhphoist Nepomuk
+@@ -44,7 +44,7 @@
+ Comment[de]=Erweiterung zur Übergabe von E-Mails an Nepomuk
+ Comment[el]=Επέκταση για την τροφοδοσία email στο Nepomuk
+ Comment[en_GB]=Extension to push emails into Nepomuk
+-Comment[es]=Extensión para introducir correos electrónicos en Nepomuk
++Comment[es]=Extensión para introducir correos en Nepomuk
+ Comment[et]=Laiendus e-kirjade edastamiseks Nepomukile
+ Comment[fr]=Extension pour fournir les courriels à Nepomuk
+ Comment[gl]=Engadido para lle pasar mensaxes de correo a Nepomuk
+Index: nepomuk_email_feeder/CMakeLists.txt
+===================================================================
+--- nepomuk_email_feeder/CMakeLists.txt (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ nepomuk_email_feeder/CMakeLists.txt (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -4,6 +4,7 @@
+ ${Boost_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/shared
+ ${SOPRANO_INCLUDE_DIR}
++ ${STRIGI_INCLUDE_DIR}
+ )
+
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
Index: console/kabcclient/doc/examples/letters/work_address.desktop
===================================================================
---- console/kabcclient/doc/examples/letters/work_address.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ console/kabcclient/doc/examples/letters/work_address.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -13,6 +13,7 @@
+--- console/kabcclient/doc/examples/letters/work_address.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ console/kabcclient/doc/examples/letters/work_address.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -11,7 +11,7 @@
+ Name[de]=Postanschrift (geschäftlich)
+ Name[el]=Διευθύνσεις αλληλογραφίας επιχείρησης/εργασίας
Name[en_GB]=Letter business/work address
- Name[es]=Dirección postal de negocios/del trabajo
+-Name[es]=Dirección postal de negocios/del trabajo
++Name[es]=Dirección postal de negocios/trabajo
Name[et]=Kirja äri/tööaadress
-+Name[fi]=Työpostiosoite
+ Name[fi]=Työpostiosoite
Name[fr]=Adresse postale professionnelle
- Name[ga]=Seoladh gnó/oibre
- Name[gl]=Enderezo postal do traballo
-Index: console/kabcclient/doc/examples/letters/home_address.desktop
-===================================================================
---- console/kabcclient/doc/examples/letters/home_address.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ console/kabcclient/doc/examples/letters/home_address.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -13,6 +13,7 @@
- Name[en_GB]=Letter home/private address
- Name[es]=Dirección postal personal/privada
- Name[et]=Kirja kodune/era-aadress
-+Name[fi]=Koti- tai yksityispostiosoite
- Name[fr]=Adresse postale personnelle
- Name[ga]=Seoladh baile/pearsanta
- Name[gl]=Enderezo postal persoal/do fogar
Index: knotes/knote_config_style.desktop
===================================================================
---- knotes/knote_config_style.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ knotes/knote_config_style.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -23,6 +23,7 @@
- Name[en_GB]=Style
- Name[es]=Estilo
- Name[et]=Stiil
-+Name[fi]=Tyyli
- Name[fr]=Style
- Name[ga]=Stíl
- Name[gl]=Estilo
-@@ -60,6 +61,7 @@
- Comment[en_GB]=Style Settings
- Comment[es]=Preferencias del estilo
- Comment[et]=Stiili seadistused
-+Comment[fi]=Tyyliasetukset
- Comment[fr]=Paramètres du style
- Comment[ga]=Socruithe Stíle
- Comment[gl]=Configuración do estilo
+--- knotes/knote_config_style.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ knotes/knote_config_style.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -69,6 +69,7 @@
+ Comment[it]=Impostazioni dello stile
+ Comment[ja]=スタイルの設定
+ Comment[km]=ការកំណត់រចនាប័ទ្ម
++Comment[lt]=Stiliaus nustatymai
+ Comment[lv]=Stila iestatījumi
+ Comment[nb]=Stilinnstillinger
+ Comment[nds]=Stil instellen
Index: knotes/knote_config_display.desktop
===================================================================
---- knotes/knote_config_display.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ knotes/knote_config_display.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -24,6 +24,7 @@
- Name[eo]=Vidigilo
- Name[es]=Pantalla
- Name[et]=Vaade
-+Name[fi]=Näkymä
- Name[fr]=Affichage
- Name[ga]=Taispeáint
- Name[gl]=Visualización
-@@ -60,6 +61,7 @@
- Comment[en_GB]=Setup display for notes
- Comment[es]=Configurar pantalla para las notas
- Comment[et]=Märkmete vaate seadistamine
-+Comment[fi]=Muistiinpanojen näkymäasetukset
- Comment[fr]=Configuration de l'affichage pour les notes
- Comment[ga]=Socraigh taispeáint na nótaí
- Comment[gl]=Configuración da visualización das notas
-Index: knotes/local.desktop
-===================================================================
---- knotes/local.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ knotes/local.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -17,7 +17,7 @@
- Name[et]=Sedelid kohalikus failis
- Name[eu]=Oharrak fitxategi lokalean
- Name[fa]=یادداشتها در پروندۀ محلی
--Name[fi]=Muistiot paikallisessa tiedostossa
-+Name[fi]=Muistiinpanot paikallisessa tiedostossa
- Name[fr]=Notes dans un fichier local
- Name[fy]=Notysjes yn lokale triem
- Name[ga]=Nótaí i gComhad Logánta
+--- knotes/knote_config_display.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ knotes/knote_config_display.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -32,6 +32,7 @@
+ Name[it]=Visualizzazione
+ Name[ja]=表示
+ Name[km]=បង្ហាញ
++Name[lt]=Rodymas
+ Name[lv]=Attēlošana
+ Name[nb]=Visning
+ Name[nds]=Dorstellen
+@@ -69,6 +70,7 @@
+ Comment[it]=Imposta la visualizzazione per le note
+ Comment[ja]=ポップアップメモの表示設定
+ Comment[km]=រៀបចំការបង្ហាញសម្រាប់ការកត់ចំណាំ
++Comment[lt]=Nustatyti lapelių rodymą
+ Comment[lv]=Piezīmju attēlošanas konfigurēšana
+ Comment[nb]=Sett opp visning av notater
+ Comment[nds]=Dorstellen för Notizen inrichten
Index: knotes/knote_config_editor.desktop
===================================================================
---- knotes/knote_config_editor.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ knotes/knote_config_editor.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -24,6 +24,7 @@
- Name[eo]=Editor
- Name[es]=Editor
- Name[et]=Redaktor
-+Name[fi]=Muokkain
- Name[fr]=Éditeur
- Name[ga]=Eagarthóir
- Name[gl]=Editor
-@@ -60,6 +61,7 @@
- Comment[en_GB]=Setup editor
- Comment[es]=Configurar editor
- Comment[et]=Redaktori seadistamine
-+Comment[fi]=Muokkaimen asetukset
- Comment[fr]=Configuration de l'éditeur
- Comment[ga]=Socraigh an t-eagarthóir
- Comment[gl]=Configurar o editor
+--- knotes/knote_config_editor.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ knotes/knote_config_editor.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -32,6 +32,7 @@
+ Name[it]=Editor
+ Name[ja]=エディタ
+ Name[km]=កម្មវិធីនិពន្ធ
++Name[lt]=Rengyklė
+ Name[lv]=Redaktors
+ Name[nb]=Redigerer
+ Name[nds]=Editor
+@@ -69,6 +70,7 @@
+ Comment[it]=Imposta l'editor
+ Comment[ja]=エディタの設定
+ Comment[km]=រៀបចំកម្មវិធីនិពន្ធ
++Comment[lt]=Nustatyti rengyklę
+ Comment[lv]=Redaktora konfigurēšana
+ Comment[nb]=Sett opp redigering
+ Comment[nds]=Editor inrichten
Index: knotes/knote_config_network.desktop
===================================================================
---- knotes/knote_config_network.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ knotes/knote_config_network.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -24,6 +24,7 @@
- Name[eo]=Reto
- Name[es]=Red
- Name[et]=Võrk
-+Name[fi]=Verkko
- Name[fr]=Réseau
- Name[ga]=Líonra
- Name[gl]=Rede
-@@ -60,6 +61,7 @@
- Comment[en_GB]=Network Settings
- Comment[es]=Preferencias de la red
- Comment[et]=Võrguseadistused
-+Comment[fi]=Verkkoasetukset
- Comment[fr]=Configurations du réseau
- Comment[ga]=Socruithe Líonra
- Comment[gl]=Configuración da rede
-Index: knotes/knotes_manager.desktop
-===================================================================
---- knotes/knotes_manager.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ knotes/knotes_manager.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -19,7 +19,7 @@
- Name[et]=Sedelid
- Name[eu]=Oharrak
- Name[fa]=یادداشتها
--Name[fi]=Muistio
-+Name[fi]=Muistiinpanot
- Name[fr]=Notes
- Name[fy]=Notysjes
- Name[ga]=Nótaí
+--- knotes/knote_config_network.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ knotes/knote_config_network.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -32,6 +32,7 @@
+ Name[it]=Rete
+ Name[ja]=ネットワーク
+ Name[km]=បណ្ដាញ
++Name[lt]=Tinklas
+ Name[lv]=Tīkls
+ Name[nb]=Nettverk
+ Name[nds]=Nettwark
+@@ -69,6 +70,7 @@
+ Comment[it]=Impostazioni di rete
+ Comment[ja]=ネットワークの設定
+ Comment[km]=ការកំណត់បណ្ដាញ
++Comment[lt]=Tinklo nustatymai
+ Comment[lv]=Tīlka iestatījumi
+ Comment[nb]=Nettverksinnstillinger
+ Comment[nds]=Nettwark instellen
Index: knotes/knote_config_action.desktop
===================================================================
---- knotes/knote_config_action.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ knotes/knote_config_action.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -23,6 +23,7 @@
- Name[en_GB]=Actions
- Name[es]=Acciones
- Name[et]=Toimingud
-+Name[fi]=Toiminnot
- Name[fr]=Actions
- Name[ga]=Gníomhartha
- Name[gl]=Accións
-@@ -60,6 +61,7 @@
- Comment[en_GB]=Setup actions for notes
- Comment[es]=Configurar acciones para las notas
- Comment[et]=Märkmete toimingute seadistamine
-+Comment[fi]=Muistiinpanotoimintojen asetukset
- Comment[fr]=Configuration des actions pour les notes
- Comment[gl]=Configurar as accións das notas
- Comment[hu]=Műveletbeállítás feljegyzésekhez
-Index: kontact/plugins/akregator/akregator.setdlg
-===================================================================
---- kontact/plugins/akregator/akregator.setdlg (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kontact/plugins/akregator/akregator.setdlg (.../branches/KDE/4.4/kdepim) (wersja 1091891)
+--- knotes/knote_config_action.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ knotes/knote_config_action.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
@@ -68,6 +68,7 @@
- Comment[en_GB]=Feed Reader
- Comment[es]=Lector de fuentes
- Comment[et]=Uudistevoogude lugemisvahend
-+Comment[fi]=Syötelukija
- Comment[fr]=Lecteur de flux
- Comment[ga]=Léitheoir Fothaí
- Comment[gl]=Lector de novas
-Index: kontact/plugins/planner/planner.setdlg
-===================================================================
---- kontact/plugins/planner/planner.setdlg (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kontact/plugins/planner/planner.setdlg (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -10,6 +10,7 @@
- Name[en_GB]=Planner
- Name[es]=Calendario
- Name[et]=Planeerija
-+Name[fi]=Planner
- Name[fr]=Agenda
- Name[ga]=Pleanálaí
- Name[gl]=Planificador
-@@ -49,6 +50,7 @@
- Comment[en_GB]=Planner Summary
- Comment[es]=Resumen de calendario
- Comment[et]=Planeerija kokkuvõte
-+Comment[fi]=Planner-yhteenveto
- Comment[fr]=Résumé de l'agenda
- Comment[ga]=Achoimre Pleanálaí
- Comment[gl]=Resumo do planificador
-Index: kontact/plugins/planner/kcmplanner.desktop
-===================================================================
---- kontact/plugins/planner/kcmplanner.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kontact/plugins/planner/kcmplanner.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -22,6 +22,7 @@
- Name[en_GB]=Planner
- Name[es]=Calendario
- Name[et]=Planeerija
-+Name[fi]=Planner
- Name[fr]=Agenda
- Name[ga]=Pleanálaí
- Name[gl]=Planificador
-@@ -61,6 +62,7 @@
- Comment[en_GB]=Planner Setup
- Comment[es]=Configuración inicial de calendario
- Comment[et]=Planeerija seadistamine
-+Comment[fi]=Plannerin asetukset
- Comment[fr]=Configuration de l'agenda
- Comment[ga]=Socrú Pleanálaí
- Comment[gl]=Configuración do planificador
-Index: kontact/plugins/planner/plannerplugin.desktop
-===================================================================
---- kontact/plugins/planner/plannerplugin.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kontact/plugins/planner/plannerplugin.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -24,6 +24,7 @@
- Name[en_GB]=Planner
- Name[es]=Calendario
- Name[et]=Planeerija
-+Name[fi]=Planner
- Name[fr]=Agenda
- Name[ga]=Pleanálaí
- Name[gl]=Planificador
-@@ -63,6 +64,7 @@
- Comment[en_GB]=Planner Plugin
- Comment[es]=Complemento de calendario
- Comment[et]=Planeerija plugin
-+Comment[fi]=Planner-liitännäinen
- Comment[fr]=Module d'agenda
- Comment[ga]=Breiseán Pleanálaí
- Comment[gl]=Engadido do planificador
-Index: kontact/plugins/knotes/knotes.setdlg
-===================================================================
---- kontact/plugins/knotes/knotes.setdlg (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kontact/plugins/knotes/knotes.setdlg (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -10,6 +10,7 @@
- Name[en_GB]=Popup Notes
- Name[es]=Notas emergentes
- Name[et]=Sedelid
-+Name[fi]=Ponnahdusviestit
- Name[fr]=Notes
- Name[ga]=Preabnótaí
- Name[gl]=Notas emerxentes
-@@ -49,6 +50,7 @@
- Comment[en_GB]=Popup Notes Component
- Comment[es]=Componente de las notas emergentes
- Comment[et]=Sedelite komponent
-+Comment[fi]=Ponnahdusviestiosa
- Comment[fr]=Composant de petites de notes
- Comment[ga]=Comhpháirt Preabnótaí
- Comment[gl]=Compoñente de notas emerxentes
-Index: kontact/plugins/knotes/knotesplugin.desktop
-===================================================================
---- kontact/plugins/knotes/knotesplugin.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kontact/plugins/knotes/knotesplugin.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -84,6 +84,7 @@
- Name[en_GB]=Popup Notes
- Name[es]=Notas emergentes
- Name[et]=Sedelid
-+Name[fi]=Ponnahdusviestit
- Name[fr]=Notes
- Name[ga]=Preabnótaí
- Name[gl]=Notas emerxentes
-Index: kontact/plugins/ktimetracker/ktimetracker.setdlg
-===================================================================
---- kontact/plugins/ktimetracker/ktimetracker.setdlg (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kontact/plugins/ktimetracker/ktimetracker.setdlg (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -10,6 +10,7 @@
- Name[en_GB]=Time Tracker
- Name[es]=Gestor de tiempo
- Name[et]=Ajaarvesti
-+Name[fi]=Time Tracker
- Name[fr]=Suivi du temps
- Name[ga]=TimeTracker
- Name[gl]=Xestor temporal
-@@ -48,6 +49,7 @@
- Comment[en_GB]=Time Tracker Component
- Comment[es]=Componente de gestión de tiempo
- Comment[et]=Ajaarvesti komponent
-+Comment[fi]=Time Tracker -osa
- Comment[fr]=Composant de suivi du temps
- Comment[ga]=Comhpháirt TimeTracker
- Comment[gl]=Compoñente de xestor temporal
-Index: kontact/plugins/ktimetracker/ktimetracker_plugin.desktop
-===================================================================
---- kontact/plugins/ktimetracker/ktimetracker_plugin.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kontact/plugins/ktimetracker/ktimetracker_plugin.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -25,6 +25,7 @@
- Comment[en_GB]=TimeTracker Plugin
- Comment[es]=Complemento de gestión del tiempo
- Comment[et]=Ajaarvesti plugin
-+Comment[fi]=TimeTracker-liitännäinen
- Comment[fr]=Module de suivi du temps
- Comment[ga]=Breiseán TimeTracker
- Comment[gl]=Engadido TimeTracker
-@@ -63,6 +64,7 @@
- Name[en_GB]=Time Tracker
- Name[es]=Gestor de tiempo
- Name[et]=Ajaarvesti
-+Name[fi]=Time Tracker
- Name[fr]=Suivi du temps
- Name[ga]=TimeTracker
- Name[gl]=Xestor temporal
-Index: kontact/plugins/kjots/kjots_plugin.desktop
-===================================================================
---- kontact/plugins/kjots/kjots_plugin.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kontact/plugins/kjots/kjots_plugin.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -27,6 +27,7 @@
- Comment[en_GB]=Kontact KJots Plugin
- Comment[es]=Complemento de KJots para Kontact
- Comment[et]=Kontacti KJotsi plugin
-+Comment[fi]=Kontactin KJots-liitännäinen
- Comment[fr]=Module KJots pour Kontact
- Comment[ga]=Breiseán KJots le haghaidh Kontact
- Comment[gl]=Engadido de KJots para Kontact
-@@ -64,6 +65,7 @@
- Name[en_GB]=Notebooks
- Name[es]=Cuadernos de notas
- Name[et]=Märkmed
-+Name[fi]=Muistiot
- Name[fr]=Carnets de notes
- Name[ga]=Leabhair Nótaí
- Name[gl]=Cadernos
-Index: kontact/plugins/kjots/kjots.setdlg
-===================================================================
---- kontact/plugins/kjots/kjots.setdlg (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kontact/plugins/kjots/kjots.setdlg (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -10,6 +10,7 @@
- Name[en_GB]=Notebooks
- Name[es]=Cuadernos de notas
- Name[et]=Märkmed
-+Name[fi]=Muistiot
- Name[fr]=Carnets de notes
- Name[ga]=Leabhair Nótaí
- Name[gl]=Cadernos
-@@ -48,6 +49,7 @@
- Comment[en_GB]=Notebooks Component
- Comment[es]=Componente de los cuadernos de notas
- Comment[et]=Märkmete komponent
-+Comment[fi]=Muistio-osa
- Comment[fr]=Composant de carnet de notes
- Comment[ga]=Comhpháirt Leabhair Nótaí
- Comment[gl]=Compoñente de Notebooks
+ Comment[it]=Imposta le azioni per le note
+ Comment[ja]=ポップアップメモのアクション設定
+ Comment[km]=រៀបចំសកម្មភាពសម្រាប់ការកត់ចំណាំ
++Comment[lt]=Nustatyti veiksmus pastaboms
+ Comment[lv]=Piezīmju darbību konfigurēšana
+ Comment[nb]=Sett opp handlinger for notater
+ Comment[nds]=Akschonen för Notizen inrichten
+Index: kontact/plugins/summary/summaryplugin.desktop
+===================================================================
+--- kontact/plugins/summary/summaryplugin.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kontact/plugins/summary/summaryplugin.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -23,7 +23,7 @@
+ Comment[de]=Übersichts-Modul für Kontact
+ Comment[el]=Πρόσθετο προβολής σύνοψης του Kontact
+ Comment[en_GB]=Kontact SummaryView Plugin
+-Comment[es]=Complemento de Vista resumen para Kontact
++Comment[es]=Complemento de vista de resumen para Kontact
+ Comment[et]=Kontakti kokkuvõttevaate plugin
+ Comment[eu]=Kontact-en SummaryView plugin-a
+ Comment[fa]=وصلۀ نمای خلاصۀ Kontact
Index: kontact/src/kontactconfig.desktop
===================================================================
---- kontact/src/kontactconfig.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kontact/src/kontactconfig.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -79,7 +79,9 @@
- Comment[en_GB]=Default KDE Kontact Component
- Comment[es]=Componente predeterminado de KDE Kontact
- Comment[et]=KDE Kontacti vaikekomponent
-+Comment[fi]=KDE:n oletusarvoinen Kontact-osa
- Comment[fr]=Composant Kontact KDE par défaut
-+Comment[gl]=Compoñente por omisión de Kontact de KDE
+--- kontact/src/kontactconfig.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ kontact/src/kontactconfig.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -84,6 +84,7 @@
+ Comment[gl]=Compoñente por omisión de Kontact de KDE
Comment[it]=Componente predefinito di KDE Kontact
Comment[km]=សមាសធាតុ Kontact របស់ KDE លំនាំដើម
++Comment[lt]=Numatytasis KDE Kontact komponentas
Comment[lv]=Noklusētā KDE kontaktu komponente
-Index: kontact/src/main.cpp
+ Comment[nb]=Standard KDE Kontact-komponent
+ Comment[nds]=Standard-Kontaktkomponent för KDE
+Index: korganizer/printing/calprinter.cpp
===================================================================
---- kontact/src/main.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ kontact/src/main.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -138,7 +138,6 @@
- mMainWindow->setInitialActivePluginModule( moduleName );
- }
- mMainWindow->show();
-- Akonadi::Control::start( mMainWindow );
- KontactInterface::UniqueAppHandler::setMainWidget( mMainWindow );
- // --iconify is needed in kontact, although kstart can do that too,
- // because kstart returns immediately so it's too early to talk D-Bus to the app.
-@@ -200,6 +199,10 @@
-
- KontactApp app;
-
-+ // KDE 4.4: do akonadi startup before creating any window, since creating
-+ // the window loads kmail. In 4.5 we'll do this startup async instead.
-+ Akonadi::Control::start( 0 );
-+
- // Qt doesn't treat the system tray as a window, and therefore Qt would quit
- // the event loop when an error message is clicked away while Kontact is in the
- // tray.
-Index: akonadi/kcal/Messages.sh
-===================================================================
-Index: korganizer/koeventviewerdialog.cpp
-===================================================================
---- korganizer/koeventviewerdialog.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/koeventviewerdialog.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -33,7 +33,7 @@
- setCaption( i18n( "Event Viewer" ) );
- setButtons( Close | User1 | User2 );
- setModal( false );
-- setButtonGuiItem( User1, KGuiItem( i18n( "Edit..." ) ) );
-+ setButtonGuiItem( User1, KGuiItem( i18n( "Edit..." ), KIcon( "document-edit" ) ) );
- setButtonGuiItem( User2, KGuiItem( i18n( "Show in Context" ) ) );
- mEventViewer = new KOEventViewer( calendar, this );
- setMainWidget( mEventViewer );
-Index: korganizer/actionmanager.h
-===================================================================
---- korganizer/actionmanager.h (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/actionmanager.h (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -404,6 +404,13 @@
- KAction *mPublishEvent;
- KAction *mForwardEvent;
-
-+ KAction *mSendInvitation;
-+ KAction *mSendCancel;
-+ KAction *mSendStatusUpdate;
-+
-+ KAction *mRequestChange;
-+ KAction *mRequestUpdate;
-+
- KAction *mUndoAction;
- KAction *mRedoAction;
- KMenuBar *mMenuBar;
-Index: korganizer/publishdialog.cpp
-===================================================================
---- korganizer/publishdialog.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/publishdialog.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -92,7 +92,7 @@
- Person person( attendee->name(), attendee->email() );
- item->setText( person.fullName() );
- mUI.mListWidget->addItem( item );
-- mUI.mRemove->setEnabled( true );
-+ mUI.mRemove->setEnabled( !mUI.mListWidget->selectedItems().isEmpty() );
- }
+--- korganizer/printing/calprinter.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/printing/calprinter.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -43,8 +43,8 @@
- QString PublishDialog::addresses()
-@@ -128,12 +128,13 @@
+ #ifndef KORG_NOPRINTER
- void PublishDialog::removeItem()
+-CalPrinter::CalPrinter( QWidget *parent, Calendar *calendar, KOrg::CoreHelper *helper )
+- : QObject( parent )
++CalPrinter::CalPrinter( QWidget *parent, Calendar *calendar, KOrg::CoreHelper *helper, bool uniqItem )
++ : QObject( parent ), mUniqItem( uniqItem )
{
-+ if ( mUI.mListWidget->selectedItems().isEmpty() ) {
-+ return;
-+ }
- QListWidgetItem *item;
- item = mUI.mListWidget->selectedItems().first();
-- if ( !item ) {
-- return;
-- }
+ mParent = parent;
+ mConfig = new KConfig( "korganizer_printing.rc", KConfig::SimpleConfig );
+@@ -98,7 +98,7 @@
+ for ( it = mPrintPlugins.begin(); it != mPrintPlugins.end(); ++it ) {
+ (*it)->setSelectedIncidences( selectedIncidences );
+ }
+- QPointer<CalPrintDialog> printDialog = new CalPrintDialog( mPrintPlugins, mParent );
++ QPointer<CalPrintDialog> printDialog = new CalPrintDialog( mPrintPlugins, mParent, mUniqItem );
+ KConfigGroup grp( mConfig, "" ); //orientation setting isn't in a group
+ printDialog->setOrientation( CalPrinter::ePrintOrientation( grp.readEntry( "Orientation", 1 ) ) );
+ printDialog->setPreview( preview );
+@@ -165,7 +165,7 @@
+ {
+ }
-+
- int row = mUI.mListWidget->row( item );
- mUI.mListWidget->takeItem( row );
+-CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins, QWidget *parent )
++CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins, QWidget *parent, bool uniqItem )
+ : KDialog( parent )
+ {
+ setCaption( i18n( "Print" ) );
+@@ -228,6 +228,8 @@
+ typeLayout->addWidget( radioButton );
+ id++;
+ }
++ if ( uniqItem )
++ typeBox->hide();
+ typeLayout->insertStretch( -1, 100 );
+ connect( this, SIGNAL(okClicked()), SLOT(slotOk()) );
+ setMinimumSize( minimumSizeHint() );
+Index: korganizer/printing/calprinter.h
+===================================================================
+--- korganizer/printing/calprinter.h (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/printing/calprinter.h (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -63,7 +63,7 @@
+ \param cal calendar to be printed
+ \param helper is a pointer to the KOrg::CoreHelper object
+ */
+- CalPrinter( QWidget *par, Calendar *cal, KOrg::CoreHelper *helper );
++ CalPrinter( QWidget *par, Calendar *cal, KOrg::CoreHelper *helper, bool uniqItem = false );
+ virtual ~CalPrinter();
+
+ void init( Calendar *calendar );
+@@ -98,13 +98,14 @@
+ QWidget *mParent;
+ KConfig *mConfig;
+ KOrg::CoreHelper *mCoreHelper;
++ bool mUniqItem;
+ };
-Index: korganizer/kodaymatrix.h
+ class CalPrintDialog : public KDialog
+ {
+ Q_OBJECT
+ public:
+- explicit CalPrintDialog( KOrg::PrintPlugin::List plugins, QWidget *parent = 0 );
++ explicit CalPrintDialog( KOrg::PrintPlugin::List plugins, QWidget *parent = 0, bool mUniqItem = false );
+ virtual ~CalPrintDialog();
+ KOrg::PrintPlugin *selectedPlugin();
+ void setOrientation( CalPrinter::ePrintOrientation orientation );
+Index: korganizer/koeditorgeneraltodo.cpp
+===================================================================
+--- korganizer/koeditorgeneraltodo.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/koeditorgeneraltodo.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -277,11 +277,14 @@
+
+ KOEditorGeneral::readIncidence( todo );
+
++ KDateTime dueDT = todo->dtDue();
++
+ if ( todo->hasDueDate() ) {
+- enableAlarm( true );
+- KDateTime dueDT = todo->dtDue();
++ enableAlarm( true );
+ if ( todo->recurs() && date.isValid() ) {
+- dueDT.addDays( todo->dtDue().date().daysTo( date ) );
++ KDateTime dt( date, QTime( 0, 0, 0 ) );
++ dt = dt.addSecs( -1 );
++ dueDT.setDate( todo->recurrence()->getNextDateTime( dt ).date() );
+ }
+ if ( dueDT.isUtc() ) {
+ dueDT = dueDT.toLocalZone();
+@@ -303,8 +306,9 @@
+
+ if ( todo->hasStartDate() ) {
+ KDateTime startDT = todo->dtStart();
+- if ( todo->recurs() && date.isValid() ) {
+- startDT.setDate( date );
++ if ( todo->recurs() && date.isValid() && todo->hasDueDate() ) {
++ int days = todo->dtStart( true ).daysTo( todo->dtDue( true ) );
++ startDT.setDate( dueDT.date().addDays( -days ) );
+ }
+ if ( startDT.isUtc() ) {
+ startDT = startDT.toLocalZone();
+Index: korganizer/koeventview.h
===================================================================
---- korganizer/kodaymatrix.h (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/kodaymatrix.h (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -178,7 +178,7 @@
- void setHighlightMode( bool highlightEvents,
- bool highlightTodos,
- bool highlightJournals );
--
-+ void setUpdateNeeded();
+--- korganizer/koeventview.h (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/koeventview.h (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -113,6 +113,8 @@
+ */
+ static bool usesCompletedTodoPixmap( Todo *todo, const QDate &date );
+
++ bool supportsDateNavigation() const { return true; }
++
public slots:
- /**
- * Recalculates all the flags of the days in the matrix like holidays or
+
+ /*
Index: korganizer/dbuscalendar.desktop
===================================================================
---- korganizer/dbuscalendar.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/dbuscalendar.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -11,6 +11,7 @@
- Name[en_GB]=DBUSCalendar
- Name[es]=Calendario DBUS
- Name[et]=DBUSCalendar
-+Name[fi]=DBUSCalendar
- Name[fr]=DBUSCalendar
- Name[ga]=Féilire DBUS
- Name[gl]=Calendario DBUS
-@@ -51,6 +52,7 @@
- Comment[en_GB]=Organiser with a D-Bus interface
- Comment[es]=Organizador con una interfaz D-Bus
- Comment[et]=Korraldaja D-Busi liidesega
-+Comment[fi]=D-Bus-rajapintainen ajanhallinta
- Comment[fr]=Agenda avec une interface D-Bus
- Comment[ga]=Eagraí a bhfuil comhéadan D-Bus aige
- Comment[gl]=Organizador con interface D-Bus
-Index: korganizer/actionmanager.cpp
-===================================================================
---- korganizer/actionmanager.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/actionmanager.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -568,40 +568,40 @@
- connect( mPublishEvent, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_publish()) );
- mPublishEvent->setEnabled( false );
-
-- action = new KAction( KIcon( "mail-send" ), i18n( "Send &Invitation to Attendees" ), this );
-- mACollection->addAction( "schedule_request", action );
-- connect( action, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_request()) );
-- action->setEnabled( false );
-+ mSendInvitation = new KAction( KIcon( "mail-send" ), i18n( "Send &Invitation to Attendees" ), this );
-+ mACollection->addAction( "schedule_request", mSendInvitation );
-+ connect( mSendInvitation, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_request()) );
-+ mSendInvitation->setEnabled( false );
- connect( mCalendarView, SIGNAL(organizerEventsSelected(bool)),
-- action, SLOT(setEnabled(bool)) );
-+ mSendInvitation, SLOT(setEnabled(bool)) );
-
-- action = new KAction( i18n( "Re&quest Update" ), this );
-- mACollection->addAction( "schedule_refresh", action );
-- connect( action, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_refresh()) );
-- action->setEnabled( false );
-+ mRequestUpdate = new KAction( i18n( "Re&quest Update" ), this );
-+ mACollection->addAction( "schedule_refresh", mRequestUpdate );
-+ connect( mRequestUpdate, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_refresh()) );
-+ mRequestUpdate->setEnabled( false );
- connect( mCalendarView, SIGNAL(groupEventsSelected(bool)),
-- action, SLOT(setEnabled(bool)) );
-+ mRequestUpdate, SLOT(setEnabled(bool)) );
-
-- action = new KAction( i18n( "Send &Cancellation to Attendees" ), this );
-- mACollection->addAction( "schedule_cancel", action );
-- connect( action, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_cancel()) );
-- action->setEnabled( false );
-+ mSendCancel = new KAction( i18n( "Send &Cancellation to Attendees" ), this );
-+ mACollection->addAction( "schedule_cancel", mSendCancel );
-+ connect( mSendCancel, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_cancel()) );
-+ mSendCancel->setEnabled( false );
- connect( mCalendarView, SIGNAL(organizerEventsSelected(bool)),
-- action, SLOT(setEnabled(bool)) );
-+ mSendCancel, SLOT(setEnabled(bool)) );
-
-- action = new KAction( KIcon( "mail-reply-sender" ), i18n( "Send Status &Update" ), this );
-- mACollection->addAction( "schedule_reply", action );
-- connect( action, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_reply()) );
-- action->setEnabled( false );
-+ mSendStatusUpdate = new KAction( KIcon( "mail-reply-sender" ), i18n( "Send Status &Update" ), this );
-+ mACollection->addAction( "schedule_reply", mSendStatusUpdate );
-+ connect( mSendStatusUpdate, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_reply()) );
-+ mSendStatusUpdate->setEnabled( false );
- connect( mCalendarView, SIGNAL(groupEventsSelected(bool)),
-- action, SLOT(setEnabled(bool)) );
-+ mSendStatusUpdate, SLOT(setEnabled(bool)) );
-
-- action = new KAction( i18nc( "counter proposal", "Request Chan&ge" ), this );
-- mACollection->addAction( "schedule_counter", action );
-- connect( action, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_counter()) );
-- action->setEnabled( false );
-+ mRequestChange = new KAction( i18nc( "counter proposal", "Request Chan&ge" ), this );
-+ mACollection->addAction( "schedule_counter", mRequestChange );
-+ connect( mRequestChange, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_counter()) );
-+ mRequestChange->setEnabled( false );
- connect( mCalendarView, SIGNAL(groupEventsSelected(bool)),
-- action, SLOT(setEnabled(bool)) );
-+ mRequestChange, SLOT(setEnabled(bool)) );
-
- action = new KAction( i18n( "&Mail Free Busy Information..." ), this );
- mACollection->addAction( "mail_freebusy", action );
-@@ -1698,6 +1698,11 @@
- mDeleteAction->setEnabled( enabled );
- mPublishEvent->setEnabled( enabled );
- mForwardEvent->setEnabled( enabled );
-+ mSendInvitation->setEnabled( enabled );
-+ mSendCancel->setEnabled( enabled );
-+ mSendStatusUpdate->setEnabled( enabled );
-+ mRequestChange->setEnabled( enabled );
-+ mRequestUpdate->setEnabled( enabled );
- }
-
- void ActionManager::keyBindings()
+--- korganizer/dbuscalendar.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/dbuscalendar.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -60,6 +60,7 @@
+ Comment[it]=Agenda con un'interfaccia D-Bus
+ Comment[ja]=D-Bus インターフェースを持つカレンダー
+ Comment[km]=កម្មវិធីរៀបចំជាមួយចំណុចប្រទាក់ D-Bus
++Comment[lt]=Tvarkyklė su D-Bus sąsaja
+ Comment[lv]=Organizators ar D-BUS saskarni
+ Comment[nb]=Organizer med D-Bus-grensesnitt
+ Comment[nds]=En Daagpleger mit en D-Bus-Koppelsteed
Index: korganizer/calendarview.h
===================================================================
---- korganizer/calendarview.h (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/calendarview.h (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -651,6 +651,9 @@
- // uncompleted subitems), notAllPurged is set to true.
- bool purgeCompletedSubTodos( Todo *todo, bool ¬AllPurged );
+--- korganizer/calendarview.h (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/calendarview.h (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -607,7 +607,18 @@
+ void adaptNavigationUnits();
-+ // Frees filters
-+ void deleteFilters();
+ /**
++ Returns the date of the selected incidence.
+
- KOrg::History *mHistory;
++ If the selected incidence is recurring, it will return
++ the date of the selected occurrence
++ **/
++ QDate activeIncidenceDate();
++
++ /**
+ Returns the best guess at the current active date in the view.
++ This has nothing to do with selected incidences, use activeIncidenceDate()
++ for that, for example, agenda supports time selection and incidence selection
++ and they can have diferent dates.
+
+ @param fallbackToToday If guessing doesn't work, some views will prefer
+ today to be returned instead of the first select date in the day matrix,
+Index: korganizer/koeditorgeneralevent.cpp
+===================================================================
+--- korganizer/koeditorgeneralevent.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/koeditorgeneralevent.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -434,15 +434,11 @@
+ if ( event->recurs() && date.isValid() ) {
+ // Consider the active date when editing recurring Events.
+ KDateTime kdt( date, QTime( 0, 0, 0 ), KSystemTimeZones::local() );
+- int diffDays = startDT.daysTo( kdt );
++ const int eventLength = startDT.daysTo( endDT );
+ kdt = kdt.addSecs( -1 );
+ startDT.setDate( event->recurrence()->getNextDateTime( kdt ).date() );
+ if ( event->hasEndDate() ) {
+- endDT = endDT.addDays( diffDays );
+- if ( startDT > endDT ) {
+- startDT.setDate( event->recurrence()->getPreviousDateTime( kdt ).date() );
+- endDT = startDT.addDays( event->dtStart().daysTo( event->dtEnd() ) );
+- }
++ endDT.setDate( startDT.addDays( eventLength ).date() );
+ } else {
+ if ( event->hasDuration() ) {
+ endDT = startDT.addSecs( event->duration().asSeconds() );
+Index: korganizer/interfaces/korganizer/baseview.h
+===================================================================
+--- korganizer/interfaces/korganizer/baseview.h (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/interfaces/korganizer/baseview.h (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -87,7 +87,7 @@
+ probably only select a single event at a time, but some may be able
+ to select more than one.
+ */
+- virtual DateList selectedDates() = 0;
++ virtual DateList selectedIncidenceDates() = 0;
- CalPrinter *mCalPrinter;
-Index: korganizer/datenavigatorcontainer.h
-===================================================================
---- korganizer/datenavigatorcontainer.h (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/datenavigatorcontainer.h (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -51,7 +51,7 @@
- void setHighlightMode( bool highlightEvents,
- bool highlightTodos,
- bool highlightJournals ) const;
--
-+ void setUpdateNeeded();
- public slots:
- void selectDates( const KCal::DateList & );
- void selectNextMonth();
-Index: korganizer/interfaces/calendar/calendarplugin.desktop
-===================================================================
---- korganizer/interfaces/calendar/calendarplugin.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/interfaces/calendar/calendarplugin.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -10,6 +10,7 @@
- Name[en_GB]=Calendar Plugin Interface
- Name[es]=Complemento de interfaz del calendario
- Name[et]=Kalendriplugina liides
-+Name[fi]=Kalenteriliitännäisen käyttöliittymä
- Name[fr]=Interface de module d'agenda
- Name[ga]=Comhéadan Breiseáin Féilire
- Name[gl]=Interface do engadido do Calendario
-Index: korganizer/interfaces/calendar/calendardecoration.desktop
-===================================================================
---- korganizer/interfaces/calendar/calendardecoration.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/interfaces/calendar/calendardecoration.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -10,6 +10,7 @@
- Name[en_GB]=Calendar Decoration Interface
- Name[es]=Interfaz de decoración del calendario
- Name[et]=Kalendri dekoratsiooni liides
-+Name[fi]=Kalenteritekstin koristeluliitännäinen
- Name[fr]=Interface de décoration d'agenda
- Name[ga]=Comhéadan Maisíochta Féilire
- Name[gl]=Interface de decoración de calendarios
-Index: korganizer/datenavigatorcontainer.cpp
-===================================================================
---- korganizer/datenavigatorcontainer.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/datenavigatorcontainer.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -127,12 +127,22 @@
- }
+ /**
+ Returns the start of the selection, or an invalid QDateTime if there is no selection
+@@ -138,6 +138,11 @@
+ */
+ virtual bool usesFullWindow();
+
++ /** Returns true if the view supports navigation through the date navigator
++ ( selecting a date range, changing month, changing year, etc. )
++ */
++ virtual bool supportsDateNavigation() const { return false; }
++
+ public Q_SLOTS:
+ /**
+ Show incidences for the given date range. The date range actually shown
+Index: korganizer/plugins/picoftheday/picoftheday.cpp
+===================================================================
+--- korganizer/plugins/picoftheday/picoftheday.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/plugins/picoftheday/picoftheday.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -149,6 +149,7 @@
+ KIO::StoredTransferJob *const transferJob = static_cast<KIO::StoredTransferJob*>( job );
+ mFileName = QString::fromUtf8( transferJob->data().data(), transferJob->data().size() );
+ mFileName = mFileName.left( mFileName.indexOf( "<noinclude>" ) );
++ mFileName = mFileName.section( '|', 1, 1 );
+ kDebug() << "POTD:" << mDate << ": got POTD file name:" << mFileName;
+
+ if ( !mFileName.isEmpty() ) {
+Index: korganizer/views/monthview/monthview.cpp
+===================================================================
+--- korganizer/views/monthview/monthview.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/monthview/monthview.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -125,10 +125,9 @@
+ return 6 * 7;
}
-+void DateNavigatorContainer::setUpdateNeeded()
-+{
-+ mNavigatorView->setUpdateNeeded();
-+ foreach ( KDateNavigator *n, mExtraViews ) {
-+ if ( n ) {
-+ n->setUpdateNeeded();
-+ }
-+ }
-+}
-+
- void DateNavigatorContainer::updateView()
+-DateList MonthView::selectedDates()
++DateList MonthView::selectedIncidenceDates()
{
- mNavigatorView->updateView();
- foreach ( KDateNavigator *n, mExtraViews ) {
- if ( n ) {
-- n->updateView();
-+ n->setUpdateNeeded();
+ DateList list;
+-
+ if ( mScene->selectedItem() ) {
+ IncidenceMonthItem *tmp = qobject_cast<IncidenceMonthItem *>( mScene->selectedItem() );
+ if ( tmp ) {
+@@ -137,6 +136,8 @@
+ list << selectedItemDate;
+ }
}
++ } else if( mScene->selectedCell()) {
++ list << mScene->selectedCell()->date();
}
- }
-Index: korganizer/kodaymatrix.cpp
+
+ return list;
+Index: korganizer/views/monthview/monthscene.cpp
===================================================================
---- korganizer/kodaymatrix.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/kodaymatrix.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -209,12 +209,16 @@
- updateView( mStartDate );
+--- korganizer/views/monthview/monthscene.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/monthview/monthscene.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -676,10 +676,10 @@
+ mSelectedItem = item;
+ Q_ASSERT( tmp->incidence() );
+
+- if ( mMonthView && mMonthView->selectedDates().isEmpty() ) {
++ if ( mMonthView && mMonthView->selectedIncidenceDates().isEmpty() ) {
+ emit incidenceSelected( tmp->incidence(), QDate() );
+ } else {
+- emit incidenceSelected( tmp->incidence(), mMonthView->selectedDates().first() );
++ emit incidenceSelected( tmp->incidence(), mMonthView->selectedIncidenceDates().first() );
+ }
}
-+void KODayMatrix::setUpdateNeeded()
-+{
-+ mPendingChanges = true;
-+}
-+
- void KODayMatrix::updateView( const QDate &actdate )
+Index: korganizer/views/monthview/monthitem.cpp
+===================================================================
+--- korganizer/views/monthview/monthitem.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/monthview/monthitem.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -558,8 +558,8 @@
+ QString IncidenceMonthItem::toolTipText() const
{
- if ( !actdate.isValid() ) {
- return;
+ QDate date;
+- if ( monthScene()->mMonthView && !monthScene()->mMonthView->selectedDates().isEmpty() ) {
+- date = monthScene()->mMonthView->selectedDates().first();
++ if ( monthScene()->mMonthView && !monthScene()->mMonthView->selectedIncidenceDates().isEmpty() ) {
++ date = monthScene()->mMonthView->selectedIncidenceDates().first();
}
--
- //flag to indicate if the starting day of the matrix has changed by this call
- bool daychanged = false;
+ return IncidenceFormatter::toolTipStr(
+ monthScene()->calendar(), mIncidence, date, true, KOPrefs::instance()->timeSpec() );
+Index: korganizer/views/monthview/monthview.h
+===================================================================
+--- korganizer/views/monthview/monthview.h (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/monthview/monthview.h (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -51,7 +51,7 @@
+ Incidence::List selectedIncidences();
+
+ /** Returns dates of the currently selected events */
+- virtual DateList selectedDates();
++ virtual DateList selectedIncidenceDates();
+
+ virtual QDateTime selectionStart();
Index: korganizer/views/todoview/kotodoview.h
===================================================================
---- korganizer/views/todoview/kotodoview.h (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/views/todoview/kotodoview.h (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -28,6 +28,7 @@
- #define KOTODOVIEW_H
+--- korganizer/views/todoview/kotodoview.h (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/todoview/kotodoview.h (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -62,7 +62,7 @@
+ virtual void setCalendar( Calendar *cal );
- #include "korganizer/baseview.h"
-+#include "kotodoviewsortfilterproxymodel.h"
+ virtual Incidence::List selectedIncidences();
+- virtual DateList selectedDates();
++ virtual DateList selectedIncidenceDates();
+ virtual int currentDateCount() { return 0; }
- namespace KCal {
- class Incidence;
-@@ -125,7 +126,7 @@
+ void setDocumentId( const QString & ) {}
+@@ -120,10 +120,11 @@
+ void purgeCompletedSignal();
+ void unSubTodoSignal();
+ void unAllSubTodoSignal();
++ void configChanged();
+ private:
+ QMenu *createCategoryPopupMenu();
+-
++ void printTodo( bool preview );
KOTodoViewView *mView;
KOTodoModel *mModel;
-- QSortFilterProxyModel *mProxyModel;
-+ KOTodoViewSortFilterProxyModel *mProxyModel;
- KOTodoCategoriesDelegate *mCategoriesDelegate;
-
- KOTodoViewQuickSearch *mQuickSearch;
-Index: korganizer/views/todoview/kotodomodel.cpp
+ KOTodoViewSortFilterProxyModel *mProxyModel;
+Index: korganizer/views/todoview/kotodoview.cpp
===================================================================
---- korganizer/views/todoview/kotodomodel.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/views/todoview/kotodomodel.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -173,7 +173,7 @@
- };
+--- korganizer/views/todoview/kotodoview.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/todoview/kotodoview.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -276,7 +276,7 @@
+ return ret;
+ }
- KOTodoModel::KOTodoModel( Calendar *cal, QObject *parent )
-- : QAbstractItemModel( parent ), mColumnCount( DescriptionColumn + 1 )
-+ : QAbstractItemModel( parent ), mColumnCount( DescriptionColumn + 1 ), mChanger( 0 )
+-DateList KOTodoView::selectedDates()
++DateList KOTodoView::selectedIncidenceDates()
{
- mRootNode = new TodoTreeNode( 0, 0, this );
- mFlatView = false;
-@@ -305,7 +305,8 @@
+ // The todo view only lists todo's. It's probably not a good idea to
+ // return something about the selected todo here, because it has got
+@@ -486,10 +486,10 @@
+
+ Todo *todo = static_cast<Todo *>( selection[0].data( KOTodoModel::TodoRole ).value<void *>() );
+
+- if ( selectedDates().isEmpty() ) {
++ if ( selectedIncidenceDates().isEmpty() ) {
+ emit incidenceSelected( todo, QDate() );
+ } else {
+- emit incidenceSelected( todo, selectedDates().first() );
++ emit incidenceSelected( todo, selectedIncidenceDates().first() );
+ }
}
- QModelIndex KOTodoModel::addTodo( const QString &summary,
-- const QModelIndex &parent )
-+ const QModelIndex &parent,
-+ const QStringList &categories )
- {
- if ( !mChanger ) {
- return QModelIndex();
-@@ -316,6 +317,9 @@
- todo->setSummary( summary.trimmed() );
- todo->setOrganizer( Person( KOPrefs::instance()->fullName(),
- KOPrefs::instance()->email() ) );
-+
-+ todo->setCategories( categories );
-+
- if ( parent.isValid() ) {
- TodoTreeNode *node = static_cast<TodoTreeNode *>( parent.internalPointer() );
- if ( node->isValid() ) {
-Index: korganizer/views/todoview/kotodoviewsortfilterproxymodel.h
-===================================================================
---- korganizer/views/todoview/kotodoviewsortfilterproxymodel.h (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/views/todoview/kotodoviewsortfilterproxymodel.h (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -39,6 +39,7 @@
- KOTodoViewSortFilterProxyModel( QObject *parent = 0 );
-
- void sort( int column, Qt::SortOrder order = Qt::AscendingOrder );
-+ const QStringList& categories() const { return mCategories; }
-
- protected:
- bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const;
-Index: korganizer/views/todoview/kotodomodel.h
-===================================================================
---- korganizer/views/todoview/kotodomodel.h (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/views/todoview/kotodomodel.h (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -26,6 +26,7 @@
- #define KOTODOMODEL_H
-
- #include <QAbstractItemModel>
-+#include <QStringList>
- #include <QString>
- #include <QHash>
-
-@@ -84,7 +85,8 @@
-
- /** Creates a new todo with the given text as summary under the given parent */
- QModelIndex addTodo( const QString &summary,
-- const QModelIndex &parent = QModelIndex() );
-+ const QModelIndex &parent = QModelIndex(),
-+ const QStringList &categories = QStringList() );
- /** Copy the todo with the given index to the given date */
- void copyTodo( const QModelIndex &index, const QDate &date );
+@@ -517,7 +517,7 @@
+ emit editIncidenceSignal( todo );
+ }
-Index: korganizer/views/todoview/kotodoview.cpp
-===================================================================
---- korganizer/views/todoview/kotodoview.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/views/todoview/kotodoview.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -36,7 +36,6 @@
- #include "kotodomodel.h"
- #include "kotodoviewquickaddline.h"
- #include "kotodoviewquicksearch.h"
--#include "kotodoviewsortfilterproxymodel.h"
- #include "kotodoviewview.h"
-
- #include <libkdepim/kdatepickerpopup.h>
-@@ -414,7 +413,7 @@
- void KOTodoView::addQuickTodo( Qt::KeyboardModifiers modifiers )
+-void KOTodoView::printTodo()
++void KOTodoView::printTodo( bool preview )
{
- if ( modifiers == Qt::NoModifier ) {
-- QModelIndex index = mModel->addTodo( mQuickAdd->text() );
-+ QModelIndex index = mModel->addTodo( mQuickAdd->text(), QModelIndex(), mProxyModel->categories() );
-
- QModelIndexList selection = mView->selectionModel()->selectedRows();
- if ( selection.size() <= 1 ) {
-@@ -429,7 +428,7 @@
- if ( selection.size() != 1 ) {
- return;
- }
-- mModel->addTodo( mQuickAdd->text(), mProxyModel->mapToSource( selection[0] ) );
-+ mModel->addTodo( mQuickAdd->text(), mProxyModel->mapToSource( selection[0] ), mProxyModel->categories() );
- } else {
- return;
+ #ifndef KORG_NOPRINTER
+ QModelIndexList selection = mView->selectionModel()->selectedRows();
+@@ -528,7 +528,7 @@
+ Todo *todo = static_cast<Todo *>( selection[0].data( KOTodoModel::TodoRole ).value<void *>() );
+
+ KOCoreHelper helper;
+- CalPrinter printer( this, BaseView::calendar(), &helper );
++ CalPrinter printer( this, BaseView::calendar(), &helper, true );
+ connect( this, SIGNAL(configChanged()), &printer, SLOT(updateConfig()) );
+
+ Incidence::List selectedIncidences;
+@@ -542,39 +542,19 @@
}
-Index: korganizer/views/todoview/kotododelegates.cpp
-===================================================================
---- korganizer/views/todoview/kotododelegates.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/views/todoview/kotododelegates.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -90,21 +90,23 @@
- #warning QTreeView should now set State_Editing correctly, remove the workaround
- #endif
+
+ printer.print( KOrg::CalPrinterBase::Incidence,
+- todoDate.date(), todoDate.date(), selectedIncidences, false );
++ todoDate.date(), todoDate.date(), selectedIncidences, preview );
+
#endif
-- bool isEditing = false;
-- KOTodoViewView *view = qobject_cast<KOTodoViewView*>( parent() );
-- if ( view ) {
-- isEditing = view->isEditing( index );
+ }
+
+-void KOTodoView::printPreviewTodo()
++void KOTodoView::printTodo()
+ {
+-#ifndef KORG_NOPRINTER
+- QModelIndexList selection = mView->selectionModel()->selectedRows();
+- if ( selection.size() != 1 ) {
+- return;
- }
-+ if ( index.data( Qt::EditRole ).toInt() > 0 ) {
-+ bool isEditing = false;
-+ KOTodoViewView *view = qobject_cast<KOTodoViewView*>( parent() );
-+ if ( view ) {
-+ isEditing = view->isEditing( index );
-+ }
++ printTodo( false );
++}
-- // TODO QTreeView does not set State_Editing. Qt task id 205051
-- // should be fixed with Qt 4.5, but wasn't. According to the
-- // task tracker the fix arrives in "Some future release".
-- if ( !( opt.state & QStyle::State_Editing ) && !isEditing ) {
-- QStyleOptionProgressBar pbOption;
-- pbOption.QStyleOption::operator=( option );
-- initStyleOptionProgressBar( &pbOption, index );
-+ // TODO QTreeView does not set State_Editing. Qt task id 205051
-+ // should be fixed with Qt 4.5, but wasn't. According to the
-+ // task tracker the fix arrives in "Some future release".
-+ if ( !( opt.state & QStyle::State_Editing ) && !isEditing ) {
-+ QStyleOptionProgressBar pbOption;
-+ pbOption.QStyleOption::operator=( option );
-+ initStyleOptionProgressBar( &pbOption, index );
-
-- style->drawControl( QStyle::CE_ProgressBar, &pbOption, painter );
-+ style->drawControl( QStyle::CE_ProgressBar, &pbOption, painter );
-+ }
- }
+- Todo *todo = static_cast<Todo *>( selection[0].data( KOTodoModel::TodoRole ).value<void *>() );
+-
+- KOCoreHelper helper;
+- CalPrinter printer( this, BaseView::calendar(), &helper );
+- connect( this, SIGNAL(configChanged()), &printer, SLOT(updateConfig()) );
+-
+- Incidence::List selectedIncidences;
+- selectedIncidences.append( todo );
+-
+- KDateTime todoDate;
+- if ( todo->hasStartDate() ) {
+- todoDate = todo->dtStart();
+- } else {
+- todoDate = todo->dtDue();
+- }
+-
+- printer.print( KOrg::CalPrinterBase::Incidence,
+- todoDate.date(), todoDate.date(), selectedIncidences, true );
+-
+-#endif
++void KOTodoView::printPreviewTodo()
++{
++ printTodo( true );
}
-Index: korganizer/calendarview.cpp
+ void KOTodoView::deleteTodo()
+Index: korganizer/views/whatsnextview/kowhatsnextview.h
===================================================================
---- korganizer/calendarview.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/calendarview.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -241,7 +241,7 @@
- CalendarView::~CalendarView()
- {
- mCalendar->unregisterObserver( this );
-- qDeleteAll( mFilters );
-+ deleteFilters();
- qDeleteAll( mExtensions );
+--- korganizer/views/whatsnextview/kowhatsnextview.h (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/whatsnextview/kowhatsnextview.h (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -55,8 +55,10 @@
+
+ virtual int currentDateCount();
+ virtual Incidence::List selectedIncidences() { return Incidence::List(); }
+- DateList selectedDates() { return DateList(); }
++ DateList selectedIncidenceDates() { return DateList(); }
- delete mDialogManager;
-@@ -505,7 +505,7 @@
++ bool supportsDateNavigation() const { return true; }
++
+ public slots:
+ virtual void updateView();
+ virtual void showDates( const QDate &start, const QDate &end );
+Index: korganizer/views/timelineview/kotimelineview.h
+===================================================================
+--- korganizer/views/timelineview/kotimelineview.h (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/timelineview/kotimelineview.h (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -51,7 +51,7 @@
+ ~KOTimelineView();
+
+ virtual KCal::Incidence::List selectedIncidences();
+- virtual KCal::DateList selectedDates();
++ virtual KCal::DateList selectedIncidenceDates();
+ virtual int currentDateCount();
+ virtual void showDates( const QDate &, const QDate & );
+ virtual void showIncidences( const KCal::Incidence::List &incidenceList, const QDate &date );
+Index: korganizer/views/timelineview/kotimelineview.cpp
+===================================================================
+--- korganizer/views/timelineview/kotimelineview.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/timelineview/kotimelineview.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -84,7 +84,7 @@
+ }
- void CalendarView::readFilterSettings( KConfig *config )
+ /*virtual*/
+-KCal::DateList KOTimelineView::selectedDates()
++KCal::DateList KOTimelineView::selectedIncidenceDates()
{
-- qDeleteAll( mFilters );
-+ deleteFilters();
- mFilters.clear();
-
- KConfigGroup generalConfig( config, "General" );
-@@ -636,19 +636,8 @@
-
- emit configChanged();
-
-- // force reload and handle agenda view type switch
-- const bool showMerged =
-- KOPrefs::instance()->agendaViewCalendarDisplay() == KOPrefs::CalendarsMerged;
-- const bool showSideBySide =
-- KOPrefs::instance()->agendaViewCalendarDisplay() == KOPrefs::CalendarsSideBySide;
-- KOrg::BaseView *view = mViewManager->currentView();
-- mViewManager->showAgendaView();
-- if ( view == mViewManager->agendaView() && showSideBySide ) {
-- view = mViewManager->multiAgendaView();
-- } else if ( view == mViewManager->multiAgendaView() && showMerged ) {
-- view = mViewManager->agendaView();
-- }
-- mViewManager->showView( view );
-+ //switch beetween merged, side by side and tabbed agenda if needed
-+ mViewManager->updateMultiCalendarDisplay();
+ return KCal::DateList();
+ }
+Index: korganizer/views/timespentview/kotimespentview.h
+===================================================================
+--- korganizer/views/timespentview/kotimespentview.h (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/timespentview/kotimespentview.h (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -47,7 +47,7 @@
+ {
+ return Incidence::List();
+ }
+- DateList selectedDates()
++ DateList selectedIncidenceDates()
+ {
+ return DateList();
+ }
+Index: korganizer/views/journalview/kojournalview.h
+===================================================================
+--- korganizer/views/journalview/kojournalview.h (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/journalview/kojournalview.h (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -47,7 +47,7 @@
- // To make the "fill window" configurations work
- mViewManager->raiseCurrentView();
-@@ -1949,6 +1938,7 @@
+ virtual int currentDateCount();
+ virtual Incidence::List selectedIncidences();
+- DateList selectedDates() { return DateList(); }
++ DateList selectedIncidenceDates() { return DateList(); }
+ void appendJournal( Journal *journal, const QDate &dt );
+
+ /** documentation in baseview.h */
+Index: korganizer/views/journalview/journalview.cpp
+===================================================================
+--- korganizer/views/journalview/journalview.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/journalview/journalview.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -231,7 +231,7 @@
+ #ifndef KORG_NOPRINTER
+ if ( mJournal ) {
+ KOCoreHelper helper;
+- CalPrinter printer( this, mCalendar, &helper );
++ CalPrinter printer( this, mCalendar, &helper, true );
+ connect( this, SIGNAL(configChanged()), &printer, SLOT(updateConfig()) );
+
+ Incidence::List selectedIncidences;
+@@ -310,12 +310,11 @@
+ cursor.insertBlock();
+ cursor.insertBlock();
+ cursor.setBlockCharFormat( bodyFormat );
++ const QString description = mJournal->description();
+ if ( mJournal->descriptionIsRich() ) {
+- QString description = mJournal->description();
+ mBrowser->insertHtml( description );
+ } else {
+- mBrowser->insertPlainText( mJournal->description() );
++ mBrowser->insertPlainText( description );
}
+- cursor.insertBlock();
+ setReadOnly( mJournal->isReadOnly() );
+ }
+Index: korganizer/views/multiagendaview/multiagendaview.cpp
+===================================================================
+--- korganizer/views/multiagendaview/multiagendaview.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/multiagendaview/multiagendaview.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -276,11 +276,11 @@
+ return list;
+ }
- if ( !incidence ) {
-+ mSelectedIncidence = incidence;
- return;
+-DateList MultiAgendaView::selectedDates()
++DateList MultiAgendaView::selectedIncidenceDates()
+ {
+ DateList list;
+ foreach ( KOAgendaView *agendaView, mAgendaViews ) {
+- list += agendaView->selectedDates();
++ list += agendaView->selectedIncidenceDates();
}
- if ( incidence == mSelectedIncidence ) {
-@@ -2742,6 +2732,7 @@
- void CalendarView::resourcesChanged()
+ return list;
+ }
+Index: korganizer/views/multiagendaview/multiagendaview.h
+===================================================================
+--- korganizer/views/multiagendaview/multiagendaview.h (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/multiagendaview/multiagendaview.h (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -48,7 +48,7 @@
+ ~MultiAgendaView();
+
+ Incidence::List selectedIncidences();
+- DateList selectedDates();
++ DateList selectedIncidenceDates();
+ int currentDateCount();
+ int maxDatesHint();
+
+Index: korganizer/views/listview/kolistview.cpp
+===================================================================
+--- korganizer/views/listview/kolistview.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/listview/kolistview.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -304,7 +304,7 @@
+ return eventList;
+ }
+
+-DateList KOListView::selectedDates()
++DateList KOListView::selectedIncidenceDates()
{
- mViewManager->setUpdateNeeded();
-+ mDateNavigatorContainer->setUpdateNeeded();
- updateView();
+ return mSelectedDates;
}
+Index: korganizer/views/listview/kolistview.h
+===================================================================
+--- korganizer/views/listview/kolistview.h (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/listview/kolistview.h (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -74,7 +74,7 @@
+ virtual int maxDatesHint();
+ virtual int currentDateCount();
+ virtual Incidence::List selectedIncidences();
+- virtual DateList selectedDates();
++ virtual DateList selectedIncidenceDates();
+
+ void showDates( bool show );
-@@ -2753,7 +2744,8 @@
- return KOrg::CalendarViewBase::eventFilter( watched, event );
+Index: korganizer/views/agendaview/koagendaview.cpp
+===================================================================
+--- korganizer/views/agendaview/koagendaview.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/agendaview/koagendaview.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -611,7 +611,7 @@
+ return selected;
}
--void CalendarView::updateHighlightModes() {
-+void CalendarView::updateHighlightModes()
-+{
+-DateList KOAgendaView::selectedDates()
++DateList KOAgendaView::selectedIncidenceDates()
+ {
+ DateList selected;
+ QDate qd;
+@@ -1195,6 +1195,10 @@
+ if ( todo ) {
+ QTime t = todo->dtDue().toTimeSpec( KOPrefs::instance()->timeSpec() ).time();
+
++ if ( t == QTime( 0, 0 ) ) {
++ t = QTime( 23, 59 );
++ }
++
+ int halfHour = 1800;
+ if ( t.addSecs( -halfHour ) < t ) {
+ startY = mAgenda->timeToY( t.addSecs( -halfHour ) );
+@@ -1350,7 +1354,7 @@
+ }
+
+ if ( incidence->recurs() ) {
+- int eventDuration = incDtStart.daysTo( incDtEnd );
++ int eventDuration = event ? incDtStart.daysTo( incDtEnd ) : 0;
+
+ // if there's a multiday event that starts before firstVisibleDateTime but ends after
+ // lets include it. timesInInterval() ignores incidences that aren't totaly inside
+@@ -1367,6 +1371,13 @@
+ if ( todo && todo->hasDueDate() && !todo->isOverdue() ) {
+ // If it's not overdue it will be shown at the original date (not today)
+ dateToAdd = todo->dtDue().toTimeSpec( KOPrefs::instance()->timeSpec() );
++
++ // To-dos are drawn with the bottom of the rectangle at dtDue
++ // if dtDue is at 00:00, then it should be displayed in the previous day, at 23:59
++ if ( dateToAdd.time() == QTime( 0, 0 ) ) {
++ dateToAdd = dateToAdd.addSecs( -1 );
++ }
++
+ incidenceEnd = dateToAdd;
+ } else if ( event ) {
+ dateToAdd = incDtStart;
+@@ -1375,10 +1386,11 @@
+ if ( dateToAdd.isDateOnly() ) {
+ // so comparisons with < > actually work
+ dateToAdd.setTime( QTime( 0, 0 ) );
++ incidenceEnd.setTime( QTime( 23, 59 ) );
+ }
+ }
- KOrg::BaseView *view = mViewManager->currentView();
- if ( view ) {
-@@ -2767,4 +2759,15 @@
- hiJournals );
+- if ( dateToAdd <= lastVisibleDateTime && incidenceEnd >= firstVisibleDateTime ) {
++ if ( dateToAdd <= lastVisibleDateTime && incidenceEnd > firstVisibleDateTime ) {
+ dateTimeList += dateToAdd;
+ }
+ }
+Index: korganizer/views/agendaview/koagendaview.h
+===================================================================
+--- korganizer/views/agendaview/koagendaview.h (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/views/agendaview/koagendaview.h (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -113,7 +113,7 @@
+ virtual Incidence::List selectedIncidences();
+
+ /** returns the currently selected incidence's dates */
+- virtual DateList selectedDates();
++ virtual DateList selectedIncidenceDates();
+
+ /** return the default start/end date/time for new events */
+ virtual bool eventDurationHint( QDateTime &startDt, QDateTime &endDt, bool &allDay );
+Index: korganizer/timelabelszone.cpp
+===================================================================
+--- korganizer/timelabelszone.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/timelabelszone.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -108,7 +108,7 @@
+ foreach ( TimeLabels *timeLabel, mTimeLabelsList ) {
+ timeLabel->updateConfig();
+ timeLabel->positionChanged();
+- timeLabel->repaint();
++ timeLabel->repaintContents();
}
}
+
+Index: korganizer/korganizer.upd
+===================================================================
+--- korganizer/korganizer.upd (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/korganizer.upd (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -53,3 +53,26 @@
+ Key=ShowAllDayTodo,ShowTodosAgendaView
+ Key=ShowAllDayTodo,ShowTodosMonthView
+ RemoveKey=ShowAllDayTodo
++#
++#
++#
++Id=korganizer_4.4_MoveFreeBusy
++File=korganizerrc
++Group=FreeBusy,FreeBusy Publish
++Key=FreeBusyPublishAuto,FreeBusyPublishAuto
++Key=FreeBusyPublishPassword,FreeBusyPublishPassword
++Key=FreeBusyPublishSavePassword,FreeBusyPublishSavePassword
++Key=FreeBusyPublishUser,FreeBusyPublishUser
++Key=FreeBusyPublishDelay,FreeBusyPublishDelay
++Key=FreeBusyPublishDays,FreeBusyPublishDays
++Key=FreeBusyPublishUrl,FreeBusyPublishUrl
++
++Group=FreeBusy,FreeBusy Retrieve
++Key=FreeBusyFullDomainRetrieval,FreeBusyFullDomainRetrieval
++Key=FreeBusyRetrieveSavePassword,FreeBusyRetrieveSavePassword
++Key=FreeBusyRetrieveUrl,FreeBusyRetrieveUrl
++Key=FreeBusyRetrieveUser,FreeBusyRetrieveUser
++Key=FreeBusyRetrieveAuto,FreeBusyRetrieveAuto
++Key=FreeBusyRetrievePassword,FreeBusyRetrievePassword
+
-+void CalendarView::deleteFilters()
++RemoveGroup=FreeBusy
+Index: korganizer/calendarview.cpp
+===================================================================
+--- korganizer/calendarview.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/calendarview.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -317,10 +317,10 @@
+ return curView->selectionStart().date();
+ }
+
+- // Try the view's selectedDates()
+- if ( !curView->selectedDates().isEmpty() ) {
+- if ( curView->selectedDates().first().isValid() ) {
+- return curView->selectedDates().first();
++ // Try the view's selectedIncidenceDates()
++ if ( !curView->selectedIncidenceDates().isEmpty() ) {
++ if ( curView->selectedIncidenceDates().first().isValid() ) {
++ return curView->selectedIncidenceDates().first();
+ }
+ }
+ }
+@@ -333,6 +333,19 @@
+ }
+ }
+
++QDate CalendarView::activeIncidenceDate()
+{
-+ if ( mCalendar ) {
-+ // KCal::Calendar takes ownership of it's filter, and will free it.
-+ mFilters.removeAll( mCalendar->filter() );
++ KOrg::BaseView *curView = mViewManager->currentView();
++ if ( curView ) {
++ DateList dates = curView->selectedIncidenceDates();
++ if ( !dates.isEmpty() ) {
++ return dates.first();
++ }
+ }
+
-+ qDeleteAll( mFilters );
++ return QDate();
+}
+
- #include "calendarview.moc"
+ QDate CalendarView::startDate()
+ {
+ DateList dates = mDateNavigator->selectedDates();
+@@ -870,16 +883,15 @@
+ if ( !aView->selectedIsAllDay() ) {
+ time = aView->selectionStart().time();
+ }
+- } else if ( curView == mView && !mView->selectedDates().isEmpty() ) {
+- date = mView->selectedDates().first();
+- } else {
+- // default to the selected date from the navigator
+- if ( !mDateNavigator->selectedDates().isEmpty() ) {
++ } else if ( curView == mView && mView->selectionStart().isValid() ) {
++ date = mView->selectionStart().date();
++ } else if ( !mDateNavigator->selectedDates().isEmpty() &&
++ curView->supportsDateNavigation() ) {
++ // default to the selected date from the navigator
+ date = mDateNavigator->selectedDates().first();
+- }
+ }
+
+- if ( !date.isValid() ) {
++ if ( !date.isValid() && curView->supportsDateNavigation() ) {
+ KMessageBox::sorry(
+ this,
+ i18n( "Paste failed: unable to determine a valid target date." ) );
+@@ -931,17 +943,16 @@
+ void CalendarView::dateTimesForNewEvent( QDateTime &startDt, QDateTime &endDt,
+ bool &allDay )
+ {
+- if ( !startDt.isValid() ) {
+- startDt.setDate( activeDate() );
++ mViewManager->currentView()->eventDurationHint( startDt, endDt, allDay );
++
++ if ( !startDt.isValid() || !endDt.isValid() ) {
++ startDt.setDate( activeDate( true ) );
+ startDt.setTime( KOPrefs::instance()->mStartTime.time() );
+- }
+- if ( !endDt.isValid() ) {
+ int addSecs =
+ ( KOPrefs::instance()->mDefaultDuration.time().hour() * 3600 ) +
+ ( KOPrefs::instance()->mDefaultDuration.time().minute() * 60 );
+ endDt = startDt.addSecs( addSecs );
+ }
+- mViewManager->currentView()->eventDurationHint( startDt, endDt, allDay );
+ }
+
+ KOEventEditor *CalendarView::newEventEditor( const QDateTime &startDtParam,
+@@ -2322,7 +2333,7 @@
+ connectIncidenceEditor( incidenceEditor );
+
+ mDialogList.insert( incidence, incidenceEditor );
+- incidenceEditor->editIncidence( incidence, activeDate(), mCalendar );
++ incidenceEditor->editIncidence( incidence, activeIncidenceDate(), mCalendar );
+ incidenceEditor->show();
+ return true;
+ }
Index: korganizer/koviewmanager.h
===================================================================
---- korganizer/koviewmanager.h (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/koviewmanager.h (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -100,6 +100,8 @@
- KOTodoView *todoView() const { return mTodoView; }
- KOrg::MonthView *monthView() const { return mMonthView; }
+--- korganizer/koviewmanager.h (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/koviewmanager.h (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -60,6 +60,16 @@
+ {
+ Q_OBJECT
+ public:
++
++ enum AgendaMode {
++ AGENDA_NONE,
++ AGENDA_DAY,
++ AGENDA_WORK_WEEK,
++ AGENDA_WEEK,
++ AGENDA_NEXTX,
++ AGENDA_OTHER // for example, showing 8 days
++ };
++
+ explicit KOViewManager( CalendarView * );
+ virtual ~KOViewManager();
+
+@@ -130,6 +140,12 @@
+
+ void setUpdateNeeded();
-+ void updateMultiCalendarDisplay();
++ /**
++ If the agenda view is selected it returns the current range mode:
++ week, work week, day or nextX days
++ */
++ AgendaMode agendaMode() const { return mAgendaMode; }
+
- signals:
- void configChanged();
+ private slots:
+ void currentAgendaViewTabChanged( QWidget * );
-Index: korganizer/kdatenavigator.h
+@@ -150,6 +166,8 @@
+
+ KOrg::BaseView *mLastEventView;
+ KTabWidget *mAgendaViewTabs;
++
++ AgendaMode mAgendaMode;
+ };
+
+ #endif
+Index: korganizer/koeditoralarms_base.ui
===================================================================
---- korganizer/kdatenavigator.h (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/kdatenavigator.h (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -74,7 +74,7 @@
- void setHighlightMode( bool highlightEvents,
- bool highlightTodos,
- bool highlightJournals ) const;
+--- korganizer/koeditoralarms_base.ui (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/koeditoralarms_base.ui (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -61,7 +61,7 @@
+ <number>1</number>
+ </property>
+ <property name="maximum">
+- <number>999999999</number>
++ <number>99999</number>
+ </property>
+ </widget>
+ </item>
+Index: korganizer/koeditorattachments.cpp
+===================================================================
+--- korganizer/koeditorattachments.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/koeditorattachments.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -569,6 +569,18 @@
+ menu.addSeparator();
+ cancelAction = menu.addAction( i18nc( "@action:inmenu", "C&ancel" ) );
+
++ QByteArray data;
++ QString mimeType;
++ QString label;
++
++ if(!mimeData->formats().isEmpty() && !probablyWeHaveUris) {
++ data=mimeData->data( mimeData->formats().first() );
++ mimeType = mimeData->formats().first();
++ if( KMimeType::mimeType( mimeData->formats().first() ) )
++ label = KMimeType::mimeType( mimeData->formats().first() )->name();
++ }
++
++
+ QAction *ret = menu.exec( QCursor::pos() );
+ if ( linkAction == ret ) {
+ QStringList::ConstIterator jt = labels.constBegin();
+@@ -585,9 +597,9 @@
+ connect( job, SIGNAL(result(KJob *)), SLOT(downloadComplete(KJob *)) );
+ }
+ } else { // we take anything
+- addDataAttachment( mimeData->data( mimeData->formats().first() ),
+- mimeData->formats().first(),
+- KMimeType::mimeType( mimeData->formats().first() )->name() );
++ addDataAttachment( data,
++ mimeType,
++ label );
+ }
+ }
+ }
+Index: korganizer/koeventpopupmenu.cpp
+===================================================================
+--- korganizer/koeventpopupmenu.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/koeventpopupmenu.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -114,9 +114,8 @@
+ delete mMoveToCalendarMenu;
+ mMoveToCalendarMenu = 0;
+ }
++ if ( mCurrentIncidence /*&& qd.isValid()*/ ) {
+
+- if ( mCurrentIncidence && qd.isValid() ) {
-
-+ void setUpdateNeeded();
- public slots:
- void selectDates( const KCal::DateList & );
- void selectPreviousMonth();
+ if ( mCurrentIncidence->recurs() ) {
+ KDateTime thisDateTime( qd, KOPrefs::instance()->timeSpec() );
+ bool isLastOccurrence =
Index: korganizer/koviewmanager.cpp
===================================================================
---- korganizer/koviewmanager.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/koviewmanager.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -590,3 +590,14 @@
- mAgendaSideBySideView->setUpdateNeeded();
- }
+--- korganizer/koviewmanager.cpp (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ korganizer/koviewmanager.cpp (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -66,6 +66,7 @@
+ mAgendaViewTabs = 0;
+ mTimeSpentView = 0;
+ mMonthView = 0;
++ mAgendaMode = AGENDA_NONE;
}
+
+ KOViewManager::~KOViewManager()
+@@ -100,7 +101,27 @@
+ } else if ( view == QLatin1String( "Month" ) ) {
+ showMonthView();
+ } else {
+- showAgendaView();
++ mAgendaMode = AgendaMode( generalConfig.readEntry( "Agenda Mode", int( AGENDA_OTHER ) ) );
+
-+void KOViewManager::updateMultiCalendarDisplay()
-+{
-+ if ( mCurrentView == mAgendaView ||
-+ mCurrentView == mAgendaSideBySideView ||
-+ ( mAgendaViewTabs && mCurrentView == mAgendaViewTabs->currentWidget() ) ) {
-+ showAgendaView();
-+ } else {
-+ updateView();
-+ }
-+}
-Index: korganizer/kcmconfigs/korganizer_configmain.desktop
-===================================================================
---- korganizer/kcmconfigs/korganizer_configmain.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/kcmconfigs/korganizer_configmain.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -32,7 +32,7 @@
- Name[et]=Üldine
- Name[eu]=Orokorra
- Name[fa]=عمومی
--Name[fi]=Yleinen
-+Name[fi]=Yleistä
- Name[fr]=Général
- Name[fy]=Algemien
- Name[ga]=Ginearálta
-Index: korganizer/kdatenavigator.cpp
-===================================================================
---- korganizer/kdatenavigator.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ korganizer/kdatenavigator.cpp (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -221,6 +221,11 @@
- mDayMatrix->repaint();
++ switch ( mAgendaMode ) {
++ case AGENDA_WORK_WEEK:
++ showWorkWeekView();
++ break;
++ case AGENDA_WEEK:
++ showWeekView();
++ break;
++ case AGENDA_NEXTX:
++ showNextXView();
++ break;
++ case AGENDA_DAY:
++ showDayView();
++ break;
++ case AGENDA_NONE:
++ // Someone has been playing with the config file.
++ default:
++ mAgendaMode = AGENDA_OTHER;
++ showAgendaView();
++ }
+ }
}
-+void KDateNavigator::setUpdateNeeded()
-+{
-+ mDayMatrix->setUpdateNeeded();
-+}
-+
- void KDateNavigator::updateView()
+@@ -125,6 +146,7 @@
+ view = QLatin1String( "Month" );
+ } else {
+ view = QLatin1String( "Agenda" );
++ generalConfig.writeEntry( "Agenda Mode", int( mAgendaMode ) );
+ }
+
+ generalConfig.writeEntry( "Current View", view );
+@@ -452,6 +474,7 @@
+
+ void KOViewManager::showDayView()
{
- updateDayMatrix();
++ mAgendaMode = AGENDA_DAY;
+ QDate date = mMainView->activeDate();
+ showAgendaView();
+ mMainView->dateNavigator()->selectDate( date );
+@@ -460,6 +483,7 @@
+ void KOViewManager::showWorkWeekView()
+ {
+ if ( KOGlobals::self()->getWorkWeekMask() != 0 ) {
++ mAgendaMode = AGENDA_WORK_WEEK;
+ QDate date = mMainView->activeDate();
+ showAgendaView();
+ mMainView->dateNavigator()->selectWorkWeek( date );
+@@ -473,6 +497,7 @@
+
+ void KOViewManager::showWeekView()
+ {
++ mAgendaMode = AGENDA_WEEK;
+ QDate date = mMainView->activeDate();
+ showAgendaView();
+ mMainView->dateNavigator()->selectWeek( date );
+@@ -480,6 +505,7 @@
+
+ void KOViewManager::showNextXView()
+ {
++ mAgendaMode = AGENDA_NEXTX;
+ showAgendaView();
+ mMainView->dateNavigator()->selectDates( QDate::currentDate(),
+ KOPrefs::instance()->mNextXDays );
+@@ -550,7 +576,7 @@
+ {
+ QDate qd;
+ if ( mCurrentView ) {
+- DateList qvl = mCurrentView->selectedDates();
++ DateList qvl = mCurrentView->selectedIncidenceDates();
+ if ( !qvl.isEmpty() ) {
+ qd = qvl.first();
+ }
+Index: examples/mailreader/Messages.sh
+===================================================================
+--- examples/mailreader/Messages.sh (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ examples/mailreader/Messages.sh (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -1,4 +1,4 @@
+ #! /usr/bin/env bash
+ $EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
+ $XGETTEXT *.cpp -o $podir/mailreader.pot
+-rm -f *.cpp
++rm -f rc.cpp
Index: examples/mailreader/kmail-plasma/plasma-applet-kpapplet.desktop
===================================================================
---- examples/mailreader/kmail-plasma/plasma-applet-kpapplet.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ examples/mailreader/kmail-plasma/plasma-applet-kpapplet.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -74,6 +74,7 @@
- Comment[en_GB]=Your emails
- Comment[es]=fjvinal@gmail.com
- Comment[et]=Sinu e-kirjad
-+Comment[fi]=translator@legisign.org
- Comment[fr]=Vos adresses de courriel
- Comment[gl]=proxecto@trasno.net
+--- examples/mailreader/kmail-plasma/plasma-applet-kpapplet.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ examples/mailreader/kmail-plasma/plasma-applet-kpapplet.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -80,6 +80,7 @@
Comment[it]=La tua posta elettronica
-@@ -83,6 +84,7 @@
+ Comment[ja]=あなたのメール
+ Comment[km]=អ៊ីមែលរបស់អ្នក
++Comment[lt]=Jūsų e. pašto adresai
+ Comment[lv]=viesturs.zarins@mii.lu.lv
Comment[nb]=Dine e-poster
Comment[nds]=Dien Nettpost
- Comment[nl]=Uw e-mailberichten
-+Comment[nn]=E-postadressa di
- Comment[pa]=ਤੁਹਾਡੇ ਈਮੇਲ
- Comment[pl]=Twoja poczta
- Comment[pt]=Os seus e-mails
Index: examples/mailreader/mailreader.desktop
===================================================================
---- examples/mailreader/mailreader.desktop (.../tags/KDE/4.4.0/kdepim) (wersja 1091891)
-+++ examples/mailreader/mailreader.desktop (.../branches/KDE/4.4/kdepim) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[en_GB]=mailreader
- Name[es]=lector de correo
- Name[et]=Kirjade lugeja
-+Name[fi]=mailreader
- Name[fr]=Lecteur de courriel
- Name[gl]=lector de noticias
+--- examples/mailreader/mailreader.desktop (.../tags/KDE/4.4.1/kdepim) (wersja 1104128)
++++ examples/mailreader/mailreader.desktop (.../branches/KDE/4.4/kdepim) (wersja 1104128)
+@@ -14,6 +14,7 @@
Name[it]=mailreader
-@@ -17,6 +18,7 @@
+ Name[ja]=メールリーダー
+ Name[km]=កម្មវិធីអានសំបុត្រ
++Name[lt]=pašto skaityklė
+ Name[lv]=pasta lasītājs
Name[nb]=e-postleser
Name[nds]=Nettpostkieker
- Name[nl]=e-maillezer
-+Name[nn]=e-postlesar
- Name[pa]=mailreader
- Name[pl]=mailreader
- Name[pt]=mailreader
-@@ -41,6 +43,7 @@
- GenericName[en_GB]=A KDE4 Application
- GenericName[es]=Una aplicación de KDE4
- GenericName[et]=KDE4 rakendus
-+GenericName[fi]=KDE 4 -sovellus
- GenericName[fr]=Une application KDE4
- GenericName[gl]=Unha aplicación de KDE4
+@@ -49,6 +50,7 @@
GenericName[it]=Un'applicazione KDE4
-@@ -50,6 +53,7 @@
+ GenericName[ja]=KDE4 アプリケーション
+ GenericName[km]=កម្មវិធីរបស់ KDE4
++GenericName[lt]=KDE4 programa
+ GenericName[lv]=KDE4 lietotne
GenericName[nb]=Et KDE4-program
GenericName[nds]=En Programm för KDE 4
- GenericName[nl]=Een KDE4-programma
-+GenericName[nn]=KDE 4-program
- GenericName[pa]=ਇੱਕ KDE4 ਐਪਲੀਕੇਸ਼ਨ
- GenericName[pl]=Program KDE4
- GenericName[pt]=Uma Aplicação do KDE4
Zmiany atrybutów dla: .
___________________________________________________________________
projects / packages / kde4-kdepim.git / commitdiff