Commit 5bd8469a 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 c92a46f2
Pipeline #34225 skipped
......@@ -120,7 +120,7 @@ Comment[pt_BR]=Componente de Livro de endereços
Comment[ro]=Componentă pentru Carte de adrese
Comment[ru]=Компонент «Адресная книга»
Comment[sk]=Komponent adresára
Comment[sl]=Sestavni del imenika
Comment[sl]=Sestavni del adresarja
Comment[sr]=Компонента адресара
Comment[sr@ijekavian]=Компонента адресара
Comment[sr@ijekavianlatin]=Komponenta adresara
......
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