From 94ea33aaa471acc395cf3a8c6e7a76d3c566d296 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 31 May 2019 05:09:53 +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 5f2bdf83..25e4394f 100644 --- a/events/x11/krfb_events_x11.desktop +++ b/events/x11/krfb_events_x11.desktop @@ -5,6 +5,7 @@ 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[en_GB]=X11 XFakeInput based event handler for KRfb Comment[es]=Gestor de eventos basado en XFakeInput de X11 para KRfb +Comment[ko]=X11 XFakeInput 기반 KRfb 이벤트 핸들러 Comment[nl]=Op X11 XFakeInput gebaseerde behandelaar van gebeurtenis voor KRfb Comment[pt]=Tratamento de eventos baseado no XFakeInput do X11 para o KRfb Comment[sv]=Händelsehanterare för Krfb baserad på X11 XFakeInput @@ -15,6 +16,7 @@ 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[en_GB]=X11 XFakeInput based event handler for KRfb Name[es]=Gestor de eventos basado en XFakeInput de X11 para KRfb +Name[ko]=X11 XFakeInput 기반 KRfb 이벤트 핸들러 Name[nl]=Op X11 XFakeInput gebaseerde behandelaar van gebeurtenis voor KRfb Name[pt]=Tratamento de eventos baseado no XFakeInput do X11 para o KRfb Name[sv]=Händelsehanterare för Krfb baserad på X11 XFakeInput diff --git a/events/x11/krfb_events_x11.json b/events/x11/krfb_events_x11.json index 2dc5b1b8..8df9c81b 100644 --- a/events/x11/krfb_events_x11.json +++ b/events/x11/krfb_events_x11.json @@ -6,6 +6,7 @@ "Description[ca]": "Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al KRfb", "Description[en_GB]": "X11 XFakeInput based event handler for KRfb", "Description[es]": "Gestor de eventos basado en XFakeInput de X11 para KRfb", + "Description[ko]": "X11 XFakeInput 기반 KRfb 이벤트 핸들러", "Description[nl]": "Op X11 XFakeInput gebaseerde behandelaar van gebeurtenis voor KRfb", "Description[pt]": "Tratamento de eventos baseado no XFakeInput do X11 para o KRfb", "Description[sv]": "Händelsehanterare för KRfb baserad på X11 XFakeInput", @@ -19,6 +20,7 @@ "Name[ca]": "Gestor d'esdeveniments de l'X11 per al KRfb", "Name[en_GB]": "X11 Event handler for KRfb", "Name[es]": "Gestor de eventos de X11 para KRfb", + "Name[ko]": "KRfb X11 이벤트 핸들러", "Name[nl]": "Op X11 behandelaar van gebeurtenis voor KRfb", "Name[pt]": "Tratamento de eventos do X11 para o KRfb", "Name[sv]": "X11-händelsehanterare för Krfb", diff --git a/events/xdp/krfb_events_xdp.desktop b/events/xdp/krfb_events_xdp.desktop index 9c671571..7068fab7 100644 --- a/events/xdp/krfb_events_xdp.desktop +++ b/events/xdp/krfb_events_xdp.desktop @@ -5,6 +5,7 @@ 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[en_GB]=Xdg-desktop-portal based event handler for KRfb Comment[es]=Gestor de eventos basado en Xdg-desktop-portal para KRfb +Comment[ko]=Xdg-desktop-portal 기반 KRfb 이벤트 핸들러 Comment[nl]=Op Xdg-desktop-portal gebaseerde behandelaar van gebeurtenis voor KRfb Comment[pt]=Tratamento de eventos baseado no Xdg-desktop-portal para o KRfb Comment[sv]=Händelsehanterare för Krfb baserad på xdg-desktop-portal @@ -15,6 +16,7 @@ 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[en_GB]=Xdg-desktop-portal based event handler for KRfb Name[es]=Gestor de eventos basado en Xdg-desktop-portal para KRfb +Name[ko]=Xdg-desktop-portal 기반 KRfb 이벤트 핸들러 Name[nl]=Op Xdg-desktop-portal gebaseerde behandelaar van gebeurtenis voor KRfb Name[pt]=Tratamento de eventos baseado no Xdg-desktop-portal para o KRfb Name[sv]=Händelsehanterare för Krfb baserad på xdg-desktop-portal diff --git a/events/xdp/krfb_events_xdp.json b/events/xdp/krfb_events_xdp.json index a31c9cc7..d9465434 100644 --- a/events/xdp/krfb_events_xdp.json +++ b/events/xdp/krfb_events_xdp.json @@ -6,6 +6,7 @@ "Description[ca]": "Gestor d'esdeveniments basat en el Xdg-desktop-portal per al KRfb", "Description[en_GB]": "Xdg-desktop-portal based event handler for KRfb", "Description[es]": "Gestor de eventos basado en Xdg-desktop-portal para KRfb", + "Description[ko]": "Xdg-desktop-portal 기반 KRfb 이벤트 핸들러", "Description[nl]": "Op Xdg-desktop-portal gebaseerde behandelaar van gebeurtenis voor KRfb", "Description[pt]": "Tratamento de eventos baseado no Xdg-desktop-portal para o KRfb", "Description[sv]": "Händelsehanterare för KRfb baserad på xdg-desktop-portal", @@ -19,6 +20,7 @@ "Name[ca]": "Gestor d'esdeveniments Xdg-desktop-portal per al KRfb", "Name[en_GB]": "Xdg-desktop-portal Event handler for KRfb", "Name[es]": "Gestor de eventos de Xdg-desktop-portal para KRfb", + "Name[ko]": "KRfb Xdg-desktop-portal 이벤트 핸들러", "Name[nl]": "Op Xdg-desktop-portal behandelaar van gebeurtenis voor KRfb", "Name[pt]": "Tratamento de eventos do Xdg-desktop-portal para o KRfb", "Name[sv]": "Xdg-desktop-portal händelsehanterare för Krfb", diff --git a/framebuffers/pipewire/krfb_framebuffer_pw.json b/framebuffers/pipewire/krfb_framebuffer_pw.json index 8268b4a5..069d165d 100644 --- a/framebuffers/pipewire/krfb_framebuffer_pw.json +++ b/framebuffers/pipewire/krfb_framebuffer_pw.json @@ -6,6 +6,7 @@ "Description[ca]": "«Framebuffer» basat en el PipeWire per al KRfb.", "Description[en_GB]": "PipeWire based Framebuffer for KRfb.", "Description[es]": "Framebuffer basado en PipeWire para KRfb.", + "Description[ko]": "KRfb용 PipeWire 기반 프레임버퍼입니다.", "Description[nl]": "Op PipeWire gebaseerd framebuffer voor KRfb.", "Description[pt]": "'Framebuffer' baseado no PipeWire para o KRfb.", "Description[sv]": "Rambuffert för Krfb baserad på PipeWire", @@ -19,6 +20,7 @@ "Name[ca]": "«Framebuffer» del PipeWire per al KRfb", "Name[en_GB]": "PipeWire Framebuffer for KRfb", "Name[es]": "Framebuffer de PipeWire para KRfb", + "Name[ko]": "KRfb용 PipeWire 프레임버퍼", "Name[nl]": "PipeWire-framebuffer voor KRfb", "Name[pt]": "'Framebuffer' do PipeWire para o KRfb", "Name[sv]": "PipeWire-rambuffert för Krfb", diff --git a/krfb/krfb-events.desktop b/krfb/krfb-events.desktop index 4e556540..49fb37c5 100644 --- a/krfb/krfb-events.desktop +++ b/krfb/krfb-events.desktop @@ -7,6 +7,7 @@ Comment[ca]=Connectors d'esdeveniments per al KRfb. Comment[ca@valencia]=Connectors d'esdeveniments per al KRfb. Comment[en_GB]=Event plugins for KRfb Comment[es]=Complementos de eventos para KRfb +Comment[ko]=KRfb 이벤트 플러그인 Comment[nl]=Plug-ins voor gebeurtenis voor KRfb Comment[pt]='Plugins' de eventos para o KRfb Comment[sv]=Händelseinsticksprogram för Krfb diff --git a/krfb/krfb-events.json b/krfb/krfb-events.json index aae7ed34..9575728a 100644 --- a/krfb/krfb-events.json +++ b/krfb/krfb-events.json @@ -5,6 +5,7 @@ "Description[ca]": "Connectors d'esdeveniments per al KRfb.", "Description[en_GB]": "Events plugins for KRfb", "Description[es]": "Complementos de eventos para KRfb", + "Description[ko]": "KRfb 이벤트 플러그인", "Description[nl]": "Plug-ins voor gebeurtenis voor KRfb", "Description[pt]": "'Plugins' de eventos para o KRfb", "Description[sv]": "Händelseinsticksprogram för Krfb",