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-10-25 10:39:56 +00:00
parent 74b4d19a35
commit 3a9f58f12e
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framebuffers/qt/krfb_framebuffer_qt.json
View File

@ -3,7 +3,9 @@
"KPlugin": {
"Description": "Qt based Framebuffer for KRfb.",
"Description[ca]": "«Framebuffer» basat en Qt per al KRfb.",
"Description[de]": "Qt-basierter Framebuffer für KRfb",
"Description[en_GB]": "Qt based Framebuffer for KRfb.",
"Description[es]": "Framebuffer basado en Qt para KRfb.",
"Description[fi]": "QT-perustainen Kehyspuskuri KRfb:lle",
"Description[nl]": "Op Qt gebaseerd framebuffer voor KRfb.",
"Description[pt]": "'Framebuffer' baseado no Qt para o KRfb.",
@ -21,7 +23,9 @@
"License": "GPL",
"Name": "Qt Framebuffer for KRfb",
"Name[ca]": "«Framebuffer» Qt per al KRfb.",
"Name[de]": "Qt-Framebuffer für KRfb",
"Name[en_GB]": "Qt Framebuffer for KRfb",
"Name[es]": "Framebuffer de Qt para KRfb",
"Name[fi]": "QT-kehyspuskuri KRfb:lle",
"Name[nl]": "Qt-framebuffer voor KRfb",
"Name[pt]": "'Framebuffer' do Qt para o KRfb",

4
framebuffers/x11/krfb_framebuffer_x11.json
View File

@ -3,7 +3,9 @@
"KPlugin": {
"Description": "X11 XDamage/XShm based Framebuffer for KRfb.",
"Description[ca]": "«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.",
"Description[de]": "X11 XDamage/XShm-basierter Framebuffer für KRfb.",
"Description[en_GB]": "X11 XDamage/XShm based Framebuffer for KRfb.",
"Description[es]": "Framebuffer basado en XDamage/XShm de X11 para KRfb.",
"Description[fi]": "X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.",
"Description[nl]": "Op X11 XDamage/XShm gebaseerd framebuffer voor KRfb.",
"Description[pt]": "'Framebuffer' do X11, baseado no XDamage/XShm, para o KRfb.",
@ -21,7 +23,9 @@
"License": "GPL",
"Name": "X11 Framebuffer for KRfb",
"Name[ca]": "«Framebuffer» del X11 per al KRfb.",
"Name[de]": "X11-Framebuffer für KRfb",
"Name[en_GB]": "X11 Framebuffer for KRfb",
"Name[es]": "Framebuffer X11 para KRfb",
"Name[fi]": "X11-kehyspuskuri KRfb:lle",
"Name[nl]": "X11 framebuffer voor KRfb",
"Name[pt]": "'Framebuffer' do X11 para o KRfb",

2
krfb/krfb-framebuffer.json
View File

@ -2,7 +2,9 @@
"KPlugin": {
"Description": "Frame Buffer plugins for KRfb",
"Description[ca]": "Connectors de «framebuffer» per al KRfb.",
"Description[de]": "Framebuffer-Module für KRfb",
"Description[en_GB]": "Frame Buffer plugins for KRfb",
"Description[es]": "Complementos de framebuffer para KRfb",
"Description[fi]": "Kehyspuskuriliitännäinen kohteelle KRfb",
"Description[nl]": "Framebuffer-plugins voor KRfb",
"Description[pt]": "'Plugins' do 'Framebuffer' para o KRfb",