From 2b9cec93b0d042d0b016e954aefaa8bc72ad0d34 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 4 Jan 2020 06:13:11 +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" --- wallpaper/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/wallpaper/metadata.desktop b/wallpaper/metadata.desktop index 48b439d5..6adee3d0 100644 --- a/wallpaper/metadata.desktop +++ b/wallpaper/metadata.desktop @@ -4,6 +4,7 @@ Name[ca]=Bloqueigs de 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[et]=Plasma telefonilukustajad Name[eu]=Plasma telefono giltzatzaileak Name[fr]=Verrouillage de téléphone Plasma Name[gl]=Casilleiros de Plasma Phone