From ad559c5d9339f60ee96ed0f4f925f7ecea73ff8e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 4 Dec 2017 06:13:21 +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 4c6423d6d..2984ad449 100644 --- a/generators/markdown/libokularGenerator_md.json +++ b/generators/markdown/libokularGenerator_md.json @@ -35,6 +35,7 @@ "Name[fr]": "Moteur de markdown", "Name[ia]": "Retro-Administration Markdown", "Name[it]": "Backend Markdown", + "Name[ko]": "Markdown 백엔드", "Name[nl]": "Markdown-backend", "Name[nn]": "Markdown-motor", "Name[pl]": "Silnik Markdown", diff --git a/generators/markdown/okularApplication_md.desktop b/generators/markdown/okularApplication_md.desktop index 0b990f2a7..b574e4447 100644 --- a/generators/markdown/okularApplication_md.desktop +++ b/generators/markdown/okularApplication_md.desktop @@ -177,6 +177,7 @@ X-KDE-Keywords[es]=Markdown X-KDE-Keywords[fr]=Markdown X-KDE-Keywords[ia]=Markdown X-KDE-Keywords[it]=Markdown +X-KDE-Keywords[ko]=Markdown X-KDE-Keywords[nl]=Markdown X-KDE-Keywords[nn]=Markdown X-KDE-Keywords[pl]=Markdown diff --git a/generators/markdown/org.kde.mobile.okular_md.desktop b/generators/markdown/org.kde.mobile.okular_md.desktop index ab08f7b54..b54e3678e 100644 --- a/generators/markdown/org.kde.mobile.okular_md.desktop +++ b/generators/markdown/org.kde.mobile.okular_md.desktop @@ -166,6 +166,7 @@ X-KDE-Keywords[es]=Markdown X-KDE-Keywords[fr]=Markdown X-KDE-Keywords[ia]=Markdown X-KDE-Keywords[it]=Markdown +X-KDE-Keywords[ko]=Markdown X-KDE-Keywords[nl]=Markdown X-KDE-Keywords[nn]=Markdown X-KDE-Keywords[pl]=Markdown