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:
@@ -7,7 +7,7 @@ X-DBUS-StartupType=Unique
|
||||
X-DocPath=krfb/index.html
|
||||
Terminal=false
|
||||
Name=Krfb
|
||||
Name[ar]=Krfb
|
||||
Name[ar]=كرفب
|
||||
Name[bg]=Krfb
|
||||
Name[bn]=কে-আর-এফ-বি
|
||||
Name[br]=Krfb
|
||||
@@ -76,6 +76,7 @@ Name[zh_CN]=Krfb
|
||||
Name[zh_HK]=Krfb
|
||||
Name[zh_TW]=桌面分享_Krfb
|
||||
GenericName=Desktop Sharing (VNC)
|
||||
GenericName[ar]=مشاركة سطح المكتب (VNC)
|
||||
GenericName[ca]=Compartició de l'escriptori (VNC)
|
||||
GenericName[ca@valencia]=Compartició de l'escriptori (VNC)
|
||||
GenericName[cs]=Sdílení pracovní plochy (VNC)
|
||||
|
||||
@@ -5,6 +5,7 @@ Exec=@CMAKE_INSTALL_PREFIX@/bin/krfb-virtualmonitor
|
||||
Icon=krfb
|
||||
Terminal=false
|
||||
Name=KRFBs Virtual Monitor
|
||||
Name[ar]=شاشة افتراضية لكرفب
|
||||
Name[ca]=Monitor virtual del Krfb
|
||||
Name[ca@valencia]=Monitor virtual de Krfb
|
||||
Name[cs]=Virtuální monitor KRFB
|
||||
@@ -39,6 +40,7 @@ Name[x-test]=xxKRFBs Virtual Monitorxx
|
||||
Name[zh_CN]=KRBs 虚拟监视器
|
||||
Name[zh_TW]=KRFBs 虛擬螢幕
|
||||
Comment=Remote Virtual Monitor
|
||||
Comment[ar]=شاشة افتراضية بعيدة
|
||||
Comment[ca]=Monitor virtual remot
|
||||
Comment[ca@valencia]=Monitor virtual remot
|
||||
Comment[cs]=Vzdálený virtuální monitor
|
||||
|
||||
Reference in New Issue
Block a user