Ark/krfb
1
0
Fork 0
mirror of https://github.com/KDE/krfb synced 2026-07-01 07:41:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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
2024-02-25 01:15:01 +00:00
parent 4249e7aa6c
commit 1da563ca71
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
krfb/org.kde.krfb.desktop
View File

@@ -7,7 +7,7 @@ X-DBUS-StartupType=Unique
X-DocPath=krfb/index.html X-DocPath=krfb/index.html
Terminal=false Terminal=false
Name=Krfb Name=Krfb
Name[ar]=Krfb Name[ar]=كرفب
Name[bg]=Krfb Name[bg]=Krfb
Name[bn]=কে-আর-এফ-বি Name[bn]=কে-আর-এফ-বি
Name[br]=Krfb Name[br]=Krfb
@@ -76,6 +76,7 @@ Name[zh_CN]=Krfb
Name[zh_HK]=Krfb Name[zh_HK]=Krfb
Name[zh_TW]=桌面分享_Krfb Name[zh_TW]=桌面分享_Krfb
GenericName=Desktop Sharing (VNC) GenericName=Desktop Sharing (VNC)
GenericName[ar]=مشاركة سطح المكتب (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)

2
krfb/org.kde.krfb.virtualmonitor.desktop.cmake
View File

@@ -5,6 +5,7 @@ Exec=@CMAKE_INSTALL_PREFIX@/bin/krfb-virtualmonitor
Icon=krfb Icon=krfb
Terminal=false Terminal=false
Name=KRFBs Virtual Monitor Name=KRFBs Virtual Monitor
Name[ar]=شاشة افتراضية لكرفب
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
@@ -39,6 +40,7 @@ Name[x-test]=xxKRFBs Virtual Monitorxx
Name[zh_CN]=KRBs 虚拟监视器 Name[zh_CN]=KRBs 虚拟监视器
Name[zh_TW]=KRFBs 虛擬螢幕 Name[zh_TW]=KRFBs 虛擬螢幕
Comment=Remote Virtual Monitor Comment=Remote Virtual Monitor
Comment[ar]=شاشة افتراضية بعيدة
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