From daaa084476273c1f3e084825e9ded1a585ef710a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 15 Jan 2018 04:46:05 +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 6a07d7d2b..7f3c4c313 100644 --- a/generators/markdown/libokularGenerator_md.json +++ b/generators/markdown/libokularGenerator_md.json @@ -43,6 +43,7 @@ "Name[pt]": "Infra-Estrutura de Markdown", "Name[ru]": "Модуль поддержки формата Markdown", "Name[sk]": "Markdown backend", + "Name[sl]": "Zaledje za Markdown", "Name[sr@ijekavian]": "Позадина за маркдаун", "Name[sr@ijekavianlatin]": "Pozadina za Markdown", "Name[sr@latin]": "Pozadina za Markdown", diff --git a/generators/markdown/okularApplication_md.desktop b/generators/markdown/okularApplication_md.desktop index c7144ce83..644798292 100644 --- a/generators/markdown/okularApplication_md.desktop +++ b/generators/markdown/okularApplication_md.desktop @@ -188,6 +188,7 @@ X-KDE-Keywords[pt]=Markdown X-KDE-Keywords[pt_BR]=Markdown X-KDE-Keywords[ru]=Markdown X-KDE-Keywords[sk]=Zrážka +X-KDE-Keywords[sl]=Markdown X-KDE-Keywords[sr]=Markdown,маркдаун X-KDE-Keywords[sr@ijekavian]=Markdown,маркдаун X-KDE-Keywords[sr@ijekavianlatin]=Markdown,Markdown diff --git a/generators/markdown/org.kde.mobile.okular_md.desktop b/generators/markdown/org.kde.mobile.okular_md.desktop index 8cbd3f0e4..5512ad248 100644 --- a/generators/markdown/org.kde.mobile.okular_md.desktop +++ b/generators/markdown/org.kde.mobile.okular_md.desktop @@ -177,6 +177,7 @@ X-KDE-Keywords[pt]=Markdown X-KDE-Keywords[pt_BR]=Markdown X-KDE-Keywords[ru]=Markdown X-KDE-Keywords[sk]=Zrážka +X-KDE-Keywords[sl]=Markdown X-KDE-Keywords[sr]=Markdown,маркдаун X-KDE-Keywords[sr@ijekavian]=Markdown,маркдаун X-KDE-Keywords[sr@ijekavianlatin]=Markdown,Markdown