From f2847369784b6667e435ca60ba9158118ed54c0a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 24 Jul 2020 05:49:48 +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" --- events/x11/krfb_events_x11.desktop | 2 ++ events/x11/krfb_events_x11.json | 2 ++ events/xdp/krfb_events_xdp.desktop | 2 ++ events/xdp/krfb_events_xdp.json | 2 ++ framebuffers/pipewire/krfb_framebuffer_pw.json | 2 ++ krfb/krfb-events.desktop | 1 + krfb/krfb-events.json | 1 + 7 files changed, 12 insertions(+) diff --git a/events/x11/krfb_events_x11.desktop b/events/x11/krfb_events_x11.desktop index 556bd54a..4771c0cb 100644 --- a/events/x11/krfb_events_x11.desktop +++ b/events/x11/krfb_events_x11.desktop @@ -3,6 +3,7 @@ Encoding=UTF-8 Comment=X11 XFakeInput based event handler for KRfb Comment[ca]=Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb Comment[ca@valencia]=Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb +Comment[da]=X11 XFakeInput baseret hændelseshåndtering til KRfb Comment[de]=Ereignis-Modul basierend auf X11 XFakeInput für KRfb Comment[el]=Χειριστής γεγονότων με βάση το X11 XFakeInput για το KRfb Comment[en_GB]=X11 XFakeInput based event handler for KRfb @@ -29,6 +30,7 @@ Comment[zh_TW]=KRfb 基於 X11 XFakeInput 的事件處理器 Name=X11 XFakeInput based event handler for KRfb Name[ca]=Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb Name[ca@valencia]=Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb +Name[da]=X11 XFakeInput baseret hændelseshåndtering til KRfb Name[de]=Ereignis-Modul basierend auf X11 XFakeInput für KRfb Name[el]=Χειριστής γεγονότων με βάση το X11 XFakeInput για το KRfb Name[en_GB]=X11 XFakeInput based event handler for KRfb diff --git a/events/x11/krfb_events_x11.json b/events/x11/krfb_events_x11.json index c529ca52..db78ed7c 100644 --- a/events/x11/krfb_events_x11.json +++ b/events/x11/krfb_events_x11.json @@ -4,6 +4,7 @@ "Description": "X11 XFakeInput based event handler for KRfb", "Description[ca@valencia]": "Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb", "Description[ca]": "Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb", + "Description[da]": "X11 XFakeInput baseret hændelseshåndtering til KRfb", "Description[de]": "Ereignis-Modul basierend auf X11 XFakeInput für KRfb", "Description[el]": "Χειριστής γεγονότων με βάση το X11 XFakeInput για το KRfb", "Description[en_GB]": "X11 XFakeInput based event handler for KRfb", @@ -33,6 +34,7 @@ "Name": "X11 Event handler for KRfb", "Name[ca@valencia]": "Gestor d'esdeveniments de l'X11 per al KRfb", "Name[ca]": "Gestor d'esdeveniments de l'X11 per al KRfb", + "Name[da]": "X11 hændelseshåndtering til KRfb", "Name[de]": "Ereignis-Modul basierend auf X11 für KRfb", "Name[el]": "Χειριστής γεγονότων X11 για το KRfb", "Name[en_GB]": "X11 Event handler for KRfb", diff --git a/events/xdp/krfb_events_xdp.desktop b/events/xdp/krfb_events_xdp.desktop index 164c7c77..35eb8ac8 100644 --- a/events/xdp/krfb_events_xdp.desktop +++ b/events/xdp/krfb_events_xdp.desktop @@ -3,6 +3,7 @@ Encoding=UTF-8 Comment=Xdg-desktop-portal based event handler for KRfb Comment[ca]=Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb Comment[ca@valencia]=Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb +Comment[da]=Xdg-desktop-portal baseret hændelseshåndtering til KRfb Comment[de]=Ereignis-Modul basierend auf Xdg-desktop-portal für KRfb Comment[el]=Χειριστής γεγονότων με βάση το xdg-desktop-portal για το KRfb Comment[en_GB]=Xdg-desktop-portal based event handler for KRfb @@ -29,6 +30,7 @@ Comment[zh_TW]=KRfb 基於 Xdg-desktop-portal 的事件處理器 Name=Xdg-desktop-portal based event handler for KRfb Name[ca]=Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb Name[ca@valencia]=Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb +Name[da]=Xdg-desktop-portal baseret hændelseshåndtering til KRfb Name[de]=Ereignis-Modul basierend auf Xdg-desktop-portal für KRfb Name[el]=Χειριστής γεγονότων με βάση το xdg-desktop-portal για το KRfb Name[en_GB]=Xdg-desktop-portal based event handler for KRfb diff --git a/events/xdp/krfb_events_xdp.json b/events/xdp/krfb_events_xdp.json index d5f0823c..15bf7053 100644 --- a/events/xdp/krfb_events_xdp.json +++ b/events/xdp/krfb_events_xdp.json @@ -4,6 +4,7 @@ "Description": "Xdg-desktop-portal based event handler for KRfb", "Description[ca@valencia]": "Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb", "Description[ca]": "Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb", + "Description[da]": "Xdg-desktop-portal baseret hændelseshåndtering til KRfb", "Description[de]": "Ereignis-Modul basierend auf Xdg-desktop-portal für KRfb", "Description[el]": "Χειριστής γεγονότων με βάση το xdg-desktop-portal για το KRfb", "Description[en_GB]": "Xdg-desktop-portal based event handler for KRfb", @@ -33,6 +34,7 @@ "Name": "Xdg-desktop-portal Event handler for KRfb", "Name[ca@valencia]": "Gestor d'esdeveniments Xdg-desktop-portal per al KRfb", "Name[ca]": "Gestor d'esdeveniments Xdg-desktop-portal per al KRfb", + "Name[da]": "Xdg-desktop-portal hændelseshåndtering til KRfb", "Name[de]": "Ereignis-Modul basierend auf Xdg-desktop-portal für KRfb", "Name[el]": "Χειριστής γεγονότων xdg-desktop-portal για το KRfb", "Name[en_GB]": "Xdg-desktop-portal Event handler for KRfb", diff --git a/framebuffers/pipewire/krfb_framebuffer_pw.json b/framebuffers/pipewire/krfb_framebuffer_pw.json index 760bfa97..1ea5fae3 100644 --- a/framebuffers/pipewire/krfb_framebuffer_pw.json +++ b/framebuffers/pipewire/krfb_framebuffer_pw.json @@ -5,6 +5,7 @@ "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[da]": "PipeWire baseret framebuffer til KRfb.", "Description[de]": "PipeWire-basierter Framebuffer für KRfb.", "Description[el]": "Μνήμη ανανέωσης με βάση το pipewire για το KRfb.", "Description[en_GB]": "PipeWire based Framebuffer for KRfb.", @@ -36,6 +37,7 @@ "Name[ca@valencia]": "«Framebuffer» del PipeWire per al KRfb", "Name[ca]": "«Framebuffer» del PipeWire per al KRfb", "Name[cs]": "PipeWire Framebuffer pro KRfb", + "Name[da]": "PipeWire framebuffer til KRfb", "Name[de]": "PipeWire-Framebuffer für KRfb", "Name[el]": "Μνήμη ανανέωσης pipewire για το KRfb", "Name[en_GB]": "PipeWire Framebuffer for KRfb", diff --git a/krfb/krfb-events.desktop b/krfb/krfb-events.desktop index fd008762..d65fb42d 100644 --- a/krfb/krfb-events.desktop +++ b/krfb/krfb-events.desktop @@ -6,6 +6,7 @@ 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[da]=Hændelses-plugins til KRfb Comment[de]=Ereignis-Module für KRfb Comment[el]=Πρόσθετα γεγονότων για το KRfb Comment[en_GB]=Event plugins for KRfb diff --git a/krfb/krfb-events.json b/krfb/krfb-events.json index 4deba7bd..d37bb54c 100644 --- a/krfb/krfb-events.json +++ b/krfb/krfb-events.json @@ -4,6 +4,7 @@ "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[da]": "Hændelses-plugins til KRfb", "Description[de]": "Ereignis-Module für KRfb", "Description[el]": "Πρόσθετα γεγονότων για το KRfb", "Description[en_GB]": "Events plugins for KRfb",