Commit 9ac54024 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 b2409668
......@@ -20,8 +20,8 @@ Comment[af]=Kontact KOrganizer joernaal inprop module
Comment[ar]=ملحقة يوميّة «منظّمك» لِ‍«متراسلك»
Comment[bg]=Приставка за дневника
Comment[bs]=Kontat KOrganizer dodatak za dnevnik
Comment[ca]=Connector de diaris del KOrganizer pel Kontact
Comment[ca@valencia]=Connector de diaris del KOrganizer pel Kontact
Comment[ca]=Connector de diaris del KOrganizer per al Kontact
Comment[ca@valencia]=Connector de diaris del KOrganizer per al Kontact
Comment[cs]=Modul deníku KOrganizeru pro aplikaci Kontact
Comment[da]=Kontact KOrganizer journal-plugin
Comment[de]=Kontact KOrganizer-Modul für Journaleinträge
......
......@@ -14,8 +14,8 @@ X-KDE-Weight=450
Name=Pending To-dos
Name[ar]=المهامّ المرجأة
Name[bs]=Očekivanje zadataka
Name[ca]=Pendents inacabades
Name[ca@valencia]=Pendents inacabades
Name[ca]=Tasques pendents inacabades
Name[ca@valencia]=Tasques pendents inacabades
Name[cs]=Nevyřízené úkoly
Name[da]=Forestående gøremål
Name[de]=Zu erledigende Aufgaben
......@@ -67,8 +67,8 @@ Comment=Pending To-dos Summary Setup
Comment[ar]=إعداد ملخّص المهامّ المرجأة
Comment[bg]=Приставка за обобщен преглед на срещите и задачите
Comment[bs]=Postavke sadržaja očekivanih zadataka
Comment[ca]=Configuració del resum per a les pendents inacabades
Comment[ca@valencia]=Configuració del resum per a les pendents inacabades
Comment[ca]=Configuració del resum per a les tasques pendents inacabades
Comment[ca@valencia]=Configuració del resum per a les tasques pendents inacabades
Comment[cs]=Nastavení souhrnu nevyřízených úkolů
Comment[da]=Indstilling af oversigt over forestående gøremål
Comment[de]=Einstellung der Übersicht über zu erledigende Aufgaben
......@@ -118,8 +118,8 @@ Comment[zh_TW]=未決定的待辦事項摘要設定
X-KDE-Keywords=calendar, todos, configure, settings
X-KDE-Keywords[ar]=calendar,todos,configure,settings,تقويم,مهمة,مهام,ضبط,إعدادات
X-KDE-Keywords[bs]=kalendar, zadaci , konfigurirati, postavke
X-KDE-Keywords[ca]=calendari, pendents, configura, arranjament
X-KDE-Keywords[ca@valencia]=calendari, pendents, configura, arranjament
X-KDE-Keywords[ca]=calendari, tasques pendents, configura, arranjament
X-KDE-Keywords[ca@valencia]=calendari, tasques pendents, configura, arranjament
X-KDE-Keywords[da]=kalender, gøremål, indstil, indstillinger
X-KDE-Keywords[de]=Kalender,Aufgaben,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen
X-KDE-Keywords[el]=ημερολόγιο, εργασίες, διαμόρφωση, ρυθμίσεις
......
......@@ -21,8 +21,8 @@ Comment[ar]=ملحقة «منظّمك» لِ‍«متراسلك»
Comment[bg]=Приставка за календар и връзка с KOrganizer
Comment[br]=Lugent Kontact KOrganizer
Comment[bs]=Kontakt KOrganizer dodatak
Comment[ca]=Connector del KOrganizer pel Kontact
Comment[ca@valencia]=Connector del KOrganizer pel Kontact
Comment[ca]=Connector del KOrganizer per al Kontact
Comment[ca@valencia]=Connector del KOrganizer per al Kontact
Comment[cs]=Modul KOrganizeru pro aplikaci Kontact
Comment[cy]=Ategyn KOrganizer Kontact
Comment[da]=Kontact KOrganizer-plugin
......
......@@ -20,8 +20,8 @@ Comment[af]=Kontact KOrganizer te-doen lys inprop module
Comment[ar]=ملحقة قوائم مهامّ «منظّمك» لِ‍«متراسلك»
Comment[bg]=Приставка за списък със задачи и връзка с KOrganizer
Comment[bs]=Kontakt KOrganizer liste zadataka Dodatak
Comment[ca]=Connector de la llista de pendents del KOrganizer pel Kontact
Comment[ca@valencia]=Connector de la llista de pendents del KOrganizer pel Kontact
Comment[ca]=Connector de la llista de tasques pendents del KOrganizer per al Kontact
Comment[ca@valencia]=Connector de la llista de tasques pendents del KOrganizer per al Kontact
Comment[cs]=Modul úkolů KOrganizeru pro aplikaci Kontact
Comment[da]=Kontact KOrganizer gøremålsliste-plugin
Comment[de]=Kontact KOrganizer-Aufgabenlisten-Modul
......@@ -79,8 +79,8 @@ Name[ar]=قائمة المهامّ
Name[bg]=To-do List
Name[br]=Roll an traoù d'ober
Name[bs]=Lista zadataka
Name[ca]=Llista de pendents
Name[ca@valencia]=Llista de pendents
Name[ca]=Llista de tasques pendents
Name[ca@valencia]=Llista de tasques pendents
Name[cs]=Seznam úkolů
Name[cy]=Rhestr I'w-Wneud
Name[da]=Gøremålsliste
......
......@@ -68,8 +68,8 @@ Comment[af]=Spesiale datums opsomming komponent
Comment[ar]=مكوّن تلخيص التّواريخ الخاصّة
Comment[bg]=Модул за обобщение на специалните случаи
Comment[bs]=Komponenta kratkog sadržaja posebnih datuma
Comment[ca]=Component pel resum de dates especials
Comment[ca@valencia]=Component pel resum de dates especials
Comment[ca]=Component per al resum de dates especials
Comment[ca@valencia]=Component per al resum de dates especials
Comment[cs]=Komponenta souhrnu speciálních příležitostí
Comment[da]=Oversigtskomponent for særlige datoer
Comment[de]=Komponente für Übersicht über besondere Termine
......
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