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"icc-effect-master
parent
df89d4d83e
commit
b8b71daed6
|
@ -40,7 +40,7 @@ Name[ja]=描画領域を表示
|
||||||
Name[kk]=Бояулау
|
Name[kk]=Бояулау
|
||||||
Name[km]=បង្ហាញគំនូរ
|
Name[km]=បង្ហាញគំនូរ
|
||||||
Name[kn]=ಕೆಪೈಂಟ್ ತೋರಿಸು
|
Name[kn]=ಕೆಪೈಂಟ್ ತೋರಿಸು
|
||||||
Name[ko]=그리기 영역 보이기
|
Name[ko]=그리기 영역 표시
|
||||||
Name[lt]=Piešimo rodymas
|
Name[lt]=Piešimo rodymas
|
||||||
Name[lv]=Rādīt zīmēto
|
Name[lv]=Rādīt zīmēto
|
||||||
Name[mai]=पेंट देखाउ
|
Name[mai]=पेंट देखाउ
|
||||||
|
|
Loading…
Reference in New Issue