Commit 8a63cdbf 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 02bd317c
......@@ -104,6 +104,7 @@ Comment[sr@ijekavian]=Прикључци за поставке
Comment[sr@ijekavianlatin]=Priključci za postavke
Comment[sr@latin]=Priključci za postavke
Comment[sv]=Inställningsinsticksprogram
Comment[tr]=Ayarlar Eklentisi
Comment[uk]=Додатки параметрів
Comment[x-test]=xxSettings Pluginsxx
Comment[zh_CN]=设置插件
......@@ -129,6 +130,7 @@ X-KDE-Keywords[sr@ijekavian]=kmail,plugins,К‑пошта,прикључци
X-KDE-Keywords[sr@ijekavianlatin]=kmail,plugins,K‑pošta,priključci
X-KDE-Keywords[sr@latin]=kmail,plugins,K‑pošta,priključci
X-KDE-Keywords[sv]=kmail,insticksprogram
X-KDE-Keywords[tr]=kmail,eklentiler
X-KDE-Keywords[uk]=kmail,plugins,додатки,кмейл
X-KDE-Keywords[x-test]=xxkmailxx,xxpluginsxx
X-KDE-Keywords[zh_CN]=kmail,plugins,插件
......@@ -216,6 +216,7 @@ Name[sr@ijekavian]=Нова порука
Name[sr@ijekavianlatin]=Nova poruka
Name[sr@latin]=Nova poruka
Name[sv]=Nytt brev
Name[tr]=Yeni İleti
Name[uk]=Нове повідомлення
Name[x-test]=xxNew Messagexx
Name[zh_CN]=新信件
......@@ -244,6 +245,7 @@ Name[sr@ijekavian]=Провери пошту
Name[sr@ijekavianlatin]=Proveri poštu
Name[sr@latin]=Proveri poštu
Name[sv]=Kontrollera brev
Name[tr]=Posyayı Kontrol Et
Name[uk]=Перевірити пошту
Name[x-test]=xxCheck Mailxx
Name[zh_CN]=检查邮件
......
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