[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/akonadi-ports/kdepim (merge)
From: Volker Krause <vkrause () kde ! org>
Date: 2009-10-07 8:03:59
Message-ID: 1254902639.596682.30012.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1032182 by vkrause:
SVN_MERGE
Merged revisions 1031834-1031835,1031856,1031977 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
........
r1031834 | skelly | 2009-10-06 10:48:14 +0200 (Tue, 06 Oct 2009) | 1 line
Use the Akonadi::SelectionProxyModel in AkonadiConsole with lazy population.
........
r1031835 | scripty | 2009-10-06 10:48:34 +0200 (Tue, 06 Oct 2009) | 1 line
SVN_SILENT made messages (.desktop file)
........
r1031856 | skelly | 2009-10-06 11:50:07 +0200 (Tue, 06 Oct 2009) | 1 line
Build fix.
........
r1031977 | vkrause | 2009-10-06 17:26:35 +0200 (Tue, 06 Oct 2009) | 4 lines
Don't get stuck if we encounter an unknown collection attribute.
CCBUG: 208555
........
_M . (directory)
M +1 -1 akonadi/agents/nepomuk_contact_feeder/nepomukcontactfeeder.desktop
M +4 -3 akonadi/akonadiconsole/browserwidget.cpp
M +1 -1 akonadi/plugins/akonadi_serializer_microblog.desktop
M +1 -1 akonadi/resources/birthdays/birthdaysresource.desktop
M +1 -1 akonadi/resources/ical/notes/notesresource.desktop
M +3 -0 akonadi/resources/imap/imapresource.cpp
M +1 -1 akonadi/resources/kabc/kabcresource.desktop
M +1 -2 akonadi/resources/mbox/mboxresource.desktop
M +1 -1 kleopatra/conf/kleopatra_config_gnupgsystem.desktop
M +1 -1 kmail/dbusimap.desktop
M +1 -1 kmail/dbusmail.desktop
M +2 -2 knotes/knote_config_editor.desktop
M +2 -2 korganizer/dbuscalendar.desktop
M +1 -1 kpilot/conduits/contacts/kpilot-conduit-contacts.desktop
--- branches/work/akonadi-ports/kdepim/akonadi/agents/nepomuk_contact_feeder/nepomukcontactfeeder.desktop \
#1032181:1032182 @@ -53,7 +53,7 @@
Comment[lv]=Paplašinājums, kas iesūta kontaktu datus Nepomuk
Comment[nb]=Utvidelse som sender kontakter inn til Nepomuk
Comment[nds]=Verwiedern, mit de sik Kontakten na Nepomuk överdregen laat
-Comment[nl]=Extensie om kontakten in Nepomuk te importeren
+Comment[nl]=Extensie om contacten in Nepomuk te importeren
Comment[nn]=Utviding for overføring av kontaktar til Nepomuk
Comment[pl]=Rozszerzenie do wysyłania wizytówek do Nepomuka
Comment[pt]=Extensão para enviar contactos para o Nepomuk
--- branches/work/akonadi-ports/kdepim/akonadi/akonadiconsole/browserwidget.cpp \
#1032181:1032182 @@ -36,8 +36,9 @@
#include <akonadi/job.h>
#include <akonadi/collectionfilterproxymodel.h>
#include <akonadi/collectionpropertiesdialog.h>
+#include <akonadi/selectionproxymodel.h>
+#include <akonadi/session.h>
#include <akonadi/standardactionmanager.h>
-#include <akonadi/session.h>
#include <akonadi/entitytreeview.h>
#include <akonadi/entitytreeviewstatesaver.h>
#include <akonadi/favoritecollectionsmodel.h>
@@ -122,7 +123,7 @@
mBrowserModel = new AkonadiBrowserModel( session, monitor, this );
mBrowserModel->setItemPopulationStrategy( EntityTreeModel::LazyPopulation );
- mBrowserModel->setShowHiddenEntities(true);
+ mBrowserModel->setShowSystemEntities(true);
new ModelTest( mBrowserModel );
@@ -147,7 +148,7 @@
// connect( mBrowserModel, SIGNAL( modelAboutToBeReset() ), SLOT( \
slotBrowserModelAboutToBeReset() ) ); // connect( mBrowserModel, SIGNAL( \
modelReset() ), SLOT( slotBrowserModelReset() ) );
- KSelectionProxyModel *selectionProxyModel = new KSelectionProxyModel( \
mCollectionView->selectionModel(), this ); + Akonadi::SelectionProxyModel \
*selectionProxyModel = new Akonadi::SelectionProxyModel( \
mCollectionView->selectionModel(), this ); selectionProxyModel->setSourceModel( \
mBrowserModel ); selectionProxyModel->setFilterBehavior( \
KSelectionProxyModel::OnlySelectedChildren );
--- branches/work/akonadi-ports/kdepim/akonadi/plugins/akonadi_serializer_microblog.desktop \
#1032181:1032182 @@ -13,7 +13,7 @@
Name[lv]=Mikroblogu serializētājs
Name[nb]=Mikroblogg-serialisering
Name[nds]=Lüttdaagbook-Reegmoduul
-Name[nl]=Microblog-administratie
+Name[nl]=Microblogadministratie
Name[nn]=Mikroblogg-serialisator
Name[pt]=Serializador do Micro-blog
Name[pt_BR]=Serializador de microblog
--- branches/work/akonadi-ports/kdepim/akonadi/resources/birthdays/birthdaysresource.desktop \
#1032181:1032182 @@ -39,7 +39,7 @@
Comment[lv]=Nodrošina piekļuvi KDE adrešu grāmatas kontaktu dzimšanas dienu \
datumiem kā kalendāra notikumiem Comment[nb]=Gir tilgang til bursdager og \
bryllupsdager for kontakter i adresseboka, som kalenderhendelser Comment[nds]=Stellt \
Togriep op Geboorts- un Johrdaag vun Kontakten binnen Dien Adressbook as \
Kalenner-Begeevnissen praat
-Comment[nl]=Geeft toegang tot verjaar- en trouwdata van contactpersonen in uw \
adresboek als agenda-items +Comment[nl]=Geeft toegang tot verjaar- en trouwdagdata \
van contactpersonen in uw adresboek als agenda-gebeurtenissen Comment[nn]=Gjev \
tilgang til fødselsdagane og bryllaupsdagane til kontaktar i adresseboka som \
kalenderhendingar Comment[pt]=Oferece o acesso s datas de nascimento e \
aniversário dos contactos no livro de endereços como eventos do calendário \
Comment[pt_BR]=Fornece acesso s datas de aniversário e de casamento de contatos do \
seu livro de endereços como eventos de calendário
--- branches/work/akonadi-ports/kdepim/akonadi/resources/ical/notes/notesresource.desktop \
#1032181:1032182 @@ -76,7 +76,7 @@
Comment[lv]=Ielādē datus no piezīmju faila
Comment[nb]=Laster data fra en notat-fil
Comment[nds]=Laadt Daten ut en Notizen-Datei
-Comment[nl]=Laadt gegevens van een notitiebestand
+Comment[nl]=Laadt gegevens van een notitiesbestand
Comment[nn]=Lastar data frå ei notatfil
Comment[pt]=Carrega os dados de um ficheiro de notas
Comment[pt_BR]=Carrega os dados de um arquivo de notas
--- branches/work/akonadi-ports/kdepim/akonadi/resources/imap/imapresource.cpp \
#1032181:1032182 @@ -988,6 +988,9 @@
job->setProperty( AKONADI_PARTS, parts );
connect( job, SIGNAL( result( KJob* ) ), SLOT( onSetMetaDataDone( KJob* ) ) );
+ } else {
+ // unknown part
+ triggerNextCollectionChangeJob( collection, parts );
}
}
--- branches/work/akonadi-ports/kdepim/akonadi/resources/kabc/kabcresource.desktop \
#1032181:1032182 @@ -40,7 +40,7 @@
Comment[lv]=Ielādē datus no tradicionālā KDE adrešu grāmatas resursa
Comment[nb]=Laster data fra en tradisjonell KDE adressebok-ressurs
Comment[nds]=Laadt Daten ut en normaal KDE-Adressbookressource
-Comment[nl]=Laadt gegevens van een traditioneel KDE adresboekbron
+Comment[nl]=Laadt gegevens van een traditionele KDE adresboekbron
Comment[nn]=Lastar data frå tradisjonelle KDE-adressebokressursar
Comment[pt]=Carrega os dados de um recurso de livro de endereços tradicional do KDE
Comment[pt_BR]=Carrega os dados do tradicional recurso do livro de endereços do KDE
--- branches/work/akonadi-ports/kdepim/akonadi/resources/mbox/mboxresource.desktop \
#1032181:1032182 @@ -13,7 +13,6 @@
Name[lv]=Mbox
Name[nb]=Mbox
Name[nds]=MBox
-Name[nl]=Mbox
Name[nn]=MBOX
Name[pt]=Mbox
Name[pt_BR]=Mbox
@@ -39,7 +38,7 @@
Comment[lv]=Ielādē datus no lokālā mbox faila
Comment[nb]=Laster data fra en lokal mbox-fil
Comment[nds]=Laadt Daten ut en lokaal Postfach (MBox-Datei)
-Comment[nl]=Laadt gegevens uit een lokaal mboxbestand
+Comment[nl]=Laadt gegevens van een lokaal Mbox-bestand
Comment[nn]=Lastar data frå ei lokal MBOX-fil
Comment[pt]=Carrega os dados a partir de um ficheiro 'mbox' local
Comment[pt_BR]=Carrega os dados de um arquivo mbox local
--- branches/work/akonadi-ports/kdepim/kleopatra/conf/kleopatra_config_gnupgsystem.desktop \
#1032181:1032182 @@ -51,7 +51,7 @@
Comment[lv]=GnuPG sistēmas iestatījumu konfigurēšana
Comment[nb]=Oppsett av GnuPG systemvalg
Comment[nds]=De GnuPG-Systeemoptschonen instellen
-Comment[nl]=Configuratie van GnuPG-systeemopties
+Comment[nl]=GnuPG-systeemopties configureren
Comment[nn]=Oppsett av systeminnstillingar i GnuPG
Comment[pt]=Configuração das opções do sistema GnuPG
Comment[pt_BR]=Configuração das opções do sistema GnuPG
--- branches/work/akonadi-ports/kdepim/kmail/dbusimap.desktop #1032181:1032182
@@ -16,7 +16,7 @@
Comment[lv]=Pasta programma ar D-BUS saskarni
Comment[nb]=E-postprogram med D-Bus-grensesnitt
Comment[nds]=Nettpostprogramm mit en D-Bus-Koppelsteed
-Comment[nl]=E-mailprogramma met een DBUS-interface
+Comment[nl]=E-mailprogramma met een D-Bus-interface
Comment[nn]=E-postprogram med eit D-Bus-grensesnitt
Comment[pt]=Um programa de correio electrónico com uma interface D-Bus
Comment[pt_BR]=Programa de e-mail com interface D-Bus
--- branches/work/akonadi-ports/kdepim/kmail/dbusmail.desktop #1032181:1032182
@@ -16,7 +16,7 @@
Comment[lv]=Pasta programma ar D-BUS saskarni
Comment[nb]=E-postprogram med D-Bus-grensesnitt
Comment[nds]=Nettpostprogramm mit en D-Bus-Koppelsteed
-Comment[nl]=E-mailprogramma met een DBUS-interface
+Comment[nl]=E-mailprogramma met een D-Bus-interface
Comment[nn]=E-postprogram med eit D-Bus-grensesnitt
Comment[pt]=Um programa de correio electrónico com uma interface D-Bus
Comment[pt_BR]=Programa de e-mail com interface D-Bus
--- branches/work/akonadi-ports/kdepim/knotes/knote_config_editor.desktop \
#1032181:1032182 @@ -26,7 +26,7 @@
Name[lv]=Redaktors
Name[nb]=Redigerer
Name[nds]=Editor
-Name[nl]=Editor
+Name[nl]=Bewerker
Name[nn]=Redigeringsprogram
Name[pt]=Editor
Name[pt_BR]=Editor
@@ -52,7 +52,7 @@
Comment[lv]=Redaktora konfigurēšana
Comment[nb]=Sett opp redigering
Comment[nds]=Editor inrichten
-Comment[nl]=Editor instellen
+Comment[nl]=Bewerker instellen
Comment[nn]=Set opp redigeringsprogram
Comment[pt]=Configurar o editor
Comment[pt_BR]=Configurar editor
--- branches/work/akonadi-ports/kdepim/korganizer/dbuscalendar.desktop \
#1032181:1032182 @@ -21,7 +21,7 @@
Name[lv]=DBUSCalendar
Name[nb]=DBUSKalender
Name[nds]=D-Bus-Kalenner
-Name[nl]=DBUSCalendar
+Name[nl]=D-BusCalendar
Name[nn]=DBUSCalendar
Name[pa]=DBUSCalendar
Name[pl]=KalendarzDBUS
@@ -53,7 +53,7 @@
Comment[lv]=Organizators ar D-BUS saskarni
Comment[nb]=Organizer med D-Bus-grensesnitt
Comment[nds]=En Daagpleger mit en D-Bus-Koppelsteed
-Comment[nl]=Organizer met een DBUS-interface
+Comment[nl]=Organizer met een D-Bus-interface
Comment[nn]=Organiserar med eit D-Bus-grensesnitt
Comment[pt]=Organizador com uma interface de D-Bus
Comment[pt_BR]=Organizador com interface D-Bus
--- branches/work/akonadi-ports/kdepim/kpilot/conduits/contacts/kpilot-conduit-contacts.desktop \
#1032181:1032182 @@ -15,7 +15,7 @@
Comment[lv]= ī ķēde sinhronizē jūsu rokas datora adrešu grāmatu ar Akonadi \
kolekciju. Comment[nb]=Denne koblingen synkroniserer hånddatorens \
adressebok-database med en Akonadi-samling. Comment[nds]=Disse Kanaal synkroniseert \
dat Handreekner-Adressbook mit en Akonadi-Sammeln.
-Comment[nl]=Dit conduit synchroniseert de adresboekdatabase op de handheld met \
eenAkonadi-verzameling. +Comment[nl]=Dit conduit synchroniseert de adresboekdatabase \
op de handheld met een Akonadi-verzameling. Comment[nn]=Denne koplinga synkroniserer \
den handhaldne adressedatabasen med ei Akonadi-samling. Comment[pt]=Esta conduta \
sincroniza o livro de endereços do dispositivo com uma colecção do Akonadi. \
Comment[pt_BR]=Esta conduta sincroniza o livro de endereços do handheld com uma \
coleção do Akonadi.
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic