From 7a42bd3b65b7299fcb361a9d8f0d00190a853a7c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 5 Sep 2019 09:09:34 +0200 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/pipewire/krfb_framebuffer_pw.json | 2 ++ krfb/krfb-events.desktop | 1 + krfb/krfb-events.json | 1 + 3 files changed, 4 insertions(+) diff --git a/framebuffers/pipewire/krfb_framebuffer_pw.json b/framebuffers/pipewire/krfb_framebuffer_pw.json index b6a5327b..99227877 100644 --- a/framebuffers/pipewire/krfb_framebuffer_pw.json +++ b/framebuffers/pipewire/krfb_framebuffer_pw.json @@ -4,6 +4,7 @@ "Description": "PipeWire based Framebuffer for KRfb.", "Description[ca@valencia]": "«Framebuffer» basat en el PipeWire per al KRfb.", "Description[ca]": "«Framebuffer» basat en el PipeWire per al KRfb.", + "Description[cs]": "Framebuffer založený na Pipe pro KRfb.", "Description[de]": "PipeWire-basierter Framebuffer für KRfb.", "Description[en_GB]": "PipeWire based Framebuffer for KRfb.", "Description[es]": "Framebuffer basado en PipeWire para KRfb.", @@ -31,6 +32,7 @@ "Name": "PipeWire Framebuffer for KRfb", "Name[ca@valencia]": "«Framebuffer» del PipeWire per al KRfb", "Name[ca]": "«Framebuffer» del PipeWire per al KRfb", + "Name[cs]": "PipeWire Framebuffer pro KRfb", "Name[de]": "PipeWire-Framebuffer für KRfb", "Name[en_GB]": "PipeWire Framebuffer for KRfb", "Name[es]": "Framebuffer de PipeWire para KRfb", diff --git a/krfb/krfb-events.desktop b/krfb/krfb-events.desktop index 8f45780d..36cd772e 100644 --- a/krfb/krfb-events.desktop +++ b/krfb/krfb-events.desktop @@ -5,6 +5,7 @@ X-KDE-ServiceType=krfb/events Comment=Event plugins for 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[de]=Ereignis-Module für KRfb Comment[en_GB]=Event plugins for KRfb Comment[es]=Complementos de eventos para KRfb diff --git a/krfb/krfb-events.json b/krfb/krfb-events.json index 4960afb3..93e50d6f 100644 --- a/krfb/krfb-events.json +++ b/krfb/krfb-events.json @@ -3,6 +3,7 @@ "Description": "Events plugins for KRfb", "Description[ca@valencia]": "Connectors d'esdeveniments per al KRfb.", "Description[ca]": "Connectors d'esdeveniments per al KRfb.", + "Description[cs]": "Moduly událostí pro KRfb", "Description[de]": "Ereignis-Module für KRfb", "Description[en_GB]": "Events plugins for KRfb", "Description[es]": "Complementos de eventos para KRfb",