From 75604b10ea067fa4cf2541ff1dbaf7c1a1821e25 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 24 Oct 2017 05:11:28 +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" --- 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 5c9a0dd20..5f47c8471 100644 --- a/generators/markdown/libokularGenerator_md.json +++ b/generators/markdown/libokularGenerator_md.json @@ -44,6 +44,7 @@ "Name[sr@latin]": "Pozadina za Markdown", "Name[sr]": "Позадина за маркдаун", "Name[sv]": "Markdown-gränssnitt", + "Name[tr]": "Markdown Arka Ucu", "Name[uk]": "Модуль Markdown", "Name[x-test]": "xxMarkdown Backendxx", "Name[zh_CN]": "Markdown 后端", diff --git a/generators/markdown/okularApplication_md.desktop b/generators/markdown/okularApplication_md.desktop index 0856e31a8..c013a8242 100644 --- a/generators/markdown/okularApplication_md.desktop +++ b/generators/markdown/okularApplication_md.desktop @@ -186,6 +186,7 @@ X-KDE-Keywords[sr@ijekavian]=Markdown,маркдаун X-KDE-Keywords[sr@ijekavianlatin]=Markdown,Markdown X-KDE-Keywords[sr@latin]=Markdown,Markdown X-KDE-Keywords[sv]=Markdown +X-KDE-Keywords[tr]=Markdown X-KDE-Keywords[uk]=Markdown X-KDE-Keywords[x-test]=xxMarkdownxx X-KDE-Keywords[zh_CN]=Markdown diff --git a/generators/markdown/org.kde.mobile.okular_md.desktop b/generators/markdown/org.kde.mobile.okular_md.desktop index f18cacfa3..855ba9bd5 100644 --- a/generators/markdown/org.kde.mobile.okular_md.desktop +++ b/generators/markdown/org.kde.mobile.okular_md.desktop @@ -175,6 +175,7 @@ X-KDE-Keywords[sr@ijekavian]=Markdown,маркдаун X-KDE-Keywords[sr@ijekavianlatin]=Markdown,Markdown X-KDE-Keywords[sr@latin]=Markdown,Markdown X-KDE-Keywords[sv]=Markdown +X-KDE-Keywords[tr]=Markdown X-KDE-Keywords[uk]=Markdown X-KDE-Keywords[x-test]=xxMarkdownxx X-KDE-Keywords[zh_CN]=Markdown