From 4248f4d9ac2694523d36c0e417c4a31c04d2b57a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 25 Jun 2020 05:49:56 +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" --- effects/eyeonscreen/package/metadata.desktop | 2 ++ effects/windowaperture/package/metadata.desktop | 1 + 2 files changed, 3 insertions(+) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index 60e1123ec8..a9c452334c 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -6,6 +6,7 @@ Name[en_GB]=Eye on Screen Name[es]=Ojo a la pantalla Name[et]=Eye on Screen Name[eu]=Begirada pantailan +Name[fi]=Silmä näytöllä Name[fr]=Jeter un oeil sur le bureau Name[ia]=Eye On Screen (Oculo sur schermo) Name[id]=Mata di Layar @@ -30,6 +31,7 @@ Comment[en_GB]=Suck windows into the desktop Comment[es]=Aspirar las ventanas en el escritorio Comment[et]=Akende imemine töölauale Comment[eu]=Mahaigainak leihoak xurgatu +Comment[fi]=Imaise ikkunat työpöydälle Comment[fr]=Faire disparaître les fenêtres dans le bureau Comment[ia]=Suger fenestras in le scriptorio Comment[id]=Sedot window ke desktop diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index ba9b3063ff..2905d3c42e 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -48,6 +48,7 @@ Comment[en_GB]=Move windows into screen corners Comment[es]=Mover las ventanas a las esquinas de la pantalla Comment[et]=Akende liigutamine ekraani nurkadesse Comment[eu]=Eraman leihoak pantailako bazterretara +Comment[fi]=Siirrä ikkunat näytön kulmiin Comment[fr]=Déplace les fenêtres dans les coins de l'écran Comment[ia]=Move fenestra in angulos de schermo Comment[id]=Pindahkan window ke sudut layar