Commit fb00227e 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 f60c4929
......@@ -43,5 +43,6 @@ Description[sr@latin]=U/I zahvat za protokol filtriranja pošte sito
Description[sv]=En I/O-slav för brevfiltreringsprotokollet Sieve
Description[tr]=Sieve posta filtreleme protokolü için bir ioslave
Description[uk]=Підлеглий засіб введення-виведення для протоколу фільтрування пошти Sieve
Description[x-test]=xxAn ioslave for the Sieve mail filtering protocolxx
Description[zh_CN]=Sieve 邮件过滤协议的 IO 苦力
Description[zh_TW]=Sieve 郵件過濾協議的 ioslave
......@@ -21,6 +21,7 @@ Name[ru]=Сценарий Sieve
Name[sk]=Script Sieve
Name[sv]=Sieve-skript
Name[uk]=Скрипт фільтрування
Name[x-test]=xxScript Sievexx
Name[zh_TW]=編寫 Sieve 指令碼
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
Categories=Script Sieve
......
......@@ -30,6 +30,7 @@ Name[sr@latin]=Premesti u fasciklu
Name[sv]=Flytta till katalog
Name[tr]=Dizine taşı
Name[uk]=Пересунути до каталогу
Name[x-test]=xxMove to directoryxx
Name[zh_CN]=移动到目录
Name[zh_TW]=移動至目錄
FileName=template.txt
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