From 6bb1653746518a462a265139927b6d19a49f885f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 3 Mar 2021 07:53:40 +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" --- applets/activities/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/applets/activities/metadata.desktop b/applets/activities/metadata.desktop index 93f4e21e..3aee4dc2 100644 --- a/applets/activities/metadata.desktop +++ b/applets/activities/metadata.desktop @@ -43,6 +43,7 @@ Comment[ca]=Commutador de l'activitat per al telèfon Comment[ca@valencia]=Commutador de l'activitat per al telèfon Comment[cs]=Přepínač aktivit pro telefon Comment[da]=Aktivitetsskifter til telefon +Comment[de]=Aktivitätenwechsler für das Telefon Comment[en_GB]=Activity switcher for the phone Comment[es]=Selector de actividad para el teléfono Comment[et]=Telefoni tegevuste lülitaja