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
2022-07-12 02:56:44 +00:00
parent 5c097aeba2
commit 638320d262
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
krfb/krfb-framebuffer.desktop
View File

@@ -3,7 +3,6 @@ Type=ServiceType
X-KDE-ServiceType=krfb/framebuffer X-KDE-ServiceType=krfb/framebuffer
Comment=Frame Buffer plugins for KRfb Comment=Frame Buffer plugins for KRfb
Comment[bg]=Приставки за фреймбуфер за KRfb
Comment[bs]=Priključci framebafera za KRfb Comment[bs]=Priključci framebafera za KRfb
Comment[ca]=Connectors de «framebuffer» per al KRfb Comment[ca]=Connectors de «framebuffer» per al KRfb
Comment[ca@valencia]=Connectors de «framebuffer» per a KRfb Comment[ca@valencia]=Connectors de «framebuffer» per a KRfb