From 6ed35fcca3950a54dd5dbd80b90ecd7761467692 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 8 Jan 2018 06:05: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" --- generators/markdown/libokularGenerator_md.json | 1 + generators/markdown/okularApplication_md.desktop | 1 + generators/markdown/org.kde.mobile.okular_md.desktop | 1 + 3 files changed, 3 insertions(+) diff --git a/generators/markdown/libokularGenerator_md.json b/generators/markdown/libokularGenerator_md.json index 2984ad449..8e77edc79 100644 --- a/generators/markdown/libokularGenerator_md.json +++ b/generators/markdown/libokularGenerator_md.json @@ -33,6 +33,7 @@ "Name[el]": "Σύστημα υποστήριξης markdown", "Name[es]": "Motor para Markdown", "Name[fr]": "Moteur de markdown", + "Name[gl]": "Infraestrutura de Markdown", "Name[ia]": "Retro-Administration Markdown", "Name[it]": "Backend Markdown", "Name[ko]": "Markdown 백엔드", diff --git a/generators/markdown/okularApplication_md.desktop b/generators/markdown/okularApplication_md.desktop index b574e4447..fc43dd8a5 100644 --- a/generators/markdown/okularApplication_md.desktop +++ b/generators/markdown/okularApplication_md.desktop @@ -175,6 +175,7 @@ X-KDE-Keywords[el]=Markdown X-KDE-Keywords[en_GB]=Markdown X-KDE-Keywords[es]=Markdown X-KDE-Keywords[fr]=Markdown +X-KDE-Keywords[gl]=Markdown X-KDE-Keywords[ia]=Markdown X-KDE-Keywords[it]=Markdown X-KDE-Keywords[ko]=Markdown diff --git a/generators/markdown/org.kde.mobile.okular_md.desktop b/generators/markdown/org.kde.mobile.okular_md.desktop index b54e3678e..a8ef6016b 100644 --- a/generators/markdown/org.kde.mobile.okular_md.desktop +++ b/generators/markdown/org.kde.mobile.okular_md.desktop @@ -164,6 +164,7 @@ X-KDE-Keywords[el]=Markdown X-KDE-Keywords[en_GB]=Markdown X-KDE-Keywords[es]=Markdown X-KDE-Keywords[fr]=Markdown +X-KDE-Keywords[gl]=Markdown X-KDE-Keywords[ia]=Markdown X-KDE-Keywords[it]=Markdown X-KDE-Keywords[ko]=Markdown