From 50c2cebdd6c43b9686542e1f5b03b1da36070d9c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 13 Jan 2020 09:36:25 +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" --- linux/applications/org.kde.falkon.desktop | 2 +- src/plugins/TabManager/metadata.desktop | 4 ++-- src/plugins/VerticalTabs/metadata.desktop | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop index 7f12acc63..dd2f4a900 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -103,7 +103,7 @@ Name[en_GB]=Open new tab Name[es]=Abrir nueva pestaña Name[fi]=Avaa uusi välilehti Name[fr]=Ouvrir un nouvel onglet -Name[gl]=Abrir unha lapela nova +Name[gl]=Abrir un novo separador Name[id]=Buka tab baru Name[it]=Apri una nuova scheda Name[ko]=새 탭 열기 diff --git a/src/plugins/TabManager/metadata.desktop b/src/plugins/TabManager/metadata.desktop index 10241b59f..1c13d3981 100644 --- a/src/plugins/TabManager/metadata.desktop +++ b/src/plugins/TabManager/metadata.desktop @@ -9,7 +9,7 @@ Name[en_GB]=Tab Manager Name[es]=Gestor de pestañas Name[fi]=Välilehtien hallinta Name[fr]=Gestionnaire d'onglets -Name[gl]=Xestor de lapelas +Name[gl]=Xestor de separadores Name[id]=Tab Manager Name[it]=Gestore delle schede Name[ko]=탭 관리자 @@ -34,7 +34,7 @@ Comment[en_GB]=Adds ability to managing tabs and windows Comment[es]=Añade la posibilidad de gestionar pestañas y ventanas Comment[fi]=Lisää kyvyn hallita välilehtiä ja ikkunoita Comment[fr]=Ajout d'une capacité de gestion des onglets et des fenêtres -Comment[gl]=Engade a posibilidade de xestionar lapelas e xanelas +Comment[gl]=Permite xestionar separadores e xanelas Comment[id]=Menambah kemampuan untuk mengelola tab dan window Comment[it]=Aggiunge la capacità di gestione delle schede e delle finestre Comment[ko]=탭과 창 관리 기능 diff --git a/src/plugins/VerticalTabs/metadata.desktop b/src/plugins/VerticalTabs/metadata.desktop index c8ad6c4a0..4bef23213 100644 --- a/src/plugins/VerticalTabs/metadata.desktop +++ b/src/plugins/VerticalTabs/metadata.desktop @@ -9,7 +9,7 @@ Name[en_GB]=Vertical Tabs Name[es]=Pestañas verticales Name[fi]=Pystyvälilehdet Name[fr]=Onglets verticaux -Name[gl]=Lapelas verticais +Name[gl]=Separadores verticais Name[id]=Vertical Tabs Name[it]=Schede verticali Name[ko]=수직 탭 @@ -34,7 +34,7 @@ Comment[en_GB]=Adds ability to show tabs in sidebar Comment[es]=Añade la posibilidad de mostrar pestañas en la barra lateral Comment[fi]=Lisää kyvyn näyttää välilehdet sivupalkissa Comment[fr]=Prise en charge de l'affichage des onglets dans le panneau latéral -Comment[gl]=Engade a posibilidade de mostrar lapelas na barra lateral +Comment[gl]=Permite mostrar separadores na barra lateral Comment[id]=Menambah kemampuan untuk menampilkan tab dalam bilah sisi Comment[it]=Aggiunge la capacità di mostrare le schede nella barra laterale Comment[ko]=사이드바에 탭 표시