Commit 04a12d52 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 36979346
Pipeline #6317 passed with stage
in 5 minutes and 27 seconds
......@@ -3,6 +3,7 @@ IconName=kalarm
Comment=Plasma Mobile Calendar
Comment[ca]=Calendari del Plasma Mòbil
Comment[de]=Kalender für Plasma Mobile
Comment[es]=Calendario de Plasma Mobile
Comment[gl]=Calendario de Plasma Mobile
Comment[nl]=Plasma agenda voor mobiel
Comment[pl]=Przenośny kalendarz Plazmy
......@@ -27,6 +28,7 @@ Name[x-test]=xxCalindorixx
[Context/uid]
Name=Incidence uid
Name[ca]=UID de la incidència
Name[es]=UID de la incidencia
Name[gl]=Identificador único de incidencia
Name[nl]=Uid van incident
Name[pl]=UID wystąpienia
......@@ -36,6 +38,7 @@ Name[uk]=Ідентифікатор випадку
Name[x-test]=xxIncidence uidxx
Comment=The uid of the incidence of the alarm
Comment[ca]=L'UID de la incidència de l'alarma
Comment[es]=El UID de la incidencia de la alarma
Comment[gl]=O identificador único da incidencia da alarma
Comment[nl]=De uid van het incident van het alarm
Comment[pl]=UID wystąpienia alarmu
......@@ -48,6 +51,7 @@ Comment[x-test]=xxThe uid of the incidence of the alarmxx
Name=Alarm
Name[ca]=Alarma
Name[de]=Erinnerung
Name[es]=Alarma
Name[gl]=Alarma
Name[nl]=Alarm
Name[pl]=Alarm
......@@ -59,6 +63,7 @@ Contexts=uid
Comment=Alarm Notification
Comment[ca]=Notificació de l'alarma
Comment[de]=Erinnerungs-Benachrichtigung
Comment[es]=Notificación de alarma
Comment[gl]=Notificación de alarma
Comment[nl]=Alarmmelding
Comment[pl]=Powiadomienie o alarmie
......
......@@ -2,6 +2,7 @@
Name=Calindori Reminder Client
Name[ca]=Client de recordatori del Calindori
Name[de]=Calindori-Erinnerungsprogramm
Name[es]=Cliente de recordatorios de Calindori
Name[gl]=Cliente de lembranzas de Calindori
Name[nl]=Calindori client voor herinnering
Name[pl]=Klient przypominania Calindori
......@@ -15,6 +16,7 @@ Type=Application
Categories=Qt;KDE;
GenericName=Calindori Reminder Daemon Client
GenericName[ca]=Client del dimoni de recordatori del Calindori
GenericName[es]=Cliente del demonio de recordatorios de Calindori
GenericName[gl]=Cliente do servizo de lembranzas de Calindori
GenericName[nl]=Calindori client voor herinneringsdaemon
GenericName[pl]=Klient usługi przypominania 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