From a8189399af4ca70704553fa17ce0478afb3c6487 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 22 Sep 2017 04:55:58 +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" --- src/org.kde.partitionmanager.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop index dccb88e..14ed611 100644 --- a/src/org.kde.partitionmanager.desktop +++ b/src/org.kde.partitionmanager.desktop @@ -164,6 +164,7 @@ Keywords[ca]=partició;disc; Keywords[ca@valencia]=partició;disc; Keywords[cs]=oddíl;disk; Keywords[es]=partición;disco; +Keywords[it]=partizione;disco; Keywords[nl]=partitie;schijf Keywords[pt]=partição;disco; Keywords[sr]=partition;disk;партиција;диск;