From 23825bfca3a4122bb0830f8258c943c406441ad4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 13 Jun 2015 11:31:00 +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" --- src/org.kde.PartitionManager.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org.kde.PartitionManager.desktop b/src/org.kde.PartitionManager.desktop index 6bdf699..f1fa064 100644 --- a/src/org.kde.PartitionManager.desktop +++ b/src/org.kde.PartitionManager.desktop @@ -84,7 +84,7 @@ GenericName[nds]=Partitschonen-Editor GenericName[nl]=Partitiebewerker GenericName[nn]=Partisjonsredigering GenericName[pa]=ਪਾਰਟੀਸ਼ਨ ਐਡੀਟਰ -GenericName[pl]=Zarządzanie partycjami dla KDE +GenericName[pl]=Zarządzanie partycjami GenericName[pt]=Editor de Partições GenericName[pt_BR]=Editor de partições GenericName[ro]=Editor de partiții