Commit 3233e6fc 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 ae824a28
......@@ -33,6 +33,7 @@ Description[nl]=Een KIO-slave voor het Sieve-mail filterprotocol
Description[pl]=Moduł ioslave dla protokołu filtrowania poczty Sieve
Description[pt]=Um 'ioslave' para o protocolo de filtragem de e-mail Sieve
Description[pt_BR]=Um ioslave para o protocolo de filtragem de e-mail Sieve
Description[ru]=Модуль ioslave для поддержки протокола фильтрации почты Sieve
Description[sk]=Ioslave pre Sieve mail filtrovací protokol
Description[sl]=Ioslave za protokol poštnega filtriranja Sieve
Description[sr]=У/И захват за протокол филтрирања поште сито
......
......@@ -17,6 +17,7 @@ Name[nl]=Script Sieve
Name[pl]=Skrypt Sieve
Name[pt]=Programa do Sieve
Name[pt_BR]=Script Sieve
Name[ru]=Сценарий Sieve
Name[sk]=Script Sieve
Name[sv]=Sieve-skript
Name[uk]=Скрипт фільтрування
......
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