From 85ede03a57ab76e899e08992c8c0e4aa341a24aa Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 4 Jun 2017 05:39:14 +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/fade/package/metadata.desktop | 2 +- effects/maximize/package/metadata.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/effects/fade/package/metadata.desktop b/effects/fade/package/metadata.desktop index 30bdf2511b..3158f226ca 100644 --- a/effects/fade/package/metadata.desktop +++ b/effects/fade/package/metadata.desktop @@ -50,7 +50,7 @@ Name[ne]=फेड Name[nl]=Opkomen/vervagen Name[nn]=Ton inn og ut Name[pa]=ਫਿੱਕਾ -Name[pl]=Znikanie/wyłanianie +Name[pl]=Zanikanie/wyłanianie Name[pt]=Desvanecer Name[pt_BR]=Fade Name[ro]=Decolorare diff --git a/effects/maximize/package/metadata.desktop b/effects/maximize/package/metadata.desktop index 4768ad12ae..ea28966978 100644 --- a/effects/maximize/package/metadata.desktop +++ b/effects/maximize/package/metadata.desktop @@ -27,7 +27,7 @@ Comment[nb]=Animering for et vindu som maksimeres/tilbakestilles fra maksimering Comment[nds]=Animeren för en Finster, dat maximeert/vun maximeert wedderherstellt warrt Comment[nl]=Animatie voor een venster dat gaat naar maximaliseren/herstellen vanuit maximaliseren Comment[nn]=Vindaugsanimasjon i samband med bruk av maksimering/gjenoppretting. -Comment[pl]=Efekt skalowania okien przy ich maksymalizowaniu i powrocie z niego +Comment[pl]=Efekt skalowania okien przy maksymalizowaniu i powrocie z niego Comment[pt]=Animação para um janela que se vai maximizar/repor da maximização Comment[pt_BR]=Animação para uma janela a ser maximizada/restaurada Comment[ro]=Animație pentru o fereastră ce trece la maximizare/restabilire din maximizare