Commit 25cf1c0f authored by Script Kiddy's avatar Script Kiddy
Browse files

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 4773516d
......@@ -69,7 +69,6 @@ Name[th]=ตัวจัดการตารางงาน
Name[tr]=Görev Zamanlayıcı
Name[ug]=ۋەزىپە پىلانلاش پروگراممىسى
Name[uk]=Планувальник завдань
Name[x-test]=xxTask Schedulerxx
Name[zh_CN]=任务调度
Name[zh_TW]=工作排程器
Comment=Configure and schedule tasks
......@@ -129,7 +128,6 @@ Comment[th]=ปรับแต่งและจัดตารางงาน
Comment[tr]=Görevleri zamanla ve yapılandır
Comment[ug]=ۋەزىپىنى سەپلەش ۋە پىلانلاش
Comment[uk]=Налаштування і планування завдання
Comment[x-test]=xxConfigure and schedule tasksxx
Comment[zh_CN]=配置并调度计划任务
Comment[zh_TW]=設定與排程工作
X-KDE-Keywords=cron,crontab,scheduled,tasks,task,schedule,vixie
......@@ -177,7 +175,6 @@ X-KDE-Keywords[sv]=cron,crontab,schemalagd,uppgifter,uppgift,schema,vixie
X-KDE-Keywords[tg]=cron,crontab,вақт,вазифаҳо,вазифа,замонсозӣ,vixie
X-KDE-Keywords[tr]=cron,crontab,scheduled,tasks,task,schedule,vixie
X-KDE-Keywords[uk]=cron,crontab,scheduled,tasks,task,schedule,vixie,таблиця планування,список планування,завдання,план,запуск
X-KDE-Keywords[x-test]=xxcronxx,xxcrontabxx,xxscheduledxx,xxtasksxx,xxtaskxx,xxschedulexx,xxvixiexx
X-KDE-Keywords[zh_CN]=cron,crontab,scheduled,tasks,task,schedule,vixie,计划,计划任务,任务
X-KDE-Keywords[zh_TW]=cron,crontab,scheduled,tasks,task,schedule,vixie
Categories=Qt;KDE;X-KDE-settings-system;
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