From de87abd067c48d5b2d96fd7f0dd2571165607e74 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 2 May 2017 10:15:05 +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" --- wallpaper/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/wallpaper/metadata.desktop b/wallpaper/metadata.desktop index 646cfc2e..239bc929 100644 --- a/wallpaper/metadata.desktop +++ b/wallpaper/metadata.desktop @@ -4,6 +4,7 @@ Name[ast]=Bloquiadores de Plasma Phone Name[ca]=Bloqueigs del telèfon del Plasma Name[ca@valencia]=Bloqueigs del telèfon del Plasma Name[en_GB]=Plasma Phone Lockers +Name[es]=Bloqueos del teléfono de Plasma Name[nl]=Plasma telefoonvergrendeling Name[nn]=Telefonlåsarar for Plasma Name[pl]=Blokady telefonu plazmy