From 061687238b5c499f6c9ffcf6103b58badb9a6a81 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 1 Mar 2020 05:50:50 +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 0f50ee9f8c..70bd83110b 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -2,6 +2,7 @@ Name=Eye on Screen Name[ca]=Ull a la pantalla Name[et]=Eye on Screen +Name[eu]=Begirada pantailan Name[nl]=Oog op scherm Name[pt]=Olho no Ecrã Name[pt_BR]=Olho na tela @@ -13,6 +14,7 @@ Icon=preferences-system-windows-effect-eyeonscreen Comment=Suck windows into the desktop Comment[ca]=Enganxa les finestres a l'escriptori Comment[et]=Akende imemine töölauale +Comment[eu]=Mahaigainak leihoak xurgatu 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 diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index 1182692ed6..dd01f91c70 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -44,6 +44,7 @@ Icon=preferences-system-windows-effect-windowaperture Comment=Move windows into screen corners Comment[ca]=Mou les finestres cap a les cantonades de la pantalla Comment[et]=Akende liigutamine ekraani nurkadesse +Comment[eu]=Eraman leihoak pantailako bazterretara 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