From c8207581f4cf8f322112dda3dfe198a0401b913a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 11 Oct 2021 01:18:41 +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 | 2 +- framebuffers/xcb/krfb_framebuffer_xcb.json | 2 +- krfb/krfb-events.desktop | 2 +- krfb/krfb-events.json | 2 +- krfb/krfb-framebuffer.desktop | 2 +- krfb/krfb-framebuffer.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/framebuffers/qt/krfb_framebuffer_qt.json b/framebuffers/qt/krfb_framebuffer_qt.json index 3179214d..db4134de 100644 --- a/framebuffers/qt/krfb_framebuffer_qt.json +++ b/framebuffers/qt/krfb_framebuffer_qt.json @@ -41,7 +41,7 @@ "License": "GPL", "Name": "Qt Framebuffer for KRfb", "Name[ca@valencia]": "«Framebuffer» de les Qt per al KRfb.", - "Name[ca]": "«Framebuffer» de les Qt per al KRfb.", + "Name[ca]": "«Framebuffer» de les Qt per al KRfb", "Name[cs]": "Qt Framebuffer pro KRfb", "Name[da]": "Qt-framebuffer til KRfb", "Name[de]": "Qt-Framebuffer für KRfb", diff --git a/framebuffers/xcb/krfb_framebuffer_xcb.json b/framebuffers/xcb/krfb_framebuffer_xcb.json index f71985c0..623920c6 100644 --- a/framebuffers/xcb/krfb_framebuffer_xcb.json +++ b/framebuffers/xcb/krfb_framebuffer_xcb.json @@ -41,7 +41,7 @@ "License": "GPL", "Name": "X11 Framebuffer for KRfb", "Name[ca@valencia]": "«Framebuffer» de l'X11 per al KRfb.", - "Name[ca]": "«Framebuffer» de l'X11 per al KRfb.", + "Name[ca]": "«Framebuffer» de l'X11 per al KRfb", "Name[cs]": "X11 Framebuffer pro KRfb", "Name[da]": "X11-framebuffer til KRfb", "Name[de]": "X11-Framebuffer für KRfb", diff --git a/krfb/krfb-events.desktop b/krfb/krfb-events.desktop index c99b9c7b..676e3a56 100644 --- a/krfb/krfb-events.desktop +++ b/krfb/krfb-events.desktop @@ -3,7 +3,7 @@ Type=ServiceType X-KDE-ServiceType=krfb/events Comment=Event plugins for KRfb -Comment[ca]=Connectors d'esdeveniments per al KRfb. +Comment[ca]=Connectors d'esdeveniments per al KRfb Comment[ca@valencia]=Connectors d'esdeveniments per al KRfb. Comment[cs]=Moduly událostí pro KRfb Comment[da]=Hændelses-plugins til KRfb diff --git a/krfb/krfb-events.json b/krfb/krfb-events.json index da240c72..1d3453e4 100644 --- a/krfb/krfb-events.json +++ b/krfb/krfb-events.json @@ -2,7 +2,7 @@ "KPlugin": { "Description": "Events plugins for KRfb", "Description[ca@valencia]": "Connectors d'esdeveniments per al KRfb.", - "Description[ca]": "Connectors d'esdeveniments per al KRfb.", + "Description[ca]": "Connectors d'esdeveniments per al KRfb", "Description[cs]": "Moduly událostí pro KRfb", "Description[da]": "Hændelses-plugins til KRfb", "Description[de]": "Ereignis-Module für KRfb", diff --git a/krfb/krfb-framebuffer.desktop b/krfb/krfb-framebuffer.desktop index 1ef7678b..eed002eb 100644 --- a/krfb/krfb-framebuffer.desktop +++ b/krfb/krfb-framebuffer.desktop @@ -5,7 +5,7 @@ X-KDE-ServiceType=krfb/framebuffer Comment=Frame Buffer plugins for KRfb Comment[bg]=Приставки за фреймбуфер за KRfb Comment[bs]=Priključci framebafera za KRfb -Comment[ca]=Connectors de «framebuffer» per al KRfb. +Comment[ca]=Connectors de «framebuffer» per al KRfb Comment[ca@valencia]=Connectors de «framebuffer» per al KRfb. Comment[cs]=Moduly Frame bufferu pro KRfb Comment[da]=Framebuffer-plugins til KRfb diff --git a/krfb/krfb-framebuffer.json b/krfb/krfb-framebuffer.json index 459b8989..61c2766d 100644 --- a/krfb/krfb-framebuffer.json +++ b/krfb/krfb-framebuffer.json @@ -2,7 +2,7 @@ "KPlugin": { "Description": "Frame Buffer plugins for KRfb", "Description[ca@valencia]": "Connectors de «Frame Buffer» per al KRfb.", - "Description[ca]": "Connectors de «Frame Buffer» per al KRfb.", + "Description[ca]": "Connectors de «Frame Buffer» per al KRfb", "Description[cs]": "Moduly Frame bufferu pro KRfb", "Description[da]": "Framebuffer-plugins til KRfb", "Description[de]": "Framebuffer-Module für KRfb",