Commit 4a4fe8b9 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 5f7223f6
Pipeline #6493 passed with stage
in 5 minutes and 51 seconds
......@@ -4,6 +4,7 @@ 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[fr]=Agenda Plasma Mobile
Comment[gl]=Calendario de Plasma Mobile
Comment[it]=Calendario per Plasma Mobile
Comment[nl]=Plasma agenda voor mobiel
......@@ -31,6 +32,7 @@ Name=Incidence uid
Name[ca]=UID de la incidència
Name[es]=UID de la incidencia
Name[fr]=Uid de l'incidence
Name[gl]=Identificador único de incidencia
Name[it]=UID incidenza
Name[nl]=Uid van incident
......@@ -43,6 +45,7 @@ Comment=The uid of the incidence of the alarm
Comment[ca]=L'UID de la incidència de l'alarma
Comment[de]=Die Ereigniskennung der Erinnerung
Comment[es]=El UID de la incidencia de la alarma
Comment[fr]=L'uid de l'incidence de l'alarme
Comment[gl]=O identificador único da incidencia da alarma
Comment[it]=L'UID dell'incidenza dell'allarme
Comment[nl]=De uid van het incident van het alarm
......@@ -57,6 +60,7 @@ Name=Alarm
......@@ -70,6 +74,7 @@ Comment=Alarm Notification
Comment[ca]=Notificació de l'alarma
Comment[es]=Notificación de alarma
Comment[fr]=Notification d'alarme
Comment[gl]=Notificación de alarma
Comment[it]=Notifica dell'allarme
......@@ -3,6 +3,7 @@ Name=Calindori Reminder Client
Name[ca]=Client de recordatori del Calindori
Name[es]=Cliente de recordatorios de Calindori
Name[fr]=Client de rappel Calindori
Name[gl]=Cliente de lembranzas de Calindori
Name[it]=Client promemoria Calindori
Name[nl]=Calindori client voor herinnering
......@@ -19,6 +20,7 @@ GenericName=Calindori Reminder Daemon Client
GenericName[ca]=Client del dimoni de recordatori del Calindori
GenericName[de]=Dienst für das Calindori-Erinnerungsprogramm
GenericName[es]=Cliente del demonio de recordatorios de Calindori
GenericName[fr]=Client du démon de rappel Calindori
GenericName[gl]=Cliente do servizo de lembranzas de Calindori
GenericName[it]=Client promemoria del demone di Calindori
GenericName[nl]=Calindori client voor herinneringsdaemon
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