Commit fa920be6 authored by Daniel Vrátil's avatar Daniel Vrátil 🤖
Browse files

Merge branch 'Applications/16.12'

parents bd0790bc c551ad2f
......@@ -3,13 +3,35 @@ Name=iCal Calendar File
Name[ca]=Fitxer de calendari iCal
Name[ca@valencia]=Fitxer de calendari iCal
Name[cs]=Soubor s kalendářem iCal
Name[en_GB]=iCal Calendar File
Name[es]=Archivo de calendario iCal
Name[da]=iCal-kalenderfil
Name[de]=ICal-Kalenderdatei
Name[el]=Αρχείο ημερολογίου ICal
Name[en_GB]=ICal Calendar File
Name[es]=Archivo de calendario ICal
Name[et]=ICali kalendrifail
Name[fi]=iCal-kalenteritiedosto
Name[fr]=Fichier d'agenda au format « ICal »
Name[ga]=Comhad Féilire ICal
Name[gl]=Ficheiro de Calendario de ICal
Name[hu]=iCal-naptárfájl
Name[ia]=File iCal de calendario
Name[it]=File di calendario iCal
Name[ko]=iCal 달력 파일
Name[nl]=iCal-agendabestand
Name[pl]=Plik kalendarza iCal
Name[pt]=Ficheiro de Calendário do iCal
Name[ja]=iCal カレンダーファイル
Name[kk]=ICal күнтізбе файлы
Name[km]=ឯកសារ​ប្រតិទិន ICal
Name[ko]=ICal 달력 파일
Name[lt]=ICal kalendoriaus failas
Name[lv]=ICal kalendāra fails
Name[nb]=ICal kalenderfil
Name[nds]=ICal-Kalennerdatei
Name[nl]=ICal-agendabestand
Name[nn]=iCal-kalenderfil
Name[pa]=ICal ਕੈਲੰਡਰ ਫਾਇਲ
Name[pl]=Plik kalendarza ICal
Name[pt]=Ficheiro de Calendário ICal
Name[pt_BR]=Arquivo de calendário ICal
Name[ro]=Fișier-calendar ICal
Name[ru]=Файл календаря iCal
Name[sk]=Súbor kalendára iCal
Name[sl]=Koledarska datoteka iCal
Name[sr]=И‑календарски фајл
......
......@@ -3,13 +3,35 @@ Name=iCal Calendar File
Name[ca]=Fitxer de calendari iCal
Name[ca@valencia]=Fitxer de calendari iCal
Name[cs]=Soubor s kalendářem iCal
Name[en_GB]=iCal Calendar File
Name[es]=Archivo de calendario iCal
Name[da]=iCal-kalenderfil
Name[de]=ICal-Kalenderdatei
Name[el]=Αρχείο ημερολογίου ICal
Name[en_GB]=ICal Calendar File
Name[es]=Archivo de calendario ICal
Name[et]=ICali kalendrifail
Name[fi]=iCal-kalenteritiedosto
Name[fr]=Fichier d'agenda au format « ICal »
Name[ga]=Comhad Féilire ICal
Name[gl]=Ficheiro de Calendario de ICal
Name[hu]=iCal-naptárfájl
Name[ia]=File iCal de calendario
Name[it]=File di calendario iCal
Name[ko]=iCal 달력 파일
Name[nl]=iCal-agendabestand
Name[pl]=Plik kalendarza iCal
Name[pt]=Ficheiro de Calendário do iCal
Name[ja]=iCal カレンダーファイル
Name[kk]=ICal күнтізбе файлы
Name[km]=ឯកសារ​ប្រតិទិន ICal
Name[ko]=ICal 달력 파일
Name[lt]=ICal kalendoriaus failas
Name[lv]=ICal kalendāra fails
Name[nb]=ICal kalenderfil
Name[nds]=ICal-Kalennerdatei
Name[nl]=ICal-agendabestand
Name[nn]=iCal-kalenderfil
Name[pa]=ICal ਕੈਲੰਡਰ ਫਾਇਲ
Name[pl]=Plik kalendarza ICal
Name[pt]=Ficheiro de Calendário ICal
Name[pt_BR]=Arquivo de calendário ICal
Name[ro]=Fișier-calendar ICal
Name[ru]=Файл календаря iCal
Name[sk]=Súbor kalendára iCal
Name[sl]=Koledarska datoteka iCal
Name[sr]=И‑календарски фајл
......
......@@ -232,6 +232,18 @@ void ICalDirResource::itemRemoved(const Akonadi::Item &item)
changeProcessed();
}
void ICalDirResource::collectionChanged(const Collection &collection)
{
if (collection.hasAttribute<EntityDisplayAttribute>()) {
auto attr = collection.attribute<EntityDisplayAttribute>();
if (attr->displayName() != name()) {
setName(attr->displayName());
}
}
changeProcessed();
}
void ICalDirResource::retrieveCollections()
{
Collection c;
......@@ -255,7 +267,7 @@ void ICalDirResource::retrieveCollections()
}
EntityDisplayAttribute *attr = c.attribute<EntityDisplayAttribute>(Collection::AddIfMissing);
attr->setDisplayName(i18n("Calendar Folder"));
attr->setDisplayName(name() == identifier() ? i18n("Calendar Folder") : name());
attr->setIconName(QStringLiteral("office-calendar"));
Collection::List list;
......
......@@ -52,6 +52,8 @@ protected:
void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> &parts) Q_DECL_OVERRIDE;
void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
void collectionChanged(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
private:
bool loadIncidences();
QString iCalDirectoryName() const;
......
......@@ -55,7 +55,7 @@ Comment[et]=Andmete laadimine vCardide kataloogist
Comment[fi]=Lataa tietoa vCardeja sisältävästä kansiosta
Comment[fr]=Charge des données depuis un dossier contenant des fichiers « vCard »
Comment[ga]=Luchtaíonn sé seo sonraí ó chomhadlann ina bhfuil v-Chártaí
Comment[gl]=Carga datos desde un directorio con vCards.
Comment[gl]=Carga datos desde un directorio con vCards
Comment[hu]=Adatokat tölt be egy vCardokat tartalmazó mappából
Comment[ia]=Carga datos ex un directorio con vCards
Comment[it]=Carica dati da una directory con dei file vCard
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment