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
2016-01-23 10:35:57 +00:00
parent 916ffb525a
commit 65595722bd
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framebuffers/qt/krfb_framebuffer_qt.json
View File

@@ -4,6 +4,7 @@
"Description": "Qt based Framebuffer for KRfb.",
"Description[ca@valencia]": "«Framebuffer» basat en Qt per al KRfb.",
"Description[ca]": "«Framebuffer» basat en Qt per al KRfb.",
"Description[cs]": "Framebuffer založený na Qt pro KRfb.",
"Description[de]": "Qt-basierter Framebuffer für KRfb",
"Description[es]": "Framebuffer basado en Qt para KRfb.",
"Description[fi]": "QT-perustainen Kehyspuskuri KRfb:lle",
@@ -31,6 +32,7 @@
"Name[ast]": "Framebuffer Qt pa KRfb",
"Name[ca@valencia]": "«Framebuffer» Qt per al KRfb.",
"Name[ca]": "«Framebuffer» Qt per al KRfb.",
"Name[cs]": "Qt Framebuffer pro KRfb",
"Name[de]": "Qt-Framebuffer für KRfb",
"Name[es]": "Framebuffer de Qt para KRfb",
"Name[fi]": "QT-kehyspuskuri KRfb:lle",

2
framebuffers/x11/krfb_framebuffer_x11.json
View File

@@ -4,6 +4,7 @@
"Description": "X11 XDamage/XShm based Framebuffer for KRfb.",
"Description[ca@valencia]": "«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.",
"Description[ca]": "«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.",
"Description[cs]": "Framebuffer založený na X11 XDamage/XShm pro KRfb.",
"Description[de]": "X11 XDamage/XShm-basierter Framebuffer für KRfb.",
"Description[es]": "Framebuffer basado en XDamage/XShm de X11 para KRfb.",
"Description[fi]": "X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.",
@@ -30,6 +31,7 @@
"Name": "X11 Framebuffer for KRfb",
"Name[ca@valencia]": "«Framebuffer» del X11 per al KRfb.",
"Name[ca]": "«Framebuffer» del X11 per al KRfb.",
"Name[cs]": "X11 Framebuffer pro KRfb",
"Name[de]": "X11-Framebuffer für KRfb",
"Name[es]": "Framebuffer X11 para KRfb",
"Name[fi]": "X11-kehyspuskuri KRfb:lle",

1
krfb/krfb-framebuffer.json
View File

@@ -3,6 +3,7 @@
"Description": "Frame Buffer plugins for KRfb",
"Description[ca@valencia]": "Connectors de «framebuffer» per al KRfb.",
"Description[ca]": "Connectors de «framebuffer» per al KRfb.",
"Description[cs]": "Moduly Frame bufferu pro KRfb",
"Description[da]": "Framebuffer-plugins til KRfb",
"Description[de]": "Framebuffer-Module für KRfb",
"Description[es]": "Complementos de framebuffer para KRfb",