lp:~neon/lokalize/master

Created by Philip Muškovac and last modified
Get this branch:
bzr branch lp:~neon/lokalize/master

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Deprecated Projected Neon
Project:
lokalize
Status:
Development

Import details

Import Status: Failed

This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/lokalize.

The import has been suspended because it failed 5 or more times in succession.

Last successful import was .

Import started on izar and finished taking 15 seconds — see the log
Import started on izar and finished taking 15 seconds — see the log
Import started on izar and finished taking 15 seconds — see the log
Import started on alnitak and finished taking 15 seconds — see the log

Recent revisions

1346. By Luca Beltrame <email address hidden>

Use the new logging category directory with ECM >= 5.59.0

1345. By l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

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

1342. By l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

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 projects

Reviewers: 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 cursorPositionChange 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)
This branch contains Public information 
Everyone can see this information.