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-11-04 17:14:10 +00:00
parent 1c9db8798e
commit ab7ed1c006
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framebuffers/qt/krfb_framebuffer_qt.json
View File

@@ -2,6 +2,7 @@
"Encoding": "UTF-8",
"KPlugin": {
"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[de]": "Qt-basierter Framebuffer für KRfb",
"Description[en_GB]": "Qt based Framebuffer for KRfb.",
@@ -24,6 +25,7 @@
"Id": "qt",
"License": "GPL",
"Name": "Qt Framebuffer for KRfb",
"Name[ca@valencia]": "«Framebuffer» Qt per al KRfb.",
"Name[ca]": "«Framebuffer» Qt per al KRfb.",
"Name[de]": "Qt-Framebuffer für KRfb",
"Name[en_GB]": "Qt Framebuffer for KRfb",

4
framebuffers/x11/krfb_framebuffer_x11.desktop
View File

@@ -5,7 +5,7 @@ Comment[ast]=Esquema de buffer pa KRfb basáu en XDamage/XShm
Comment[bg]=Основан на X11 XDamage/XShm фреймбуфер за KRfb.
Comment[bs]=X11 XDamage/XShm baziran framebafer za KRfb.
Comment[ca]=«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.
Comment[ca@valencia]=«Framebuffer» basat en XDamage/XShmQt de l'X11 per al KRfb.
Comment[ca@valencia]=«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.
Comment[cs]=Framebuffer založený na X11 XDamage/XShm pro KRfb.
Comment[da]=X11 XDamage/XShm-baseret framebuffer til KRfb.
Comment[de]=X11 XDamage/XShm-basierter Framebuffer für KRfb.
@@ -53,7 +53,7 @@ Name[ast]=Buffer de X11 pa KRfb
Name[bg]=X11 фреймбуфер за KRfb
Name[bs]=X11 frame bafer za KRfb
Name[ca]=«Framebuffer» del X11 per al KRfb.
Name[ca@valencia]=«Framebuffer» de l'X11 per al KRfb.
Name[ca@valencia]=«Framebuffer» del X11 per al KRfb.
Name[cs]=X11 Framebuffer pro KRfb
Name[da]=X11-framebuffer til KRfb
Name[de]=X11-Framebuffer für KRfb

2
framebuffers/x11/krfb_framebuffer_x11.json
View File

@@ -2,6 +2,7 @@
"Encoding": "UTF-8",
"KPlugin": {
"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[de]": "X11 XDamage/XShm-basierter Framebuffer für KRfb.",
"Description[en_GB]": "X11 XDamage/XShm based Framebuffer for KRfb.",
@@ -24,6 +25,7 @@
"Id": "x11",
"License": "GPL",
"Name": "X11 Framebuffer for KRfb",
"Name[ca@valencia]": "«Framebuffer» del X11 per al KRfb.",
"Name[ca]": "«Framebuffer» del X11 per al KRfb.",
"Name[de]": "X11-Framebuffer für KRfb",
"Name[en_GB]": "X11 Framebuffer for KRfb",

1
krfb/krfb-framebuffer.json
View File

@@ -1,6 +1,7 @@
{
"KPlugin": {
"Description": "Frame Buffer plugins for KRfb",
"Description[ca@valencia]": "Connectors de «framebuffer» per al KRfb.",
"Description[ca]": "Connectors de «framebuffer» per al KRfb.",
"Description[de]": "Framebuffer-Module für KRfb",
"Description[en_GB]": "Frame Buffer plugins for KRfb",