mirror of
https://github.com/KDE/krfb
synced 2026-07-01 07:31:16 -07:00
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"
This commit is contained in:
@@ -74,7 +74,7 @@ Comment[sa]=दूरस्थ आभासी निरीक्षक
|
|||||||
Comment[sk]=Vzdialený virtuálny monitor
|
Comment[sk]=Vzdialený virtuálny monitor
|
||||||
Comment[sl]=Oddaljeni navidezni monitor
|
Comment[sl]=Oddaljeni navidezni monitor
|
||||||
Comment[sv]=Virtuell fjärrbildskärm
|
Comment[sv]=Virtuell fjärrbildskärm
|
||||||
Comment[tr]=Uzak Sanal Monitör
|
Comment[tr]=Uzak konumlar için sanal monitör
|
||||||
Comment[uk]=Віддалений віртуальний монітор
|
Comment[uk]=Віддалений віртуальний монітор
|
||||||
Comment[zh_CN]=远程虚拟监视器
|
Comment[zh_CN]=远程虚拟监视器
|
||||||
Comment[zh_TW]=遠端虛擬螢幕
|
Comment[zh_TW]=遠端虛擬螢幕
|
||||||
|
|||||||
Reference in New Issue
Block a user