From 91612fcb558a44c7b541a08bf3f4866fd4d220c5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 13 Jan 2020 05:40: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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop index 1a2cf50d7..6677f7252 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -106,7 +106,7 @@ Name[es]=Abrir nueva pestaña Name[et]=Uue kaardi avamine 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]=새 탭 열기