From 1c8afa165b03dc935e23b5fc8c9de607b32e3aeb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 20 Aug 2019 05:01: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.json | 2 ++ events/xdp/krfb_events_xdp.json | 2 ++ framebuffers/pipewire/krfb_framebuffer_pw.json | 2 ++ krfb/krfb-events.json | 1 + 4 files changed, 7 insertions(+) diff --git a/events/x11/krfb_events_x11.json b/events/x11/krfb_events_x11.json index 6855e837..62559cb2 100644 --- a/events/x11/krfb_events_x11.json +++ b/events/x11/krfb_events_x11.json @@ -13,6 +13,7 @@ "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[nn]": "X11 XFakeInput-basert hendingshandtering for KRfb", "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", @@ -37,6 +38,7 @@ "Name[it]": "Gestore eventi X11 per KRfb", "Name[ko]": "KRfb X11 이벤트 핸들러", "Name[nl]": "Op X11 behandelaar van gebeurtenis voor KRfb", + "Name[nn]": "X11-hendingshandsamar for KRfb", "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", diff --git a/events/xdp/krfb_events_xdp.json b/events/xdp/krfb_events_xdp.json index f6d2618e..a1786552 100644 --- a/events/xdp/krfb_events_xdp.json +++ b/events/xdp/krfb_events_xdp.json @@ -13,6 +13,7 @@ "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[nn]": "Xdg-desktop-portal-basert hendingshandtering for KRfb", "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", @@ -37,6 +38,7 @@ "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[nn]": "Xdg-desktop-portal-hendingshandtering for KRfb", "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", diff --git a/framebuffers/pipewire/krfb_framebuffer_pw.json b/framebuffers/pipewire/krfb_framebuffer_pw.json index 0f206773..ffa348f2 100644 --- a/framebuffers/pipewire/krfb_framebuffer_pw.json +++ b/framebuffers/pipewire/krfb_framebuffer_pw.json @@ -13,6 +13,7 @@ "Description[it]": "Framebuffer basato su PipeWire per KRfb.", "Description[ko]": "KRfb용 PipeWire 기반 프레임버퍼입니다.", "Description[nl]": "Op PipeWire gebaseerd framebuffer voor KRfb.", + "Description[nn]": "PipeWire-basert biletbuffer for KRfb.", "Description[pl]": "Bufor ramki oparty na PipeWire dla KRfb.", "Description[pt]": "'Framebuffer' baseado no PipeWire para o KRfb.", "Description[pt_BR]": "Framebuffer baseado no PipeWire para o KRfb.", @@ -38,6 +39,7 @@ "Name[it]": "Framebuffer PipeWire per KRfb", "Name[ko]": "KRfb용 PipeWire 프레임버퍼", "Name[nl]": "PipeWire-framebuffer voor KRfb", + "Name[nn]": "PipeWire-biletbuffer for KRfb", "Name[pl]": "Wtyczki buforów ramek PipeWire dla KRfb", "Name[pt]": "'Framebuffer' do PipeWire para o KRfb", "Name[pt_BR]": "Framebuffer PipeWire para o KRfb", diff --git a/krfb/krfb-events.json b/krfb/krfb-events.json index 8c88b7bb..4960afb3 100644 --- a/krfb/krfb-events.json +++ b/krfb/krfb-events.json @@ -13,6 +13,7 @@ "Description[it]": "Estensioni degli eventi per KRfb", "Description[ko]": "KRfb 이벤트 플러그인", "Description[nl]": "Plug-ins voor gebeurtenis voor KRfb", + "Description[nn]": "Hendingstillegg for KRfb", "Description[pl]": "Wtyczki wydarzeń dla KRfb", "Description[pt]": "'Plugins' de eventos para o KRfb", "Description[pt_BR]": "Plugins de evento para o KRfb",