Commit 5bdd223f 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 f28a0e81
Pipeline #24271 skipped
......@@ -21,6 +21,7 @@ Comment[pt_BR]=Calendário do Plasma Mobile
Comment[sl]=Plasma Mobile koledar
Comment[sv]=Plasma mobilkalender
Comment[uk]=Календар для мобільної Плазми
Comment[x-test]=xxPlasma Mobile Calendarxx
Comment[zh_TW]=Plasma 行動行事曆
Name=Calindori
Name[ca]=Calindori
......@@ -45,6 +46,7 @@ Name[sk]=Calindori
Name[sl]=Calindori
Name[sv]=Calindori
Name[uk]=Calindori
Name[x-test]=xxCalindorixx
Name[zh_TW]=Calindori
[Context/uid]
......@@ -66,6 +68,7 @@ Name[pt]=UID da incidência
Name[pt_BR]=UID da incidência
Name[sv]=Förekomstens användar-id
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
......@@ -84,6 +87,7 @@ Comment[pt]=O UID da incidência do alarme
Comment[pt_BR]=A UID da incidência do alarme
Comment[sv]=Användar-id för förekomsten av alarmet
Comment[uk]=Ідентифікатор випадку нагадування
Comment[x-test]=xxThe uid of the incidence of the alarmxx
[Event/alarm]
Name=Alarm
......@@ -108,6 +112,7 @@ Name[sk]=Alarm
Name[sl]=Alarm
Name[sv]=Alarm
Name[uk]=Нагадування
Name[x-test]=xxAlarmxx
Name[zh_TW]=鬧鐘
Contexts=uid
Comment=Alarm Notification
......@@ -130,6 +135,7 @@ Comment[pt_BR]=Notificação de alarme
Comment[sl]=Obvestilo o alarmu
Comment[sv]=Alarmunderrättelse
Comment[uk]=Сповіщення для нагадування
Comment[x-test]=xxAlarm Notificationxx
Comment[zh_TW]=鬧鐘通知
Action=Popup
Urgency=Critical
......@@ -23,6 +23,7 @@ Name[pt_BR]=Daemon do cliente de lembretes Calindori
Name[sl]=Calindori odjemalec opomnikov
Name[sv]=Calindori påminnelseklient
Name[uk]=Клієнт нагадування Calindori
Name[x-test]=xxCalindori Reminder Clientxx
Name[zh_TW]=Calindori 提醒用戶端
Exec=calindac
Icon=calindori
......@@ -48,6 +49,7 @@ GenericName[pt_BR]=Cliente de lembretes Calindori
GenericName[sl]=Calindori demon odjemalca opomnikov
GenericName[sv]=Calindori påminnelsedemonklient
GenericName[uk]=Клієнт фонової служби нагадування Calindori
GenericName[x-test]=xxCalindori Reminder Daemon Clientxx
GenericName[zh_TW]=Calindori 提醒守護用戶端
Terminal=false
X-KDE-autostart-phase=2
......
......@@ -25,6 +25,7 @@ Name[sk]=Calindori
Name[sl]=Calindori
Name[sv]=Calindori
Name[uk]=Calindori
Name[x-test]=xxCalindorixx
Name[zh_TW]=Calindori
Comment=Calindori
Comment[ca]=Calindori
......@@ -48,6 +49,7 @@ Comment[sk]=Calindori
Comment[sl]=Calindori
Comment[sv]=Calindori
Comment[uk]=Calindori
Comment[x-test]=xxCalindorixx
Comment[zh_TW]=Calindori
Exec=calindori
MimeType=application/x-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