From 3a9f58f12ed2edb6cdb61850c0b8994ccb48ee52 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 25 Oct 2015 10:39:56 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours 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" --- framebuffers/qt/krfb_framebuffer_qt.json | 4 ++++ framebuffers/x11/krfb_framebuffer_x11.json | 4 ++++ krfb/krfb-framebuffer.json | 2 ++ 3 files changed, 10 insertions(+) diff --git a/framebuffers/qt/krfb_framebuffer_qt.json b/framebuffers/qt/krfb_framebuffer_qt.json index 3e83b32..9d6edb6 100644 --- a/framebuffers/qt/krfb_framebuffer_qt.json +++ b/framebuffers/qt/krfb_framebuffer_qt.json @@ -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", diff --git a/framebuffers/x11/krfb_framebuffer_x11.json b/framebuffers/x11/krfb_framebuffer_x11.json index 4c502cb..027afdd 100644 --- a/framebuffers/x11/krfb_framebuffer_x11.json +++ b/framebuffers/x11/krfb_framebuffer_x11.json @@ -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", diff --git a/krfb/krfb-framebuffer.json b/krfb/krfb-framebuffer.json index fcf6b44..de590b8 100644 --- a/krfb/krfb-framebuffer.json +++ b/krfb/krfb-framebuffer.json @@ -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",