Commit 7dd8b1d1 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 bcf33e82
......@@ -64,6 +64,7 @@ Name[sr@ijekavian]=Распоређивач задатака
Name[sr@ijekavianlatin]=Raspoređivač zadataka
Name[sr@latin]=Raspoređivač zadataka
Name[sv]=Jobbschemaläggare
Name[tg]=Замонасози вазифаҳо
Name[th]=ตัวจัดการตารางงาน
Name[tr]=Görev Zamanlayıcı
Name[ug]=ۋەزىپە پىلانلاش پروگراممىسى
......@@ -123,6 +124,7 @@ Comment[sr@ijekavian]=Подешавање и заказивање задата
Comment[sr@ijekavianlatin]=Podešavanje i zakazivanje zadataka
Comment[sr@latin]=Podešavanje i zakazivanje zadataka
Comment[sv]=Anpassa och schemalägg jobb
Comment[tg]=Танзимот ва замонсозии вазифаҳо
Comment[th]=ปรับแต่งและจัดตารางงาน
Comment[tr]=Görevleri zamanla ve yapılandır
Comment[ug]=ۋەزىپىنى سەپلەش ۋە پىلانلاش
......@@ -172,6 +174,7 @@ X-KDE-Keywords[sr@ijekavian]=cron,crontab,scheduled,tasks,task,schedule,vixie,к
X-KDE-Keywords[sr@ijekavianlatin]=cron,crontab,scheduled,tasks,task,schedule,vixie,cron,crontab,raspored,zadaci,raspoređen
X-KDE-Keywords[sr@latin]=cron,crontab,scheduled,tasks,task,schedule,vixie,cron,crontab,raspored,zadaci,raspoređen
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
......
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