Commit 8bae05eb authored by Script Kiddy's avatar Script Kiddy
Browse files

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent fa920be6
......@@ -3,35 +3,13 @@ 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[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[en_GB]=iCal Calendar File
Name[es]=Archivo de calendario iCal
Name[it]=File di calendario 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[ko]=iCal 달력 파일
Name[nl]=iCal-agendabestand
Name[pl]=Plik kalendarza iCal
Name[pt]=Ficheiro de Calendário do iCal
Name[sk]=Súbor kalendára iCal
Name[sl]=Koledarska datoteka iCal
Name[sr]=И‑календарски фајл
......
......@@ -3,35 +3,13 @@ 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[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[en_GB]=iCal Calendar File
Name[es]=Archivo de calendario iCal
Name[it]=File di calendario 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[ko]=iCal 달력 파일
Name[nl]=iCal-agendabestand
Name[pl]=Plik kalendarza iCal
Name[pt]=Ficheiro de Calendário do iCal
Name[sk]=Súbor kalendára iCal
Name[sl]=Koledarska datoteka iCal
Name[sr]=И‑календарски фајл
......
......@@ -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