Commit dca3cd8e 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 1c28194a
......@@ -18,7 +18,7 @@ Name[ca]=Esdeveniments propers
Name[ca@valencia]=Esdeveniments propers
Name[cs]=Nadcházející události
Name[da]=Kommende begivenheder
Name[de]=Anstehende Ereignisse
Name[de]=Anstehende Termine
Name[el]=Επόμενα γεγονότα
Name[en_GB]=Upcoming Events
Name[es]=Próximos eventos
......@@ -71,7 +71,7 @@ Comment[ca]=Configuració del resum pels esdeveniments propers
Comment[ca@valencia]=Configuració del resum pels esdeveniments propers
Comment[cs]=Nastavení souhrnu nadcházejících událostí
Comment[da]=Indstilling af oversigt over kommende begivenheder
Comment[de]=Einstellung der Übersicht über anstehende Ereignisse
Comment[de]=Einstellung der Übersicht über anstehende Termine
Comment[el]=Ρύθμιση σύνοψης επόμενων γεγονότων
Comment[en_GB]=Upcoming Events Summary Setup
Comment[es]=Configuración del resumen de los eventos próximos
......@@ -120,7 +120,7 @@ X-KDE-Keywords[bs]=kalendar, događaji, konfigurirati, postavke
X-KDE-Keywords[ca]=calendari, esdeveniments, configura, arranjament
X-KDE-Keywords[ca@valencia]=calendari, esdeveniments, configura, arranjament
X-KDE-Keywords[da]=kalender, begivenheder, indstil, indstillinger
X-KDE-Keywords[de]=Ereignisse,Kalender,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen
X-KDE-Keywords[de]=Termine,Kalender,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen
X-KDE-Keywords[el]=ημερολόγια, γεγονότα, διαμόρφωση, ρυθμίσεις
X-KDE-Keywords[en_GB]=calendar, events, configure, settings
X-KDE-Keywords[es]=calendario, eventos, configurar, preferencias
......
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