From 889a574fcdde7d378cdcec75ffc5972b39efbf55 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 30 Dec 2015 09:19:37 +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/dolphinpart.desktop | 2 +- src/settings/kcm/kcmdolphingeneral.desktop | 4 ++-- src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index d063af3a9e..93d07704b6 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -73,7 +73,7 @@ Name[id]=Ikon Name[it]=Icone Name[ja]=アイコン Name[ko]=아이콘 -Name[lt]=Piktogramos +Name[lt]=Ženkliukai Name[nb]=Ikoner Name[nl]=Pictogrammen Name[nn]=Ikon diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index e810ebff9d..3801aa3d83 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -56,7 +56,7 @@ Comment[id]=Layanan ini memungkinkan konfigurasi pengaturan umum Dolphin. Comment[it]=Questo servizio permette di configurare le impostazioni generali di Dolphin. Comment[ja]=Dolphin の全般的な設定を行います Comment[ko]=이 서비스는 일반 Dolphin 설정을 담당합니다. -Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin bendruosius nustatymus. +Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin bendrąsias nuostatas. Comment[nb]=Med denne tjenesten kan du sette opp generelle innstillinger for Dolphin. Comment[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren. Comment[nn]=Denne tenesta lèt deg setja opp generelle innstillingar for Dolphin. @@ -145,7 +145,7 @@ Comment[id]=Konfigurasi pengaturan manajer berkas umum Comment[it]=Configura le impostazioni generali del gestore dei file Comment[ja]=ファイルマネージャの全般的な設定を行います Comment[ko]=일반 파일 관리자 설정 -Comment[lt]=Bendrųjų failų tvarkyklės nustatymų konfigūravimas +Comment[lt]=Bendrųjų failų tvarkyklės nuostatų konfigūravimas Comment[nb]=Sett opp generelle innstillinger for filbehandleren Comment[nl]=Algemene bestandsbeheerderinstellingen configureren Comment[nn]=Set opp generelle innstillingar for filhandsamaren diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 13bf4066d5..80a17efc60 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -19,7 +19,7 @@ Comment[id]=Plugin Kontrol Versi untuk Tampilan Berkas Comment[it]=Estensione di controllo delle versioni per le viste dei file Comment[ja]=ファイルビューのためのバージョン管理プラグイン Comment[ko]=파일 보기를 위한 버전 관리 플러그인 -Comment[lt]=Versijų kontrolės priedas failų tvarkyklėms +Comment[lt]=Versijų kontrolės papildinys failų tvarkyklėms Comment[nb]=Versjonskontrollmodul for filvisninger Comment[nl]=Plugin voor versiecontrole op bestandoverzichten Comment[nn]=Versjonskontroll-tillegg for filvisingar