From f5467f826cf2a018226bfb92126892f6638721d8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 3 Jun 2019 05:29:38 +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 | 4 ++++ events/x11/krfb_events_x11.json | 4 ++++ events/xdp/krfb_events_xdp.desktop | 4 ++++ events/xdp/krfb_events_xdp.json | 4 ++++ framebuffers/pipewire/krfb_framebuffer_pw.json | 4 ++++ krfb/krfb-events.desktop | 2 ++ krfb/krfb-events.json | 4 +++- 7 files changed, 25 insertions(+), 1 deletion(-) diff --git a/events/x11/krfb_events_x11.desktop b/events/x11/krfb_events_x11.desktop index 25e4394f..442fb1e7 100644 --- a/events/x11/krfb_events_x11.desktop +++ b/events/x11/krfb_events_x11.desktop @@ -5,23 +5,27 @@ 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[it]=Gestore eventi basato su XFakeInput di X11 per 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 Comment[uk]=Обробник подій для KRfb на основі XFakeInput X11 Comment[x-test]=xxX11 XFakeInput based event handler for KRfbxx +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[en_GB]=X11 XFakeInput based event handler for KRfb Name[es]=Gestor de eventos basado en XFakeInput de X11 para KRfb +Name[it]=Gestore eventi basato su XFakeInput di X11 per 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 Name[uk]=Обробник подій для KRfb на основі XFakeInput X11 Name[x-test]=xxX11 XFakeInput based event handler for KRfbxx +Name[zh_TW]=KRfb 基於 X11 XFakeInput 的事件處理器 Type=Service ServiceTypes=krfb/events diff --git a/events/x11/krfb_events_x11.json b/events/x11/krfb_events_x11.json index 8df9c81b..94b6663b 100644 --- a/events/x11/krfb_events_x11.json +++ b/events/x11/krfb_events_x11.json @@ -6,12 +6,14 @@ "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[it]": "Gestore eventi basato su XFakeInput di X11 per 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", "Description[uk]": "Обробник подій для KRfb на основі XFakeInput X11", "Description[x-test]": "xxX11 XFakeInput based event handler for KRfbxx", + "Description[zh_TW]": "KRfb 基於 X11 XFakeInput 的事件處理器", "EnabledByDefault": true, "Id": "x11", "License": "GPL", @@ -20,12 +22,14 @@ "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[it]": "Gestore eventi X11 per 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", "Name[uk]": "Обробник подій для KRfb на основі X11", "Name[x-test]": "xxX11 Event handler for KRfbxx", + "Name[zh_TW]": "KRfb 的 X11 事件處理器", "ServiceTypes": [ "krfb/events" ], diff --git a/events/xdp/krfb_events_xdp.desktop b/events/xdp/krfb_events_xdp.desktop index 7068fab7..6f682d1c 100644 --- a/events/xdp/krfb_events_xdp.desktop +++ b/events/xdp/krfb_events_xdp.desktop @@ -5,23 +5,27 @@ 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[it]=Gestore eventi basato su xdg-desktop-portal per 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 Comment[uk]=Обробник подій для KRfb на основі Xdg-desktop-portal Comment[x-test]=xxXdg-desktop-portal based event handler for KRfbxx +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[en_GB]=Xdg-desktop-portal based event handler for KRfb Name[es]=Gestor de eventos basado en Xdg-desktop-portal para KRfb +Name[it]=Gestore eventi basato su xdg-desktop-portal per 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 Name[uk]=Обробник подій для KRfb на основі Xdg-desktop-portal Name[x-test]=xxXdg-desktop-portal based event handler for KRfbxx +Name[zh_TW]=KRfb 基於 Xdg-desktop-portal 的事件處理器 Type=Service ServiceTypes=krfb/events diff --git a/events/xdp/krfb_events_xdp.json b/events/xdp/krfb_events_xdp.json index d9465434..7934116f 100644 --- a/events/xdp/krfb_events_xdp.json +++ b/events/xdp/krfb_events_xdp.json @@ -6,12 +6,14 @@ "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[it]": "Gestore eventi basato su xdg-desktop-portal per 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", "Description[uk]": "Обробник подій для KRfb на основі Xdg-desktop-portal", "Description[x-test]": "xxXdg-desktop-portal based event handler for KRfbxx", + "Description[zh_TW]": "KRfb 基於 Xdg-desktop-portal 的事件處理器", "EnabledByDefault": true, "Id": "xdp", "License": "GPL", @@ -20,12 +22,14 @@ "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[it]": "Gestore eventi xdg-desktop-portal per 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", "Name[uk]": "Обробник подій для KRfb на основі Xdg-desktop-portal", "Name[x-test]": "xxXdg-desktop-portal Event handler for KRfbxx", + "Name[zh_TW]": "KRfb 的 Xdg-desktop-portal 事件處理器", "ServiceTypes": [ "krfb/events" ], diff --git a/framebuffers/pipewire/krfb_framebuffer_pw.json b/framebuffers/pipewire/krfb_framebuffer_pw.json index 069d165d..aa4b3bfe 100644 --- a/framebuffers/pipewire/krfb_framebuffer_pw.json +++ b/framebuffers/pipewire/krfb_framebuffer_pw.json @@ -6,12 +6,14 @@ "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[it]": "Framebuffer basato su PipeWire per 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", "Description[uk]": "Буфер кадрів на основі PipeWire для KRfb.", "Description[x-test]": "xxPipeWire based Framebuffer for KRfb.xx", + "Description[zh_TW]": "KRfb 基於 PipeWire 的 Framebuffer。", "EnabledByDefault": true, "Id": "pw", "License": "GPL3", @@ -20,12 +22,14 @@ "Name[ca]": "«Framebuffer» del PipeWire per al KRfb", "Name[en_GB]": "PipeWire Framebuffer for KRfb", "Name[es]": "Framebuffer de PipeWire para KRfb", + "Name[it]": "Framebuffer PipeWire per 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", "Name[uk]": "Буфер кадрів PipeWire для KRfb", "Name[x-test]": "xxPipeWire Framebuffer for KRfbxx", + "Name[zh_TW]": "KRfb 的 PipeWire Framebuffer", "ServiceTypes": [ "krfb/framebuffer" ], diff --git a/krfb/krfb-events.desktop b/krfb/krfb-events.desktop index 49fb37c5..38229bb1 100644 --- a/krfb/krfb-events.desktop +++ b/krfb/krfb-events.desktop @@ -7,10 +7,12 @@ 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[it]=Estensioni degli eventi per 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 Comment[uk]=Додатки обробки подій для KRfb Comment[x-test]=xxEvent plugins for KRfbxx +Comment[zh_TW]=KRfb 的事件外掛程式 diff --git a/krfb/krfb-events.json b/krfb/krfb-events.json index 9575728a..747fc0e3 100644 --- a/krfb/krfb-events.json +++ b/krfb/krfb-events.json @@ -5,12 +5,14 @@ "Description[ca]": "Connectors d'esdeveniments per al KRfb.", "Description[en_GB]": "Events plugins for KRfb", "Description[es]": "Complementos de eventos para KRfb", + "Description[it]": "Estensioni degli eventi per 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", "Description[uk]": "Додатки обробки подій для KRfb", - "Description[x-test]": "xxEvents plugins for KRfbxx" + "Description[x-test]": "xxEvents plugins for KRfbxx", + "Description[zh_TW]": "KRfb 的事件外掛程式" }, "X-KDE-ServiceType": "krfb/events" }