1
0
mirror of https://github.com/KDE/krfb synced 2026-07-01 07:41:17 -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:
l10n daemon script
2026-01-20 01:36:48 +00:00
parent f6b394645c
commit acf5271781

View File

@@ -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]=