From ce3faee1052366c5a0d5fa2eba35ed56e65b5686 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 12 Jun 2015 10:26:58 +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/plugins/dummy/pmdummybackendplugin.desktop | 2 +- src/plugins/libparted/pmlibpartedbackendplugin.desktop | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/dummy/pmdummybackendplugin.desktop b/src/plugins/dummy/pmdummybackendplugin.desktop index a336062..5d02cb8 100644 --- a/src/plugins/dummy/pmdummybackendplugin.desktop +++ b/src/plugins/dummy/pmdummybackendplugin.desktop @@ -71,7 +71,7 @@ Comment[nds]=En Platzholler-Hülpprogramm för KDE-Partitschonenpleger, testwies Comment[nl]=Dummy backend van KDE-partitiebeheerder voor testdoeleinden Comment[pa]=ਟੈਸਟ ਕਰਨ ਲਈ KDE ਪਾਰਟੀਸ਼ਨ ਮੈਨੇਜਰ ਫ਼ਰਜ਼ੀ ਬੈਕਐਂਡ Comment[pl]=Fikcyjny silnik zarządzania partycjami do prób. -Comment[pt]=Uma infra-estrutura de exemplo do Gestor de Partições do KDE para fins de testes. +Comment[pt]=Uma infra-estrutura de testes do Gestor de Partições do KDE. Comment[pt_BR]=Uma infraestrutura de testes do gerenciador de partições do KDE. Comment[ro]=Machetă de platformă pentru Gestionarul de partiții KDE, destinată testelor. Comment[ru]=Проверочный механизм для диспетчера разделов для KDE. diff --git a/src/plugins/libparted/pmlibpartedbackendplugin.desktop b/src/plugins/libparted/pmlibpartedbackendplugin.desktop index 3e35b1f..41ff2e2 100644 --- a/src/plugins/libparted/pmlibpartedbackendplugin.desktop +++ b/src/plugins/libparted/pmlibpartedbackendplugin.desktop @@ -27,7 +27,7 @@ Name[nds]=LibParted-Hülpprogramm för KDE-Partitschonenpleger Name[nl]=KDE-partitiebeheerder LibParted-backend Name[pa]=ਕੇਡੀਈ ਪਾਰਟੀਸ਼ਨ ਮੈਨੇਜਰ LibParted ਬੈਕਐਂਡ Name[pl]=Silnik LibParted zarządzania partycjami -Name[pt]=Infra-Estrutura da LibParted do Gestor de Partições do KDE +Name[pt]=Infra-Estrutura da LibParted para o Gestor de Partições do KDE Name[pt_BR]=Infraestrutura LibParted do gerenciador de partições do KDE Name[ro]=Platformă LibParted pentru Gestionarul de partiții KDE Name[ru]=Механизм LibParted @@ -71,7 +71,7 @@ Comment[nds]=Dat LibParted-Hülpprogramm för KDE-Partitschonenpleger Comment[nl]=De LibParted-backend voor de KDE-partitiebeheerder Comment[pa]=ਕੇਡੀਈ ਪਾਰਟੀਸ਼ਨ ਮੈਨੇਜਰ ਲਈ LibParted ਬੈਕਐਂਡ Comment[pl]=Silnik LibParted dla zarządzania partycjami -Comment[pt]=A infra-estrutura com a LibParted para o Gestor de Partições do KDE +Comment[pt]=A infra-estrutura da LibParted para o Gestor de Partições do KDE Comment[pt_BR]=Uma infraestrutura LibParted para o gerenciador de partições do KDE Comment[ro]=Platforma LibParted pentru Gestionarul de partiții KDE Comment[ru]=Механизм LibParted для диспетчера разделов для KDE