From 43f575b415d0f4b9a32e5cc6ffbd483f7ab32365 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 13 Dec 2017 07:01:42 +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" --- plugins/platforms/drm/drm.json | 2 +- plugins/platforms/fbdev/fbdev.json | 2 +- plugins/platforms/hwcomposer/hwcomposer.json | 2 +- plugins/platforms/virtual/virtual.json | 2 +- plugins/platforms/wayland/wayland.json | 2 +- plugins/platforms/x11/windowed/x11.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/platforms/drm/drm.json b/plugins/platforms/drm/drm.json index da6e9357b2..da3311ebc3 100644 --- a/plugins/platforms/drm/drm.json +++ b/plugins/platforms/drm/drm.json @@ -9,7 +9,7 @@ "Description[es]": "Renderizar a través del nodo DRM.", "Description[et]": "Renderdamine drm režiimis.", "Description[eu]": "Errendatu DRM-korapilunea erabiliz.", - "Description[fi]": "Renderöi DRM-noden läpi.", + "Description[fi]": "Hahmonna DRM-solmun läpi.", "Description[fr]": "Rendre par le biais d'un nœud de rendu « DRM ».", "Description[gl]": "Renderizar a través dun nodo de DRM.", "Description[hu]": "Renderelés drm node-on.", diff --git a/plugins/platforms/fbdev/fbdev.json b/plugins/platforms/fbdev/fbdev.json index 9ff086a6d4..b223aafcde 100644 --- a/plugins/platforms/fbdev/fbdev.json +++ b/plugins/platforms/fbdev/fbdev.json @@ -9,7 +9,7 @@ "Description[es]": "Renderizar en el «framebuffer».", "Description[et]": "Renderdamine kaadripuhvris.", "Description[eu]": "Errendatu framebuffer batera.", - "Description[fi]": "Renderöi framebufferiin.", + "Description[fi]": "Hahmonna framebufferiin.", "Description[fr]": "Rendre sur le « framebuffer ».", "Description[gl]": "Renderizar no búfer de fotogramas.", "Description[hu]": "Renderelés framebufferbe.", diff --git a/plugins/platforms/hwcomposer/hwcomposer.json b/plugins/platforms/hwcomposer/hwcomposer.json index de2a8e50bd..61cb0fc082 100644 --- a/plugins/platforms/hwcomposer/hwcomposer.json +++ b/plugins/platforms/hwcomposer/hwcomposer.json @@ -9,7 +9,7 @@ "Description[es]": "Renderizar a través «hwcomposer» mediante «libhybris».", "Description[et]": "Renderdamine hwcomposeris libhybrise abil.", "Description[eu]": "Errendatu hwcomposer libhybris bidez erabiliz.", - "Description[fi]": "Renderöi hwcomposerin läpi käyttäen libhybristä.", + "Description[fi]": "Hahmonna hwcomposerin läpi libhybristä käyttäen.", "Description[fr]": "Rendre par le biais de « hwcomposer » via « libhybris ».", "Description[gl]": "Renderizar a través de hwcomposer a través de libhybris.", "Description[hu]": "Renderelés hwcomposerrel libhybrisen keresztül.", diff --git a/plugins/platforms/virtual/virtual.json b/plugins/platforms/virtual/virtual.json index 5da2e01078..267292a4f6 100644 --- a/plugins/platforms/virtual/virtual.json +++ b/plugins/platforms/virtual/virtual.json @@ -9,7 +9,7 @@ "Description[es]": "Renderizar en un «framebuffer» virtual.", "Description[et]": "Renderdamine virtuaalses kaadripuhvris.", "Description[eu]": "Errendatu alegiazko framebuffer batera.", - "Description[fi]": "Renderöi virtuaaliseen framebufferiin.", + "Description[fi]": "Hahmonna virtuaaliseen framebufferiin.", "Description[fr]": "Rendre sur un « framebuffer » factice.", "Description[gl]": "Renderizar nun búfer de fotogramas virtual.", "Description[hu]": "Renderelés egy virtuális framebufferbe.", diff --git a/plugins/platforms/wayland/wayland.json b/plugins/platforms/wayland/wayland.json index d1d70b5552..03c1f2affd 100644 --- a/plugins/platforms/wayland/wayland.json +++ b/plugins/platforms/wayland/wayland.json @@ -9,7 +9,7 @@ "Description[es]": "Renderizar en una ventana anidada en el compositor Wayland en ejecución.", "Description[et]": "Renderdamine töötava Waylandi komposiitori pesastatud aknas.", "Description[eu]": "Errendatu Wayland konposatzailean habiaratutako leiho batera.", - "Description[fi]": "Renderöi sisäkkäiseen ikkunaan, jota hallitsee Wayland-koostin.", + "Description[fi]": "Hahmonna sisäkkäiseen ikkunaan, jota hallitsee Wayland-koostin.", "Description[fr]": "Rendre sur une fenêtre imbriquée sur un compositeur Wayland en cours de fonctionnement.", "Description[gl]": "Renderizar unha xanela aniñada no compositor de Wayland en execución.", "Description[hu]": "Renderelés egy Wayland kompozitoron futó beágyazott ablakba.", diff --git a/plugins/platforms/x11/windowed/x11.json b/plugins/platforms/x11/windowed/x11.json index 5b706897d6..ef901fa0b2 100644 --- a/plugins/platforms/x11/windowed/x11.json +++ b/plugins/platforms/x11/windowed/x11.json @@ -9,7 +9,7 @@ "Description[es]": "Renderizar en una ventana anidada en el sistema de ventanas X11.", "Description[et]": "Pesastatud akna renderdamine X11 aknasüsteemis.", "Description[eu]": "Errendatu X11 leiho sistemaren leiho habiaratu batera.", - "Description[fi]": "Renderöi sisäkkäiseen ikkunaan, joka on X11-ikkunointijärjestelmässä.", + "Description[fi]": "Hahmonna X11-ikkunointijärjestelmän sisäkkäiseen ikkunaan.", "Description[fr]": "Rendre sur une fenêtre imbriquée sur le système de fenêtrage X11.", "Description[gl]": "Renderizar unha xanela aniñada no sistema de xanelas X11.", "Description[hu]": "Renderelés egy X11 ablakkezelő rendszeren futó beágyazott ablakba.",