Commit 9bb5f5e9 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 2fbe334c
Pipeline #6402 passed with stage
in 9 minutes and 20 seconds
......@@ -29,6 +29,7 @@ Name[x-test]=xxCalindorixx
Name=Incidence uid
Name[ca]=UID de la incidència
Name[es]=UID de la incidencia
Name[gl]=Identificador único de incidencia
Name[it]=UID incidenza
......@@ -40,6 +41,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[de]=Die Ereigniskennung der Erinnerung
Comment[es]=El UID de la incidencia de la alarma
Comment[gl]=O identificador único da incidencia da alarma
Comment[it]=L'UID dell'incidenza dell'allarme
......@@ -17,6 +17,7 @@ Type=Application
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[gl]=Cliente do servizo de lembranzas de Calindori
GenericName[it]=Client promemoria del demone di 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