From eecef65e5eaf93be8e1bbc049277862a8af452c6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 5 Dec 2019 09:27:16 +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" --- applets/panelspacer/metadata.desktop | 2 +- dataengines/mouse/plasma-dataengine-mouse.desktop | 2 +- runners/kill/plasma-runner-kill.desktop | 2 +- runners/windowedwidgets/plasma-runner-windowedwidgets.desktop | 4 ++-- runners/windows/plasma-runner-windows.desktop | 2 +- .../lookandfeel/plasma-packagestructure-lookandfeel.desktop | 1 - templates/ion-dataengine/ion-dataengine.kdevtemplate | 4 ++-- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/applets/panelspacer/metadata.desktop b/applets/panelspacer/metadata.desktop index 2adf374d9..ea8304a16 100644 --- a/applets/panelspacer/metadata.desktop +++ b/applets/panelspacer/metadata.desktop @@ -23,7 +23,7 @@ Name[he]=מרווח לוח Name[hr]=Razmak na traci Name[hu]=Panelelválasztó Name[ia]=Spatiator de pannello -Name[id]=Peruang Panel +Name[id]=Panel Spacer Name[is]=Spjaldabil Name[it]=Spaziatore del pannello Name[ja]=パネルのスペーサー diff --git a/dataengines/mouse/plasma-dataengine-mouse.desktop b/dataengines/mouse/plasma-dataengine-mouse.desktop index 4ff2a25ae..cea697d24 100644 --- a/dataengines/mouse/plasma-dataengine-mouse.desktop +++ b/dataengines/mouse/plasma-dataengine-mouse.desktop @@ -27,7 +27,7 @@ Name[hne]=पाइन्टर स्थिति Name[hr]=Pozicija pokazivača miša Name[hu]=Egérpozíció Name[ia]=Position de punctator -Name[id]=Posisi Penunjuk +Name[id]=Posisi Pointer Name[is]=Staðsetning bendils Name[it]=Posizione del puntatore Name[ja]=マウスポインタの位置 diff --git a/runners/kill/plasma-runner-kill.desktop b/runners/kill/plasma-runner-kill.desktop index 022d8e9c1..806ee8179 100644 --- a/runners/kill/plasma-runner-kill.desktop +++ b/runners/kill/plasma-runner-kill.desktop @@ -92,7 +92,7 @@ Comment[he]=עצירת יישומים הפועלים כעת Comment[hr]=Zaustavi aplikacije koje su trenutno pokrenute Comment[hu]=Jelenleg futó alkalmazások leállítása Comment[ia]=Stoppa applicationes que il es currentemente executante -Comment[id]=Stop aplikasi yang saat ini tengah berjalan +Comment[id]=Menghentikan aplikasi yang saat ini tengah berjalan Comment[is]=Stöðva forrit sem eru keyrandi Comment[it]=Ferma le applicazioni attualmente in esecuzione Comment[ja]=実行中のアプリケーションを停止します diff --git a/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop b/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop index e2a531b19..486dae7a4 100644 --- a/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop +++ b/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop @@ -22,7 +22,7 @@ Name[hi]=विंडोज़ विडजेट Name[hr]=Widgeti u prozorima Name[hu]=Önálló widgetek Name[ia]=Widgets (elemento graphic) in le fenestra -Name[id]=Widget per-window-an +Name[id]=Windowed widgets Name[is]=Græjur í gluggum Name[it]=Oggetti a finestra Name[ja]=ウィンドウ化されたウィジェット @@ -83,7 +83,7 @@ Comment[he]=משמש למציאת ווידג׳טים של Plasma אשר ניתן Comment[hr]=Pronađi Plasma widgete koji se mogu pokrenuti kao zasebni prozori Comment[hu]=Megkeresi az önálló alkalmazásként futtatható Plasma-elemeket Comment[ia]=Trova widgets (elementos graphic) de plasma que on pote executar como fenestras sole -Comment[id]=Temukan widget Plasma yang dapat dijalankan sebagai window-window mandiri +Comment[id]=Temukan widget Plasma yang bisa berjalan sebagai window mandiri Comment[is]=Finnur Plasmagræjur sem hægt er að keyra sem sjálfstæð forrit Comment[it]=Trova i plasmoidi che possono essere eseguiti come finestre a sé Comment[ja]=スタンドアローンのウィンドウとして起動できる Plasma ウィジェットを検索します diff --git a/runners/windows/plasma-runner-windows.desktop b/runners/windows/plasma-runner-windows.desktop index 94435fc72..d1bf0f20e 100644 --- a/runners/windows/plasma-runner-windows.desktop +++ b/runners/windows/plasma-runner-windows.desktop @@ -29,7 +29,7 @@ Name[hi]=विंडोज़ Name[hr]=Prozori Name[hu]=Ablakok Name[ia]=Fenestras -Name[id]=Window +Name[id]=Windows Name[is]=Gluggar Name[it]=Finestre Name[ja]=ウィンドウ diff --git a/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop b/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop index 82faf4a77..3d5e41d7c 100644 --- a/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop +++ b/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop @@ -19,7 +19,6 @@ Name[gl]=Aparencia e comportamento Name[he]=מראה ותחושה Name[hu]=Megjelenés Name[ia]=Semblantia -Name[id]=Nuansa dan Suasana Name[is]=Útlit og viðmót Name[it]=Aspetto Name[ja]=外観 diff --git a/templates/ion-dataengine/ion-dataengine.kdevtemplate b/templates/ion-dataengine/ion-dataengine.kdevtemplate index e7d810c74..22cac095e 100644 --- a/templates/ion-dataengine/ion-dataengine.kdevtemplate +++ b/templates/ion-dataengine/ion-dataengine.kdevtemplate @@ -15,7 +15,7 @@ Name[fi]=Plasma Weather Ion -tietomoottori Name[fr]=Moteur de données météo Plasma Ion Name[gl]=Motor de datos de Ion Weather para Plasma Name[hu]=Plasma Weather Ion adatmodul -Name[id]=MesinData Ion Cuaca Plasma +Name[id]=Plasma Weather Ion Dataengine Name[it]=Motore Ion di Plasma Weather Name[ko]=Plasma 날씨 Ion 데이터 엔진 Name[nl]=Plasma gegevensengine voor weersvoorspelling @@ -51,7 +51,7 @@ Comment[fi]=Plasma Weather -tietomoottorin erityinen Plasma-alitietomoottori, jo Comment[fr]=Un sous-moteur de données Plasma spécial pour le moteur de données météo Plasma, permettant l'accès à un fournisseur de service de données météorologiques Comment[gl]=Un motor de datos subordinado especial de Plasma para o motor de datos de meteorolóxicos de Plasma, que fornece acceso a un fornecedor de servizo de datos meteorolóxicos. Comment[hu]=Speciális Plasma al-adatmodul a Plasma Weather adatmodulhoz, amely hozzáférést biztosít egy időjárásadat-szolgáltatóhoz -Comment[id]=Sebuah sub-dataengine Plasma spesial untuk mesin-data Plasma Weather, menyediakan akses ke satu penyedia layanan data cuaca +Comment[id]=Sebuah sub-dataengine Plasma spesial untuk mesin-data Plasma Weather, menyediakan akses ke salahsatu penyedia layanan data cuaca Comment[it]=Uno speciale sotto-motore per il motore di dati Plasma Weather, che fornisce l'accesso a un provider di servizi dati meteo Comment[ko]=Plasma 날씨 데이터 엔진에 사용하는 Plasma 하위 데이터 엔진으로 하나의 데이터 서비스 공급자에게 접근할 수 있도록 함 Comment[nl]=Een speciale Plasma sub-dataengine voor de Plasma weer-dataengine, die toegang biedt tot een serviceprovider van weergegevens