From 004c84a849d51d1fea476e432dc4640c795e05ed Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 12 Oct 2017 04:56:47 +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" --- framebuffers/xcb/krfb_framebuffer_xcb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framebuffers/xcb/krfb_framebuffer_xcb.json b/framebuffers/xcb/krfb_framebuffer_xcb.json index b3e3862d..1c004da0 100644 --- a/framebuffers/xcb/krfb_framebuffer_xcb.json +++ b/framebuffers/xcb/krfb_framebuffer_xcb.json @@ -13,7 +13,7 @@ "Description[et]": "KRfb X11 XDamage/XShm põhine kaadripuhver", "Description[fi]": "X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.", "Description[fr]": "Tampon d'images utilisant XDamage/XShm de X11 pour KRfb.", - "Description[gl]": "Framebuffer baseado en Xll XDamage/Xshm para XRfb.", + "Description[gl]": "Framebuffer baseado en X11 XDamage/Xshm para XRfb.", "Description[ia]": "Framebuffer basate sur X11 XDamage/XShm per KRfb.", "Description[it]": "Framebuffer basato su XDamage/XShm di X11 per KRfb.", "Description[ko]": "KRfb용 X11 XDamage/XShm 기반 프레임버퍼입니다.",