mirror of
https://invent.kde.org/network/krfb
synced 2024-07-01 07:24:29 +00: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:
parent
0d3a38f39e
commit
8a1a10209e
|
@ -78,6 +78,7 @@ Name[zh_HK]=Krfb
|
||||||
Name[zh_TW]=桌面分享_Krfb
|
Name[zh_TW]=桌面分享_Krfb
|
||||||
GenericName=Desktop Sharing (VNC)
|
GenericName=Desktop Sharing (VNC)
|
||||||
GenericName[ar]=مشاركة سطح المكتب (VNC)
|
GenericName[ar]=مشاركة سطح المكتب (VNC)
|
||||||
|
GenericName[bg]=Споделяне на работния плот (VNC)
|
||||||
GenericName[ca]=Compartició de l'escriptori (VNC)
|
GenericName[ca]=Compartició de l'escriptori (VNC)
|
||||||
GenericName[ca@valencia]=Compartició de l'escriptori (VNC)
|
GenericName[ca@valencia]=Compartició de l'escriptori (VNC)
|
||||||
GenericName[cs]=Sdílení pracovní plochy (VNC)
|
GenericName[cs]=Sdílení pracovní plochy (VNC)
|
||||||
|
|
|
@ -6,6 +6,7 @@ Icon=krfb
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Name=KRFBs Virtual Monitor
|
Name=KRFBs Virtual Monitor
|
||||||
Name[ar]=شاشة افتراضية لكرفب
|
Name[ar]=شاشة افتراضية لكرفب
|
||||||
|
Name[bg]=Виртуален монитор на KRFB
|
||||||
Name[ca]=Monitor virtual del Krfb
|
Name[ca]=Monitor virtual del Krfb
|
||||||
Name[ca@valencia]=Monitor virtual de Krfb
|
Name[ca@valencia]=Monitor virtual de Krfb
|
||||||
Name[cs]=Virtuální monitor KRFB
|
Name[cs]=Virtuální monitor KRFB
|
||||||
|
@ -41,6 +42,7 @@ Name[zh_CN]=KRBs 虚拟监视器
|
||||||
Name[zh_TW]=KRFBs 虛擬螢幕
|
Name[zh_TW]=KRFBs 虛擬螢幕
|
||||||
Comment=Remote Virtual Monitor
|
Comment=Remote Virtual Monitor
|
||||||
Comment[ar]=شاشة افتراضية بعيدة
|
Comment[ar]=شاشة افتراضية بعيدة
|
||||||
|
Comment[bg]=Отдалечен виртуален монитор
|
||||||
Comment[ca]=Monitor virtual remot
|
Comment[ca]=Monitor virtual remot
|
||||||
Comment[ca@valencia]=Monitor virtual remot
|
Comment[ca@valencia]=Monitor virtual remot
|
||||||
Comment[cs]=Vzdálený virtuální monitor
|
Comment[cs]=Vzdálený virtuální monitor
|
||||||
|
|
Loading…
Reference in New Issue
Block a user