From 9d8b2f8daf8a8c0842ea5cf43547aff301913101 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 28 Jul 2019 05:18:46 +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" --- shell/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/shell/metadata.desktop b/shell/metadata.desktop index d415d2a7..51b2bce8 100644 --- a/shell/metadata.desktop +++ b/shell/metadata.desktop @@ -31,6 +31,7 @@ Comment[gl]=Intérprete de ordes de Plasma para móbiles Comment[it]=Shell di Plasma per telefoni Comment[ko]=휴대폰용 Plasma 셸 Comment[nl]=Plasma-shell voor telefoons +Comment[pl]=Powłoka Plazmy dla telefonów Comment[pt]=Área de trabalho Plasma para telemóveis Comment[sv]=Plasma skal för telefoner Comment[uk]=Оболонка Плазми для телефонів