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
2015-10-18 11:02:35 +00:00
parent c0f1b1ebb4
commit 74b4d19a35
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framebuffers/qt/krfb_framebuffer_qt.json
View File

@@ -2,9 +2,13 @@
"Encoding": "UTF-8",
"KPlugin": {
"Description": "Qt based Framebuffer for KRfb.",
"Description[ca]": "«Framebuffer» basat en Qt per al KRfb.",
"Description[en_GB]": "Qt based Framebuffer for 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.",
"Description[pt_BR]": "Framebuffer baseado no Qt para o KRfb.",
"Description[sk]": "Framebuffer založený na Qt pre KRfb.",
"Description[sr@ijekavian]": "Кадробафер за КРФБ на основу КуТ‑у",
"Description[sr@ijekavianlatin]": "Kadrobafer za KRFB na osnovu Qt‑u",
"Description[sr@latin]": "Kadrobafer za KRFB na osnovu Qt‑u",
@@ -16,9 +20,13 @@
"Id": "qt",
"License": "GPL",
"Name": "Qt Framebuffer for KRfb",
"Name[ca]": "«Framebuffer» Qt per al KRfb.",
"Name[en_GB]": "Qt Framebuffer for KRfb",
"Name[fi]": "QT-kehyspuskuri KRfb:lle",
"Name[nl]": "Qt-framebuffer voor KRfb",
"Name[pt]": "'Framebuffer' do Qt para o KRfb",
"Name[pt_BR]": "Framebuffer do Qt para o KRfb",
"Name[sk]": "Qt Framebuffer pre KRfb",
"Name[sr@ijekavian]": "КуТ‑ов кадробафер за КРФБ",
"Name[sr@ijekavianlatin]": "Qt‑ov kadrobafer za KRFB",
"Name[sr@latin]": "Qt‑ov kadrobafer za KRFB",

7
framebuffers/x11/krfb_framebuffer_x11.json
View File

@@ -2,9 +2,13 @@
"Encoding": "UTF-8",
"KPlugin": {
"Description": "X11 XDamage/XShm based Framebuffer for KRfb.",
"Description[ca]": "«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.",
"Description[en_GB]": "X11 XDamage/XShm based Framebuffer for 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.",
"Description[pt_BR]": "Framebuffer baseado no XDamage/XShm do X11 para o KRfb.",
"Description[sk]": "Framebuffer založený na X11 XDamage/XShm pre KRfb.",
"Description[sr@ijekavian]": "Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.",
"Description[sr@ijekavianlatin]": "Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.",
"Description[sr@latin]": "Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.",
@@ -17,9 +21,12 @@
"License": "GPL",
"Name": "X11 Framebuffer for KRfb",
"Name[ca]": "«Framebuffer» del X11 per al KRfb.",
"Name[en_GB]": "X11 Framebuffer for KRfb",
"Name[fi]": "X11-kehyspuskuri KRfb:lle",
"Name[nl]": "X11 framebuffer voor KRfb",
"Name[pt]": "'Framebuffer' do X11 para o KRfb",
"Name[pt_BR]": "Framebuffer do X11 para o KRfb",
"Name[sk]": "X11 Framebuffer pre KRfb",
"Name[sr@ijekavian]": "Икс11 кадробафер за КРФБ.",
"Name[sr@ijekavianlatin]": "X11 kadrobafer za KRFB.",
"Name[sr@latin]": "X11 kadrobafer za KRFB.",

4
krfb/krfb-framebuffer.json
View File

@@ -1,9 +1,13 @@
{
"KPlugin": {
"Description": "Frame Buffer plugins for KRfb",
"Description[ca]": "Connectors de «framebuffer» per al KRfb.",
"Description[en_GB]": "Frame Buffer plugins for KRfb",
"Description[fi]": "Kehyspuskuriliitännäinen kohteelle KRfb",
"Description[nl]": "Framebuffer-plugins voor KRfb",
"Description[pt]": "'Plugins' do 'Framebuffer' para o KRfb",
"Description[pt_BR]": "Plugins de framebuffers para o KRfb",
"Description[sk]": "Frame Buffer modul pre KRfb",
"Description[sr@ijekavian]": "Прикључци кадробафера за КРФБ",
"Description[sr@ijekavianlatin]": "Priključci kadrobafera za KRFB",
"Description[sr@latin]": "Priključci kadrobafera za KRFB",