wilderjds
/
okular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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"
remotes/origin/Applications/17.12
l10n daemon script 8 years ago
parent 6ed35fcca3
commit 2daff2a344
2 changed files with 2 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      generators/markdown/okularApplication_md.desktop
  2. 1
      generators/markdown/org.kde.mobile.okular_md.desktop

1
generators/markdown/okularApplication_md.desktop
Unescape View File

@ -170,6 +170,7 @@ X-KDE-Keywords=Markdown
X-KDE-Keywords[ca]=Markdown
X-KDE-Keywords[ca@valencia]=Markdown
X-KDE-Keywords[cs]=Markdown
X-KDE-Keywords[da]=Markdown
X-KDE-Keywords[de]=Markdown
X-KDE-Keywords[el]=Markdown
X-KDE-Keywords[en_GB]=Markdown

1
generators/markdown/org.kde.mobile.okular_md.desktop
Unescape View File

@ -159,6 +159,7 @@ X-KDE-Keywords=Markdown
X-KDE-Keywords[ca]=Markdown
X-KDE-Keywords[ca@valencia]=Markdown
X-KDE-Keywords[cs]=Markdown
X-KDE-Keywords[da]=Markdown
X-KDE-Keywords[de]=Markdown
X-KDE-Keywords[el]=Markdown
X-KDE-Keywords[en_GB]=Markdown

Write Preview
Loading…
Cancel
Save