From 5f8a7768569417b56f3f66515cac35e8e0aecf1d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 29 Feb 2020 05:47:22 +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 47dd6f0532..0f50ee9f8c 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -4,6 +4,7 @@ Name[ca]=Ull a la pantalla Name[et]=Eye on Screen Name[nl]=Oog op scherm Name[pt]=Olho no Ecrã +Name[pt_BR]=Olho na tela Name[sv]=Ögat på skärmen Name[uk]=Око на екрані Name[x-test]=xxEye on Screenxx @@ -14,6 +15,7 @@ Comment[ca]=Enganxa les finestres a l'escriptori Comment[et]=Akende imemine töölauale Comment[nl]=Zuig vensters in het bureaublad Comment[pt]=Aspira as janelas para o ecrã +Comment[pt_BR]=Suga as janelas para a área de trabalho 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 926971e737..1182692ed6 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -46,6 +46,7 @@ Comment[ca]=Mou les finestres cap a les cantonades de la pantalla Comment[et]=Akende liigutamine ekraani nurkadesse Comment[nl]=Verplaats vensters in de hoeken van het scherm Comment[pt]=Mover as janelas para os cantos do ecrã +Comment[pt_BR]=Move as janelas para os cantos da tela Comment[sv]=Flytta fönster till skärmhörn Comment[uk]=Пересування вікон до кутів екрана Comment[x-test]=xxMove windows into screen cornersxx