[kde-doc-english] [ark] /: Merge branch 'KDE/4.14'

[Raphael Kubo da Costa]

Git commit 0b06929dfe438d893a7753e1a2eb837a6f740b62 by Raphael Kubo da Costa.
Committed on 23/10/2014 at 18:41.
Pushed by rkcosta into branch 'master'.

Merge branch 'KDE/4.14'

This is actually just a merge commit to sync the history.

It was produced with "git merge --stragegy ours", so the changes in
commit from KDE/4.14 being merged ('Revert "Add the 'open-with' action
and show the right-click menu."') are not being pulled in.

The 'open-with' feature was only intended for this branch (master, which
is going to be KDE Applications 14.12), as it is a new feature and
contains new strings.

Even though this means the translations which were restored in KDE/4.14
will not be restored here, it is OK because they were never committed to
master so there has been no effective change.

CCBUG:  179066
DIGEST:
GUI:


http://commits.kde.org/ark/0b06929dfe438d893a7753e1a2eb837a6f740b62