From f6b79afcf50490ed4113e83561a2c556f18e87df Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 2 Mar 2016 09:38:31 +0000 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" --- kmail/editorplugins/zoomtext/kmail_zoomtexteditorplugin.json | 1 + .../donottrack/messageviewer_donottrackurlinterceptor.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kmail/editorplugins/zoomtext/kmail_zoomtexteditorplugin.json b/kmail/editorplugins/zoomtext/kmail_zoomtexteditorplugin.json index 81d1c101..0fae0337 100644 --- a/kmail/editorplugins/zoomtext/kmail_zoomtexteditorplugin.json +++ b/kmail/editorplugins/zoomtext/kmail_zoomtexteditorplugin.json @@ -5,6 +5,7 @@ "Name[ca]": "Amplia el text", "Name[de]": "Text vergrößern", "Name[es]": "Ampliar texto", + "Name[it]": "Ingrandisci testo", "Name[nl]": "Tekst zoomen", "Name[pl]": "Powiększ tekst", "Name[pt]": "Ampliar o Texto", diff --git a/plugins/messageviewerwebengineurlinterceptor/donottrack/messageviewer_donottrackurlinterceptor.json b/plugins/messageviewerwebengineurlinterceptor/donottrack/messageviewer_donottrackurlinterceptor.json index 4e375daf..0cfcdd68 100644 --- a/plugins/messageviewerwebengineurlinterceptor/donottrack/messageviewer_donottrackurlinterceptor.json +++ b/plugins/messageviewerwebengineurlinterceptor/donottrack/messageviewer_donottrackurlinterceptor.json @@ -6,4 +6,4 @@ ], "Version": "1.0" } -} +} \ No newline at end of file -- GitLab