Commit 8406a3e1 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 47296ebf
......@@ -130,7 +130,7 @@ Keywords[sr@latin]=Input;IM;unos;ulaz;IMmetod unosa;
Keywords[sv]=Inmatning;IM;
Keywords[tr]=Giriş;IM;
Keywords[uk]=Input;IM;введення;способи введення;ввід;
Keywords[vi]=Input;IM;nhập;phương thức nhập
Keywords[vi]=Input;IM;nhập;phương thức nhập;
Keywords[x-test]=xxInputxx;xxIMxx;
Keywords[zh_CN]=Input;IM;输入法;输入;
Keywords[zh_TW]=Input;IM;
......
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