Commit 2fbe334c 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 39dd0197
Pipeline #6350 passed with stage
in 6 minutes and 50 seconds
......@@ -5,6 +5,7 @@ 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[it]=Calendario per Plasma Mobile
Comment[nl]=Plasma agenda voor mobiel
Comment[pl]=Przenośny kalendarz Plazmy
Comment[pt]=Calendário do Plasma Mobile
......@@ -30,6 +31,7 @@ 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
Name[nl]=Uid van incident
Name[pl]=UID wystąpienia
Name[pt]=UID da incidência
......@@ -40,6 +42,7 @@ 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[it]=L'UID dell'incidenza dell'allarme
Comment[nl]=De uid van het incident van het alarm
Comment[pl]=UID wystąpienia alarmu
Comment[pt]=O UID da incidência do alarme
......@@ -53,6 +56,7 @@ Name[ca]=Alarma
Name[de]=Erinnerung
Name[es]=Alarma
Name[gl]=Alarma
Name[it]=Allarme
Name[nl]=Alarm
Name[pl]=Alarm
Name[pt]=Alarme
......@@ -65,6 +69,7 @@ Comment[ca]=Notificació de l'alarma
Comment[de]=Erinnerungs-Benachrichtigung
Comment[es]=Notificación de alarma
Comment[gl]=Notificación de alarma
Comment[it]=Notifica dell'allarme
Comment[nl]=Alarmmelding
Comment[pl]=Powiadomienie o alarmie
Comment[pt]=Notificação do Alarme
......
......@@ -4,6 +4,7 @@ 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[it]=Client promemoria Calindori
Name[nl]=Calindori client voor herinnering
Name[pl]=Klient przypominania Calindori
Name[pt]=Cliente de Chamadas de Atenção do Calindori
......@@ -18,6 +19,7 @@ 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[it]=Client promemoria del demone di Calindori
GenericName[nl]=Calindori client voor herinneringsdaemon
GenericName[pl]=Klient usługi przypominania Calindori
GenericName[pt]=Cliente do Serviço de Chamadas de Atenção do 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