From 1a23694b329c07d4d0c3796b6f5ecd2aea39e8b1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 13 Aug 2019 05:25:56 +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 41bf4265..dc7fbea2 100644 --- a/events/x11/krfb_events_x11.desktop +++ b/events/x11/krfb_events_x11.desktop @@ -16,6 +16,7 @@ Comment[nn]=X11 XFakeInput-basert hendingshandtering for KRfb Comment[pl]=Obsługa wydarzeń X11 oparta na XFakeInput dla KRfb Comment[pt]=Tratamento de eventos baseado no XFakeInput do X11 para o KRfb Comment[pt_BR]=Manipulador de eventos baseado no XFakeInput do X11 para o KRfb +Comment[sk]=X11 Spracovateľ udalostí založený na XFakeInput pre 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 @@ -37,6 +38,7 @@ Name[nn]=X11 XFakeInput-basert hendingshandtering for KRfb Name[pl]=Obsługa wydarzeń X11 oparta na XFakeInput dla KRfb Name[pt]=Tratamento de eventos baseado no XFakeInput do X11 para o KRfb Name[pt_BR]=Manipulador de eventos baseado no XFakeInput do X11 para o KRfb +Name[sk]=X11 Spracovateľ udalostí založený na XFakeInput pre 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 diff --git a/events/x11/krfb_events_x11.json b/events/x11/krfb_events_x11.json index ff71a904..6855e837 100644 --- a/events/x11/krfb_events_x11.json +++ b/events/x11/krfb_events_x11.json @@ -16,6 +16,7 @@ "Description[pl]": "Obsługa wydarzeń X11 oparta na XFakeInput dla KRfb", "Description[pt]": "Tratamento de eventos baseado no XFakeInput do X11 para o KRfb", "Description[pt_BR]": "Manipulador de eventos baseado no XFakeInput do X11 para o KRfb", + "Description[sk]": "X11 Spracovateľ udalostí založený na XFakeInput pre 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", @@ -39,6 +40,7 @@ "Name[pl]": "Obsługa wydarzeń X11 dla KRfb", "Name[pt]": "Tratamento de eventos do X11 para o KRfb", "Name[pt_BR]": "Manipulador de eventos do X11 para o KRfb", + "Name[sk]": "X11 Obsluha udalostí pre KRfb", "Name[sv]": "X11-händelsehanterare för Krfb", "Name[uk]": "Обробник подій для KRfb на основі X11", "Name[x-test]": "xxX11 Event handler for KRfbxx", diff --git a/events/xdp/krfb_events_xdp.desktop b/events/xdp/krfb_events_xdp.desktop index 0d7ba35e..82b1c615 100644 --- a/events/xdp/krfb_events_xdp.desktop +++ b/events/xdp/krfb_events_xdp.desktop @@ -16,6 +16,7 @@ Comment[nn]=Xdg-desktop-portal-basert hendingshandtering for KRfb Comment[pl]=Obsługa wydarzeń oparta na Xdg-desktop-portal dla KRfb Comment[pt]=Tratamento de eventos baseado no Xdg-desktop-portal para o KRfb Comment[pt_BR]=Manipulador de eventos baseado no xdg-desktop-portal para o KRfb +Comment[sk]=Obsluha udalostí založená na Xdg-desktop-portal pre 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 @@ -37,6 +38,7 @@ Name[nn]=Xdg-desktop-portal-basert hendingshandtering for KRfb Name[pl]=Obsługa wydarzeń oparta na Xdg-desktop-portal dla KRfb Name[pt]=Tratamento de eventos baseado no Xdg-desktop-portal para o KRfb Name[pt_BR]=Manipulador de eventos baseado no xdg-desktop-portal para o KRfb +Name[sk]=Obsluha udalostí založená na Xdg-desktop-portal pre 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 diff --git a/events/xdp/krfb_events_xdp.json b/events/xdp/krfb_events_xdp.json index c8182e8f..f6d2618e 100644 --- a/events/xdp/krfb_events_xdp.json +++ b/events/xdp/krfb_events_xdp.json @@ -16,6 +16,7 @@ "Description[pl]": "Obsługa wydarzeń oparta na Xdg-desktop-portal dla KRfb", "Description[pt]": "Tratamento de eventos baseado no Xdg-desktop-portal para o KRfb", "Description[pt_BR]": "Manipulador de eventos baseado no xdg-desktop-portal para o KRfb", + "Description[sk]": "Obsluha udalostí založená na Xdg-desktop-portal pre 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", @@ -39,6 +40,7 @@ "Name[pl]": "Obsługa wydarzeń Xdg-desktop-portal dla KRfb", "Name[pt]": "Tratamento de eventos do Xdg-desktop-portal para o KRfb", "Name[pt_BR]": "Manipulador de eventos xdg-desktop-portal para o KRfb", + "Name[sk]": "Xdg-desktop-portal Obsluha udalostí pre 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", diff --git a/framebuffers/pipewire/krfb_framebuffer_pw.json b/framebuffers/pipewire/krfb_framebuffer_pw.json index 71b98c4b..0f206773 100644 --- a/framebuffers/pipewire/krfb_framebuffer_pw.json +++ b/framebuffers/pipewire/krfb_framebuffer_pw.json @@ -17,6 +17,7 @@ "Description[pt]": "'Framebuffer' baseado no PipeWire para o KRfb.", "Description[pt_BR]": "Framebuffer baseado no PipeWire para o KRfb.", "Description[ru]": "Буфер кадров для KRfb на базе Framebuffer", + "Description[sk]": "Framebuffer založený na PipeWire pre KRfb.", "Description[sv]": "Rambuffert för Krfb baserad på PipeWire", "Description[uk]": "Буфер кадрів на основі PipeWire для KRfb.", "Description[x-test]": "xxPipeWire based Framebuffer for KRfb.xx", @@ -41,6 +42,7 @@ "Name[pt]": "'Framebuffer' do PipeWire para o KRfb", "Name[pt_BR]": "Framebuffer PipeWire para o KRfb", "Name[ru]": "Буфер кадров PipeWire для KRfb", + "Name[sk]": "PipeWire Framebuffer pre KRfb", "Name[sv]": "PipeWire-rambuffert för Krfb", "Name[uk]": "Буфер кадрів PipeWire для KRfb", "Name[x-test]": "xxPipeWire Framebuffer for KRfbxx", diff --git a/krfb/krfb-events.desktop b/krfb/krfb-events.desktop index 6ac6bc50..8f45780d 100644 --- a/krfb/krfb-events.desktop +++ b/krfb/krfb-events.desktop @@ -19,6 +19,7 @@ Comment[nn]=Hendingstillegg for KRfb Comment[pl]=Wtyczki wydarzeń dla KRfb Comment[pt]='Plugins' de eventos para o KRfb Comment[pt_BR]=Plugins de evento para o KRfb +Comment[sk]=Doplnky udalostí pre KRfb Comment[sv]=Händelseinsticksprogram för Krfb Comment[uk]=Додатки обробки подій для KRfb Comment[x-test]=xxEvent plugins for KRfbxx diff --git a/krfb/krfb-events.json b/krfb/krfb-events.json index 2e9bd024..8c88b7bb 100644 --- a/krfb/krfb-events.json +++ b/krfb/krfb-events.json @@ -16,6 +16,7 @@ "Description[pl]": "Wtyczki wydarzeń dla KRfb", "Description[pt]": "'Plugins' de eventos para o KRfb", "Description[pt_BR]": "Plugins de evento para o KRfb", + "Description[sk]": "Doplnky udalostí pre KRfb", "Description[sv]": "Händelseinsticksprogram för Krfb", "Description[uk]": "Додатки обробки подій для KRfb", "Description[x-test]": "xxEvents plugins for KRfbxx",