From f32dde2af74eb6b76e375ccdcebc1dabf8a578e6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 2 Mar 2020 05:47:18 +0100 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 | 1 - framebuffers/pipewire/krfb_framebuffer_pw.json | 2 -- krfb/krfb-events.desktop | 1 - krfb/krfb-events.json | 1 - 4 files changed, 5 deletions(-) diff --git a/events/x11/krfb_events_x11.json b/events/x11/krfb_events_x11.json index 638cf83f..9ee3d24f 100644 --- a/events/x11/krfb_events_x11.json +++ b/events/x11/krfb_events_x11.json @@ -41,7 +41,6 @@ "Name[fi]": "KRfb:n X11-tapahtumakäsittelijä", "Name[fr]": "Gestionnaire d'évènements X11 pour KRfb", "Name[gl]": "Xestor de eventos de X11 para KRfb", - "Name[ia]": "Gerente de evento de X11 per KRfb", "Name[it]": "Gestore eventi X11 per KRfb", "Name[ko]": "KRfb X11 이벤트 핸들러", "Name[nl]": "Op X11 behandelaar van gebeurtenis voor KRfb", diff --git a/framebuffers/pipewire/krfb_framebuffer_pw.json b/framebuffers/pipewire/krfb_framebuffer_pw.json index 1f791111..58f9b342 100644 --- a/framebuffers/pipewire/krfb_framebuffer_pw.json +++ b/framebuffers/pipewire/krfb_framebuffer_pw.json @@ -14,7 +14,6 @@ "Description[fi]": "KRfb:n PipeWire-pohjainen kehyspuskuri.", "Description[fr]": "Tampon d'images utilisant PipeWire pour KRfb.", "Description[gl]": "Búfer de fotograma para KRfb baseado en PipeWire.", - "Description[ia]": "Framebuffer basate sur PipeWire per KRfb", "Description[it]": "Framebuffer basato su PipeWire per KRfb.", "Description[ko]": "KRfb용 PipeWire 기반 프레임버퍼입니다.", "Description[nl]": "Op PipeWire gebaseerd framebuffer voor KRfb.", @@ -45,7 +44,6 @@ "Name[fi]": "KRfb:n PipeWire-kehyspuskuri", "Name[fr]": "Tampon d'images PipeWire pour KRfb", "Name[gl]": "Búfer de fotograma de PipeWire para KRfb", - "Name[ia]": "Framebuffer basate sur PipeWire per KRfb", "Name[it]": "Framebuffer PipeWire per KRfb", "Name[ko]": "KRfb용 PipeWire 프레임버퍼", "Name[nl]": "PipeWire-framebuffer voor KRfb", diff --git a/krfb/krfb-events.desktop b/krfb/krfb-events.desktop index 004ccaa4..9f8a4caf 100644 --- a/krfb/krfb-events.desktop +++ b/krfb/krfb-events.desktop @@ -15,7 +15,6 @@ Comment[eu]=KRfb-rako gertaeren pluginak Comment[fi]=KRfb:n tapahtumaliitännäinen Comment[fr]=Modules externes d'événements pour Krfb Comment[gl]=Complementos de eventos para KRfb -Comment[ia]=Plug-ins de evento per KRfb Comment[it]=Estensioni degli eventi per KRfb Comment[ko]=KRfb 이벤트 플러그인 Comment[nl]=Plug-ins voor gebeurtenis voor KRfb diff --git a/krfb/krfb-events.json b/krfb/krfb-events.json index 2369a6ac..7a85bce8 100644 --- a/krfb/krfb-events.json +++ b/krfb/krfb-events.json @@ -13,7 +13,6 @@ "Description[fi]": "KRfb:n tapahtumaliitännäinen", "Description[fr]": "Modules externes d'évènements pour KRfb", "Description[gl]": "Complementos de eventos para KRfb", - "Description[ia]": "Plug-ins de eventos per KRfb", "Description[it]": "Estensioni degli eventi per KRfb", "Description[ko]": "KRfb 이벤트 플러그인", "Description[nl]": "Plug-ins voor gebeurtenis voor KRfb",