yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2020-04-22 11:03:45 +02:00
parent e8a1f8eccc
commit 4e7394457c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/showpaint/showpaint_config.desktop
View file

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