Commit 2925e077 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 a8765b2f
Pipeline #8784 passed with stage
in 12 minutes and 48 seconds
......@@ -14,6 +14,7 @@ Comment[pt]=Calendário do Plasma Mobile
Comment[sv]=Plasma mobilkalender
Comment[uk]=Календар для мобільної Плазми
Comment[x-test]=xxPlasma Mobile Calendarxx
Comment[zh_TW]=Plasma 行動行事曆
Name=Calindori
Name[ca]=Calindori
Name[cs]=Calindori
......@@ -29,6 +30,7 @@ Name[pt]=Calindori
Name[sv]=Calindori
Name[uk]=Calindori
Name[x-test]=xxCalindorixx
Name[zh_TW]=Calindori
[Context/uid]
Name=Incidence uid
......@@ -76,6 +78,7 @@ Name[pt]=Alarme
Name[sv]=Alarm
Name[uk]=Нагадування
Name[x-test]=xxAlarmxx
Name[zh_TW]=鬧鐘
Contexts=uid
Comment=Alarm Notification
Comment[ca]=Notificació de l'alarma
......@@ -91,6 +94,7 @@ Comment[pt]=Notificação do Alarme
Comment[sv]=Alarmunderrättelse
Comment[uk]=Сповіщення для нагадування
Comment[x-test]=xxAlarm Notificationxx
Comment[zh_TW]=鬧鐘通知
Action=Popup
Urgency=Critical
......
......@@ -13,6 +13,7 @@ Name[pt]=Cliente de Chamadas de Atenção do Calindori
Name[sv]=Calindori påminnelseklient
Name[uk]=Клієнт нагадування Calindori
Name[x-test]=xxCalindori Reminder Clientxx
Name[zh_TW]=Calindori 提醒客戶端
Exec=calindac
Icon=calindori
Type=Application
......@@ -31,6 +32,7 @@ GenericName[pt]=Cliente do Serviço de Chamadas de Atenção do Calindori
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
X-KDE-autostart-condition=calindacrc:General:Autostart:true
......
......@@ -14,6 +14,7 @@ Name[pt]=Calindori
Name[sv]=Calindori
Name[uk]=Calindori
Name[x-test]=xxCalindorixx
Name[zh_TW]=Calindori
Comment=Calindori
Comment[ca]=Calindori
Comment[cs]=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