Commit a43d3c38 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 27af7275
......@@ -64,6 +64,7 @@ Name[th]=เครื่องมือแก้ไขที่คั่นห
Name[tr]=Yer İmleri Düzenleyici
Name[ug]=خەتكۈش تەھرىرلىگۈچ
Name[uk]=Редактор закладок
Name[vi]=Trình sửa dấu nhớ
Name[wa]=Aspougneu des rmarkes
Name[x-test]=xxBookmark Editorxx
Name[zh_CN]=书签编辑器
......@@ -129,6 +130,7 @@ Comment[th]=เครื่องมือแก้ไขและจัดก
Comment[tr]=Yer İmleri Düzenleyicisi
Comment[ug]=خەتكۈش تەشكىللىگۈچ ۋە تەھرىرلىگۈچ
Comment[uk]=Керування закладками та редагування закладок
Comment[vi]=Trình tổ chức và sửa dấu nhớ
Comment[wa]=Organizeu eyet aspougneu d' rimarkes
Comment[x-test]=xxBookmark Organizer and Editorxx
Comment[zh_CN]=书签组织和编辑器
......
Supports Markdown
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