lp:~neon/lokalize/master
- Get this branch:
- bzr branch lp:~neon/lokalize/master
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/lokalize.
Last successful import was .
Recent revisions
- 1346. By Luca Beltrame <email address hidden>
-
Use the new logging category directory with ECM >= 5.59.0
- 1344. By l10n daemon script <email address hidden>
-
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" - 1343. By 8p-k26-gj
-
Add DesktopEntry to notifyrc
This allows the notification KCM to identify Lokalize as an application.
Differential Revision: https:/
/phabricator. kde.org/ D20921 - 1341. By l10n daemon script <email address hidden>
-
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" - 1340. By Pavel Mos <email address hidden>
-
Add language-team settings to Lokalize
Summary:
- add settings for explicitly setting the value of Language-Team
- it allows to specify the value of Language-Team setting for application and to override it for specific projectsReviewers: sdepiets, yurchor, aacid, pino
Reviewed By: sdepiets
Differential Revision: https:/
/phabricator. kde.org/ D18842 - 1339. By l10n daemon script <email address hidden>
-
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" - 1338. By Simon Depiets <email address hidden>
-
Connect cursorPositionC
hange to the correct signal BUG: 406742
- 1337. By Pino Toscano
-
doc: fix few kde4 leftovers
There is still another one left, although the documentation refers to
files available only there and not in the kf5 equivalent.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)