From dd83f9984ab2d63045d447e0f6287bde099bd450 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 20 Dec 2016 12:40:34 +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" --- krita/data/templates/comics/.directory | 1 - krita/data/templates/dslr/Nikon_D5000_4288x2848.desktop | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/krita/data/templates/comics/.directory b/krita/data/templates/comics/.directory index 7f1112eada..f94fde0611 100644 --- a/krita/data/templates/comics/.directory +++ b/krita/data/templates/comics/.directory @@ -1,6 +1,5 @@ [Desktop Entry] Name=Comic Templates -Name[ast]=Plantíes de comics Name[bs]=Predlošci stripova Name[ca]=Plantilles per a còmics Name[ca@valencia]=Plantilles per a còmics diff --git a/krita/data/templates/dslr/Nikon_D5000_4288x2848.desktop b/krita/data/templates/dslr/Nikon_D5000_4288x2848.desktop index 2359fd6e4e..f1e8d69d7b 100755 --- a/krita/data/templates/dslr/Nikon_D5000_4288x2848.desktop +++ b/krita/data/templates/dslr/Nikon_D5000_4288x2848.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Icon=template_dslr Name=Nikon_D5000_4288x2848 +Name[ast]=Nikon_D5000_4288x2848 Name[bs]=Nikon_D5000_4288x2848 Name[ca]=Nikon_D5000_4288x2848 Name[ca@valencia]=Nikon_D5000_4288x2848 -- GitLab