network/krfb
network/krfb
1
0
Fork 0
mirror of https://invent.kde.org/network/krfb synced 2024-07-03 08:28:35 +00:00
Code Issues 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 2015-12-17 09:32:43 +00:00
parent 405bec30f6
commit 07439f6408
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framebuffers/qt/krfb_framebuffer_qt.json
View File

@ -24,6 +24,7 @@
"Description[sv]": "X11-rambuffert för Krfb.",
"Description[uk]": "Заснований на Qt буфер кадрів для KRfb.",
"Description[x-test]": "xxQt based Framebuffer for KRfb.xx",
"Description[zh_CN]": "KRfb 的基于 Qt 的帧缓冲。",
"EnabledByDefault": true,
"Id": "qt",
"License": "GPL",
@ -51,6 +52,7 @@
"Name[sv]": "X11-rambuffert för Krfb",
"Name[uk]": "Буфер кадрів на Qt для KRfb",
"Name[x-test]": "xxQt Framebuffer for KRfbxx",
"Name[zh_CN]": "KRfb 的 Qt 帧缓冲",
"ServiceTypes": [
"krfb/framebuffer"
],

1
framebuffers/x11/krfb_framebuffer_x11.json
View File

@ -24,6 +24,7 @@
"Description[sv]": "X11 XDamage/XShm-baserad rambuffert för Krfb.",
"Description[uk]": "Заснований на XDamage/XShm X11 буфер кадрів для KRfb.",
"Description[x-test]": "xxX11 XDamage/XShm based Framebuffer for KRfb.xx",
"Description[zh_CN]": "KRfb 的基于 X11 XDamage/XShm 的帧缓冲。",
"EnabledByDefault": true,
"Id": "x11",
"License": "GPL",