Commit a3ae87b9 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 f1ab8b07
Pipeline #14461 passed with stage
in 8 minutes and 20 seconds
......@@ -2,6 +2,7 @@
IconName=kalarm
Comment=Plasma Mobile Calendar
Comment[ca]=Calendari del Plasma Mòbil
Comment[ca@valencia]=Calendari del Plasma Mòbil
Comment[de]=Kalender für Plasma Mobile
Comment[es]=Calendario de Plasma Mobile
Comment[et]=Plasma Mobile kalender
......@@ -18,6 +19,7 @@ Comment[x-test]=xxPlasma Mobile Calendarxx
Comment[zh_TW]=Plasma 行動行事曆
Name=Calindori
Name[ca]=Calindori
Name[ca@valencia]=Calindori
Name[cs]=Calindori
Name[de]=Calindori
Name[es]=Calindori
......@@ -37,6 +39,7 @@ Name[zh_TW]=Calindori
[Context/uid]
Name=Incidence uid
Name[ca]=UID de la incidència
Name[ca@valencia]=UID de la incidència
Name[de]=Ereigniskennung
Name[es]=UID de la incidencia
Name[et]=Sündmuse UID
......@@ -52,6 +55,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[ca@valencia]=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[et]=Häiresündmuse UID
......@@ -69,6 +73,7 @@ Comment[x-test]=xxThe uid of the incidence of the alarmxx
[Event/alarm]
Name=Alarm
Name[ca]=Alarma
Name[ca@valencia]=Alarma
Name[cs]=Alarm
Name[de]=Erinnerung
Name[es]=Alarma
......@@ -87,6 +92,7 @@ Name[zh_TW]=鬧鐘
Contexts=uid
Comment=Alarm Notification
Comment[ca]=Notificació de l'alarma
Comment[ca@valencia]=Notificació de l'alarma
Comment[de]=Erinnerungs-Benachrichtigung
Comment[es]=Notificación de alarma
Comment[et]=Häire märguanne
......
[Desktop Entry]
Name=Calindori Reminder Client
Name[ca]=Client de recordatori del Calindori
Name[ca@valencia]=Client de recordatori del Calindori
Name[de]=Calindori-Erinnerungsprogramm
Name[es]=Cliente de recordatorios de Calindori
Name[et]=Calindori meeldetuletuste klient
......@@ -21,6 +22,7 @@ Type=Application
Categories=Qt;KDE;
GenericName=Calindori Reminder Daemon Client
GenericName[ca]=Client del dimoni de recordatori del Calindori
GenericName[ca@valencia]=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[et]=Calindori meeldetuletuste deemoni klient
......
[Desktop Entry]
Name=Calindori
Name[ca]=Calindori
Name[ca@valencia]=Calindori
Name[cs]=Calindori
Name[de]=Calindori
Name[es]=Calindori
......@@ -18,6 +19,7 @@ Name[x-test]=xxCalindorixx
Name[zh_TW]=Calindori
Comment=Calindori
Comment[ca]=Calindori
Comment[ca@valencia]=Calindori
Comment[cs]=Calindori
Comment[de]=Calindori
Comment[es]=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