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:
@@ -99,6 +99,7 @@ GenericName[ro]=Partajare birou (VNC)
|
||||
GenericName[sk]=Zdieľanie pracovnej plochy (VNC)
|
||||
GenericName[sl]=Souporaba namizja (VNC)
|
||||
GenericName[sv]=Skrivbordsdelning (VNC)
|
||||
GenericName[tr]=Masaüstü Paylaşımı (VNC)
|
||||
GenericName[uk]=Спільні стільниці (VNC)
|
||||
GenericName[x-test]=xxDesktop Sharing (VNC)xx
|
||||
GenericName[zh_CN]=桌面共享 (VNC)
|
||||
|
||||
@@ -24,6 +24,7 @@ Name[ro]=Monitor virtual KRFB
|
||||
Name[sk]=Virtuálny monitor KRFB
|
||||
Name[sl]=Navidezni monitor KRFB
|
||||
Name[sv]=Krfb:s virtuella bildskärm
|
||||
Name[tr]=KRFB Sanal Monitörü
|
||||
Name[uk]=Віртуальний монітор KRFB
|
||||
Name[x-test]=xxKRFBs Virtual Monitorxx
|
||||
Name[zh_CN]=KRBs 虚拟监视器
|
||||
@@ -47,6 +48,7 @@ Comment[ro]=Monitor virtual distant
|
||||
Comment[sk]=Vzdialený virtuálny monitor
|
||||
Comment[sl]=Oddaljeni navidezni monitor
|
||||
Comment[sv]=Virtuell fjärrbildskärm
|
||||
Comment[tr]=Uzak Sanal Monitör
|
||||
Comment[uk]=Віддалений віртуальний монітор
|
||||
Comment[x-test]=xxRemote Virtual Monitorxx
|
||||
Comment[zh_CN]=远程虚拟监视器
|
||||
|
||||
Reference in New Issue
Block a user