From 006d127b098bd70c1a4096f1db7b2086be6f46e4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 7 Jan 2017 06:37:50 +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" --- effects/morphingpopups/package/metadata.desktop | 1 + effects/windowaperture/package/metadata.desktop | 2 ++ kcmkwin/kwincompositing/kwineffect.knsrc | 1 + kcmkwin/kwinscripts/kwinscripts.knsrc | 1 + kcmkwin/kwintabbox/kwinswitcher.knsrc | 1 + plugins/kdecorations/aurorae/src/aurorae.knsrc | 1 + scripts/minimizeall/metadata.desktop | 1 + 7 files changed, 8 insertions(+) diff --git a/effects/morphingpopups/package/metadata.desktop b/effects/morphingpopups/package/metadata.desktop index 7c5127d306..6464bcdce3 100644 --- a/effects/morphingpopups/package/metadata.desktop +++ b/effects/morphingpopups/package/metadata.desktop @@ -44,6 +44,7 @@ Name[eu]=Eraldatzen diren gainerakorrak Name[fi]=Ponnahdusikkunoiden muodonmuutos Name[fr]=Fondu des menus surgissants Name[gl]=Xanelas emerxentes cambiantes +Name[ia]=Popups de Morphing Name[it]=Finestre a comparsa che si trasformano Name[ko]=변형되는 팝업 Name[nl]=Morphing popups diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index bb284946e0..f289b1c176 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -13,6 +13,7 @@ Name[eu]=Leihoa irekitzea Name[fi]=Ikkunoiden siirto näytön kulmiin Name[fr]=Ouverture de la fenêtre Name[gl]=Apertura das xanelas +Name[ia]=Aperturas de fenestra Name[it]=Apertura delle finestre Name[ko]=조리개 모양 배치 Name[lt]=Lango anga @@ -50,6 +51,7 @@ Comment[eu]=Mugitu leihoa izkinetan mahaigana erakutsi bitartean Comment[fi]=Siirrä ikkunat näytön kulmiin työpöydän näyttämisen ajaksi Comment[fr]=Déplace les fenêtres dans les coins en affichant le bureau Comment[gl]=Mover a xanela ás esquinas mentres se mostra o escritorio. +Comment[ia]=Move fenestra a le angulos quando monstra scriptorio Comment[it]=Sposta la finestra negli angoli quando mostri il desktop Comment[ja]=デスクトップを表示している間に、ウインドウを角に移動させます Comment[ko]=데스크톱을 보일 때 창을 모서리로 이동 diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc index 5cd15b081e..b3ec61ea78 100644 --- a/kcmkwin/kwincompositing/kwineffect.knsrc +++ b/kcmkwin/kwincompositing/kwineffect.knsrc @@ -4,6 +4,7 @@ Name[ca]=Efectes del gestor de finestres Name[ca@valencia]=Efectes del gestor de finestres Name[en_GB]=Window Manager Effects Name[es]=Efectos del gestor de ventanas +Name[ia]=Gerente de effectos de fenestra Name[it]=Effetti del gestore delle finestre Name[nl]=Effecten van vensterbeheerder Name[pl]=Efekty zarządzania oknami diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc index 7a3d96a1e2..e26d69c8d8 100644 --- a/kcmkwin/kwinscripts/kwinscripts.knsrc +++ b/kcmkwin/kwinscripts/kwinscripts.knsrc @@ -4,6 +4,7 @@ Name[ca]=Scripts del gestor de finestres Name[ca@valencia]=Scripts del gestor de finestres Name[en_GB]=Window Manager Scripts Name[es]=Guiones del gestor de ventanas +Name[ia]=Gerente de scripts de fenestra Name[it]=Script del gestore delle finestre Name[nl]=Scripts van vensterbeheerder Name[pl]=Skrypty zarządzania oknami diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc index e47c259122..eb2032ee23 100644 --- a/kcmkwin/kwintabbox/kwinswitcher.knsrc +++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc @@ -4,6 +4,7 @@ Name[ca]=Disposicions del commutador del gestor de finestres Name[ca@valencia]=Disposicions del commutador del gestor de finestres Name[en_GB]=Window Manager Switching Layouts Name[es]=Esquemas de cambio del gestor de ventanas +Name[ia]=Disposition de commutator de gerente de fenestra Name[it]=Disposizione scambiafinestre del gestore delle finestre Name[nl]=Omschakelende indelingen van vensterbeheerder Name[pl]=Układ przełączania zarządzana oknami diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc index 1b8dbb5419..ac047cf548 100644 --- a/plugins/kdecorations/aurorae/src/aurorae.knsrc +++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc @@ -4,6 +4,7 @@ Name[ca]=Decoracions de finestra Aurorae Name[ca@valencia]=Decoracions de finestra Aurorae Name[en_GB]=Aurorae Window Decorations Name[es]=Decoración de ventanas Aurorae +Name[ia]=Decorationes de fenestra Aurorae Name[it]=Decorazioni delle finestre Aurorae Name[nl]=Aurorea-vensterdecoraties Name[pl]=Ozdoby okienne Aurorae diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index 52a8db8dc1..78b1f2ef2b 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -14,6 +14,7 @@ Name[fi]=Pienennä kaikki Name[fr]=Tout réduire Name[gl]=Minimizalo todo Name[he]=מזער הכל +Name[ia]=MaximizaOmne Name[it]=Minimizza tutto Name[ja]=すべて最小化 Name[ko]=모두최소화