Commit 4c8bac2d authored by Script Kiddy's avatar Script Kiddy

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 54ed09c2
Pipeline #6285 passed with stage
in 5 minutes and 6 seconds
......@@ -2,6 +2,7 @@
IconName=kalarm
Comment=Plasma Mobile Calendar
Comment[ca]=Calendari del Plasma Mòbil
Comment[de]=Kalender für Plasma Mobile
Comment[gl]=Calendario de Plasma Mobile
Comment[nl]=Plasma agenda voor mobiel
Comment[pl]=Przenośny kalendarz Plazmy
......@@ -11,6 +12,7 @@ Comment[uk]=Календар для мобільної Плазми
Comment[x-test]=xxPlasma Mobile Calendarxx
Name=Calindori
Name[ca]=Calindori
Name[de]=Calindori
Name[es]=Calindori
Name[fr]=Calindori
Name[gl]=Calindori
......@@ -45,6 +47,7 @@ Comment[x-test]=xxThe uid of the incidence of the alarmxx
[Event/alarm]
Name=Alarm
Name[ca]=Alarma
Name[de]=Erinnerung
Name[gl]=Alarma
Name[nl]=Alarm
Name[pl]=Alarm
......@@ -55,6 +58,7 @@ Name[x-test]=xxAlarmxx
Contexts=uid
Comment=Alarm Notification
Comment[ca]=Notificació de l'alarma
Comment[de]=Erinnerungs-Benachrichtigung
Comment[gl]=Notificación de alarma
Comment[nl]=Alarmmelding
Comment[pl]=Powiadomienie o alarmie
......
[Desktop Entry]
Name=Calindori Reminder Client
Name[ca]=Client de recordatori del Calindori
Name[de]=Calindori-Erinnerungsprogramm
Name[gl]=Cliente de lembranzas de Calindori
Name[nl]=Calindori client voor herinnering
Name[pl]=Klient przypominania Calindori
......
[Desktop Entry]
Name=Calindori
Name[ca]=Calindori
Name[de]=Calindori
Name[es]=Calindori
Name[fr]=Calindori
Name[gl]=Calindori
......@@ -13,6 +14,7 @@ Name[uk]=Calindori
Name[x-test]=xxCalindorixx
Comment=Calindori
Comment[ca]=Calindori
Comment[de]=Calindori
Comment[es]=Calindori
Comment[fr]=Calindori
Comment[gl]=Calindori
......
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