From ae495bcc6025a68774d90a00e56876986a05ceb7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 8 Apr 2019 05:48:04 +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" --- src/plugins/MouseGestures/metadata.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/MouseGestures/metadata.desktop b/src/plugins/MouseGestures/metadata.desktop index a8e8657ac..05677bd03 100644 --- a/src/plugins/MouseGestures/metadata.desktop +++ b/src/plugins/MouseGestures/metadata.desktop @@ -10,7 +10,7 @@ Name[es]=Gestos de ratón Name[fi]=Hiirieleet Name[fr]=Mouvements de souris Name[gl]=Xestos do rato -Name[id]=Gerak-gerik Mouse +Name[id]=Gestur Mouse Name[it]=Gesti del mouse Name[nl]=Muisgebaren Name[nn]=Muserørsler @@ -34,7 +34,7 @@ Comment[es]=Implementa la navegación en páginas web mediante gestos de ratón Comment[fi]=Tarjoaa tuen verkkosivujen selaamiseksi hiirielein Comment[fr]=Prise en charge de la navigation Internet à l'aide de mouvements de la souris Comment[gl]=Permite navegar por páxinas web con acenos co rato -Comment[id]=Menyediakan dukungan untuk menavigasi dalam halaman web dengan gerak-gerik mouse +Comment[id]=Menyediakan dukungan untuk menavigasi dalam halaman web dengan gestur mouse Comment[it]=Fornisce un supporto alla navigazione nelle pagine web per mezzo di gesti del mouse Comment[nl]=Biedt ondersteuning voor navigeren in webpagina's door muisgebaren Comment[nn]=Gjev støtte for muserørsler for nettsidenavigering