From 1d36cd158fa4efdde25ca92dbcb55ea9c73d6b4f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 21 Jul 2015 07:14:54 +0000 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/djvu/active-documentviewer_djvu.desktop | 1 + generators/djvu/okularApplication_djvu.desktop | 1 + generators/dvi/active-documentviewer_dvi.desktop | 1 + generators/dvi/okularApplication_dvi.desktop | 1 + 4 files changed, 4 insertions(+) diff --git a/generators/djvu/active-documentviewer_djvu.desktop b/generators/djvu/active-documentviewer_djvu.desktop index 11796acb5..4e908c046 100644 --- a/generators/djvu/active-documentviewer_djvu.desktop +++ b/generators/djvu/active-documentviewer_djvu.desktop @@ -161,6 +161,7 @@ X-KDE-Keywords[da]=djvu X-KDE-Keywords[de]=djvu X-KDE-Keywords[el]=djvu X-KDE-Keywords[en_GB]=djvu +X-KDE-Keywords[eo]=djvu X-KDE-Keywords[es]=djvu X-KDE-Keywords[et]=djvu X-KDE-Keywords[fi]=djvu diff --git a/generators/djvu/okularApplication_djvu.desktop b/generators/djvu/okularApplication_djvu.desktop index 211084384..6bf8608a0 100755 --- a/generators/djvu/okularApplication_djvu.desktop +++ b/generators/djvu/okularApplication_djvu.desktop @@ -141,6 +141,7 @@ X-KDE-Keywords[da]=djvu X-KDE-Keywords[de]=djvu X-KDE-Keywords[el]=djvu X-KDE-Keywords[en_GB]=djvu +X-KDE-Keywords[eo]=djvu X-KDE-Keywords[es]=djvu X-KDE-Keywords[et]=djvu X-KDE-Keywords[fi]=djvu diff --git a/generators/dvi/active-documentviewer_dvi.desktop b/generators/dvi/active-documentviewer_dvi.desktop index b68238a4d..42e814416 100644 --- a/generators/dvi/active-documentviewer_dvi.desktop +++ b/generators/dvi/active-documentviewer_dvi.desktop @@ -161,6 +161,7 @@ X-KDE-Keywords[da]=dvi X-KDE-Keywords[de]=dvi X-KDE-Keywords[el]=dvi X-KDE-Keywords[en_GB]=dvi +X-KDE-Keywords[eo]=dvi X-KDE-Keywords[es]=dvi X-KDE-Keywords[et]=dvi X-KDE-Keywords[fi]=dvi diff --git a/generators/dvi/okularApplication_dvi.desktop b/generators/dvi/okularApplication_dvi.desktop index 058eadfd4..6ef4a890c 100755 --- a/generators/dvi/okularApplication_dvi.desktop +++ b/generators/dvi/okularApplication_dvi.desktop @@ -141,6 +141,7 @@ X-KDE-Keywords[da]=dvi X-KDE-Keywords[de]=dvi X-KDE-Keywords[el]=dvi X-KDE-Keywords[en_GB]=dvi +X-KDE-Keywords[eo]=dvi X-KDE-Keywords[es]=dvi X-KDE-Keywords[et]=dvi X-KDE-Keywords[fi]=dvi