From a273ec2bc3dde691e82cc24d3a6461ba254593e3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 18 Mar 2020 06:00:00 +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" --- 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 de4a372249..dda7ecc893 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -12,6 +12,7 @@ Name[nl]=Oog op scherm Name[nn]=Auge på skjerm Name[pt]=Olho no Ecrã Name[pt_BR]=Olho na tela +Name[ru]=Втягивание окон в центр экрана Name[sv]=Ögat på skärmen Name[uk]=Око на екрані Name[x-test]=xxEye on Screenxx @@ -30,6 +31,7 @@ Comment[nl]=Zuig vensters in het bureaublad Comment[nn]=Sug vindauge inn i skrivebordet Comment[pt]=Aspira as janelas para o ecrã Comment[pt_BR]=Suga as janelas para a área de trabalho +Comment[ru]=Втягивание окон в центр рабочего стола Comment[sv]=Sug in fönster i skrivbordet Comment[uk]=Засмоктування вікон до стільниці Comment[x-test]=xxSuck windows into the desktopxx diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index 67ed1a3b59..d5b2854ad1 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -54,6 +54,7 @@ Comment[nl]=Verplaats vensters in de hoeken van het scherm Comment[nn]=Flytt vindauge til skjermhjørne Comment[pt]=Mover as janelas para os cantos do ecrã Comment[pt_BR]=Move as janelas para os cantos da tela +Comment[ru]=Перемещение окон в углы экрана Comment[sv]=Flytta fönster till skärmhörn Comment[uk]=Пересування вікон до кутів екрана Comment[x-test]=xxMove windows into screen cornersxx