Commit 00cc870b 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 891f783b
......@@ -27,7 +27,7 @@ Description[fr]=Un module d'entrées / sorties pour le protocole de filtrage de
Description[gl]=Un ioslave para o protocolo de filtrado de correo Sieve.
Description[ia]=Un ioslave (sclavo de i/e) per le protocollo per filtrar posta Sieve
Description[it]=Un IOSlave per il protocollo di filtraggio della posta Sieve
Description[ko]=Sieve 메일 필터링 프로토콜을 위한 IO 슬레이브
Description[ko]=Sieve 메일 필터링 프로토콜 IO 슬레이브
Description[nb]=En ioslave for Sieve e-postfiltrering
Description[nl]=Een KIO-slave voor het Sieve-mail filterprotocol
Description[pl]=Moduł ioslave dla protokołu filtrowania poczty Sieve
......
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