From b50a4807aa2dc7e211aed20b566596322dd9563b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 20 Aug 2018 05:35:00 +0200 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" --- containment/metadata.desktop.cmake | 1 + containment/package/metadata.desktop | 1 + .../plasma-containmentactions-lattecontextmenu.desktop | 2 ++ kwin_scripts/activatelattelaunchermenu/metadata.desktop | 2 ++ shell/metadata.desktop.cmake | 3 +++ shell/package/metadata.desktop | 3 +++ 6 files changed, 12 insertions(+) diff --git a/containment/metadata.desktop.cmake b/containment/metadata.desktop.cmake index 9f7d96bef..68b2c4980 100644 --- a/containment/metadata.desktop.cmake +++ b/containment/metadata.desktop.cmake @@ -33,6 +33,7 @@ Comment[el]=Περιέκτης της εφαρμογής Latte Comment[en_GB]=Containment provided for the Latte Dock Comment[es]=Contención proporcionada para Latte Dock Comment[eu]=Konfinamendua hornitu da Latte Dockentzako +Comment[fi]=Latte-telakalla tarjottu sisällytys Comment[gl]=Contedor fornecido para a doca Latte. Comment[it]=Contenitore fornito per Latte Dock Comment[nl]=Container geleverd voor de Latte Dock diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop index e03311912..ee1a24daf 100644 --- a/containment/package/metadata.desktop +++ b/containment/package/metadata.desktop @@ -33,6 +33,7 @@ Comment[el]=Περιέκτης της εφαρμογής Latte Comment[en_GB]=Containment provided for the Latte Dock Comment[es]=Contención proporcionada para Latte Dock Comment[eu]=Konfinamendua hornitu da Latte Dockentzako +Comment[fi]=Latte-telakalla tarjottu sisällytys Comment[gl]=Contedor fornecido para a doca Latte. Comment[it]=Contenitore fornito per Latte Dock Comment[nl]=Container geleverd voor de Latte Dock diff --git a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop index b7ee5ec11..fa4580165 100644 --- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop +++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop @@ -8,6 +8,7 @@ Name[el]=Προκαθορισμένο Μενού Latte Name[en_GB]=Standard Latte Menu Name[es]=Menú estándar de Latte Name[eu]=Latte menu estandarra +Name[fi]=Latten vakiovalikko Name[gl]=Menú estándar de Latte Name[it]=Menu standard di Latte Name[nl]=Standaard menu van Latte @@ -27,6 +28,7 @@ Comment[el]=Το προκαθορισμένο μενού του Latte που ε Comment[en_GB]=The latte menu that normally shows on right-click Comment[es]=Este es el menú de Latte que normalmente se muestra tras un clic derecho Comment[eu]=Eskuineko botoiaz klik eginda agertu ohi den latte menua +Comment[fi]=Latte-valikko, joka tavallisesti näytetään hiiren oikealla painikkeella Comment[gl]=O menú de Latte que adoita mostrarse ao premer co botón secundario. Comment[it]=Il menu di Latte che normalmente viene mostrato al clic destro Comment[nl]=Het menu van latte dat normaal getoond wordt bij rechtsklikken diff --git a/kwin_scripts/activatelattelaunchermenu/metadata.desktop b/kwin_scripts/activatelattelaunchermenu/metadata.desktop index 5d26ac903..5958e4d7b 100644 --- a/kwin_scripts/activatelattelaunchermenu/metadata.desktop +++ b/kwin_scripts/activatelattelaunchermenu/metadata.desktop @@ -7,6 +7,7 @@ Name[el]=Ενεργοποίηση Μενού Εφαρμογών στο Latte Name[en_GB]=Activate Latte Launcher Menu Name[es]=Activar menú de lanzadores de Latte Name[eu]=Aktibatu Latte abiarazle menua +Name[fi]=Aktivoi Latten käynnistysvalikko Name[gl]=Activar o menú iniciador de Latte Name[it]=Attiva il menu del lanciatore di Latte Name[nl]=Latte-startprogramma activeren @@ -26,6 +27,7 @@ Comment[el]=Ενεργοποίηση Μενού Εφαρμογών στο Latte Comment[en_GB]=Activate Latte Launcher Menu from screen edge Comment[es]=Activar menú de lanzadores de Latte desde el borde de la pantalla Comment[eu]=Aktibatu Latte abiarazle menua pantaila ertzean +Comment[fi]=Aktivoi Latten käynistysvalikko näytön reunalta Comment[gl]=Activar o menú iniciador de Latte desde unha esquina da pantalla. Comment[it]=Attiva il menu del lanciatore di Latte dal bordo dello schermo Comment[nl]=Latte-startprogramma activeren vanaf de schermrand diff --git a/shell/metadata.desktop.cmake b/shell/metadata.desktop.cmake index 30c99f509..9a2290a2e 100644 --- a/shell/metadata.desktop.cmake +++ b/shell/metadata.desktop.cmake @@ -10,6 +10,7 @@ Name[el]=Κέλυφος Latte Name[en_GB]=Latte Shell Name[es]=Consola de Latte Name[eu]=Latte Shell-a +Name[fi]=Latte-käyttöliittymä Name[gl]=Intérprete de ordes de Latte Name[it]=shell Latte Name[nl]=Latte-shell @@ -31,6 +32,7 @@ Comment[el]=Κέλυφος που παρέχεται από την εφαρμο Comment[en_GB]=Shell provided for the Latte Dock Comment[es]=Shell proporcionada para Latte Dock Comment[eu]=Shell-a Latte Dockentzat +Comment[fi]=Latte-telakalle tarjottu käyttöliittymä Comment[gl]=Intérprete de ordes fornecido para a doca Latte. Comment[it]=Shell fornita per Latte Dock Comment[nl]=Shell geleverd voor de Latte Dock @@ -53,6 +55,7 @@ Keywords[el]=κέλυφος Keywords[en_GB]=shell Keywords[es]=consola Keywords[eu]=shell +Keywords[fi]=käyttöliittymä Keywords[gl]=intérprete de ordes Keywords[it]=shell Keywords[nl]=shell diff --git a/shell/package/metadata.desktop b/shell/package/metadata.desktop index 01927029f..d2b541d85 100644 --- a/shell/package/metadata.desktop +++ b/shell/package/metadata.desktop @@ -10,6 +10,7 @@ Name[el]=Κέλυφος Latte Name[en_GB]=Latte Shell Name[es]=Consola de Latte Name[eu]=Latte Shell-a +Name[fi]=Latte-käyttöliittymä Name[gl]=Intérprete de ordes de Latte Name[it]=shell Latte Name[nl]=Latte-shell @@ -31,6 +32,7 @@ Comment[el]=Κέλυφος που παρέχεται από την εφαρμο Comment[en_GB]=Shell provided for the Latte Dock Comment[es]=Shell proporcionada para Latte Dock Comment[eu]=Shell-a Latte Dockentzat +Comment[fi]=Latte-telakalle tarjottu käyttöliittymä Comment[gl]=Intérprete de ordes fornecido para a doca Latte. Comment[it]=Shell fornita per Latte Dock Comment[nl]=Shell geleverd voor de Latte Dock @@ -53,6 +55,7 @@ Keywords[el]=κέλυφος Keywords[en_GB]=shell Keywords[es]=consola Keywords[eu]=shell +Keywords[fi]=käyttöliittymä Keywords[gl]=intérprete de ordes Keywords[it]=shell Keywords[nl]=shell