Commit 4e739445 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 e8a1f8ec
......@@ -40,7 +40,7 @@ Name[ja]=描画領域を表示
Name[kn]=ಕೆಪೈಂಟ್ ತೋರಿಸು
Name[ko]=그리기 영역 보이기
Name[ko]=그리기 영역 표시
Name[lt]=Piešimo rodymas
Name[lv]=Rādīt zīmēto
Name[mai]=पेंट देखाउ
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