From fa7b0a3fa09c574145c71ae1135da9d18103c442 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 9 Nov 2019 05:26:47 +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" --- .../umscollection/amarok_collection-umscollection.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core-impl/collections/umscollection/amarok_collection-umscollection.desktop b/src/core-impl/collections/umscollection/amarok_collection-umscollection.desktop index 25441555cb..fb5a81b25a 100644 --- a/src/core-impl/collections/umscollection/amarok_collection-umscollection.desktop +++ b/src/core-impl/collections/umscollection/amarok_collection-umscollection.desktop @@ -22,7 +22,7 @@ Name[gl]=Colección de almacenamento masivo universal Name[hu]=Univerzális tárolóhoz (UMS) tartozó gyűjtemény Name[id]=Koleksi Mass Storage Universal Name[is]=Universal Mass Storage safn -Name[it]=Collezione universale di memorizzazione di massa +Name[it]=Collezione archiviazione universale di massa (UMS) Name[ja]=Universal Mass Storage コレクション Name[km]=សម្រាំង​ឧបករណ៍​​ផ្ទុក​សកល Name[ko]=UMS 모음집