From cfec678f687bbcbd047f99c90ff6d6481f0f8242 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 10 Oct 2018 06:14:12 +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" --- app/org.kde.latte-dock.desktop.cmake | 1 - containment/metadata.desktop.cmake | 1 - containment/package/metadata.desktop | 1 - 3 files changed, 3 deletions(-) diff --git a/app/org.kde.latte-dock.desktop.cmake b/app/org.kde.latte-dock.desktop.cmake index bd567c7d0..2754705bb 100644 --- a/app/org.kde.latte-dock.desktop.cmake +++ b/app/org.kde.latte-dock.desktop.cmake @@ -1,6 +1,5 @@ [Desktop Entry] Name=Latte -Name[ast]=Latte Name[ca]=Latte Name[ca@valencia]=Latte Name[cs]=Latte diff --git a/containment/metadata.desktop.cmake b/containment/metadata.desktop.cmake index 68b2c4980..54da3bd99 100644 --- a/containment/metadata.desktop.cmake +++ b/containment/metadata.desktop.cmake @@ -1,7 +1,6 @@ [Desktop Entry] Encoding=UTF-8 Name=Latte -Name[ast]=Latte Name[ca]=Latte Name[ca@valencia]=Latte Name[cs]=Latte diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop index ee1a24daf..f05959aca 100644 --- a/containment/package/metadata.desktop +++ b/containment/package/metadata.desktop @@ -1,7 +1,6 @@ [Desktop Entry] Encoding=UTF-8 Name=Latte -Name[ast]=Latte Name[ca]=Latte Name[ca@valencia]=Latte Name[cs]=Latte