From 66b0dec43e526b1f080625eefe5f7703bd6fea02 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 2 Nov 2017 04:46:37 +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" --- src/data/kmail2.notifyrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/kmail2.notifyrc b/src/data/kmail2.notifyrc index cdd99d9c0..ab187b504 100644 --- a/src/data/kmail2.notifyrc +++ b/src/data/kmail2.notifyrc @@ -447,7 +447,7 @@ Name[es]=Archivado de correos en carpeta terminado Name[et]=Kirjad on kausta arhiveeritud Name[fi]=Viestien arkistointi kansioihin valmis Name[fr]=Archivage des dossiers terminé -Name[gl]=Rematou Arquivar o correo +Name[gl]=Rematou «Arquivar o correo do cartafol» Name[hu]=A levelek archiválása a mappában befejeződött Name[ia]=Action de archivar posta in dossier terminate Name[it]=Operazione di archiviazione della posta per cartelle completata