Merge lp://staging/~leonardolemos/pantheon-mail/fix-translations into lp://staging/~elementary-apps/pantheon-mail/trunk
Proposed by
Leonardo Lemos
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Corentin Noël | ||||||||
| Approved revision: | 2060 | ||||||||
| Merged at revision: | 2054 | ||||||||
| Proposed branch: | lp://staging/~leonardolemos/pantheon-mail/fix-translations | ||||||||
| Merge into: | lp://staging/~elementary-apps/pantheon-mail/trunk | ||||||||
| Diff against target: |
971 lines (+383/-201) 11 files modified
cmake/Translations.cmake (+206/-135) cmake/ValaPrecompile.cmake (+88/-50) cmake/ValaVersion.cmake (+3/-3) data/CMakeLists.txt (+10/-3) data/mail-attach.contract (+1/-1) data/pantheon-mail-autostart.desktop.in.in (+3/-3) data/pantheon-mail.desktop.in.in (+5/-5) po/CMakeLists.txt (+3/-0) po/extra/extra.pot (+33/-0) po/pantheon-mail.pot (+29/-1) src/Translations.vala (+2/-0) |
||||||||
| To merge this branch: | bzr merge lp://staging/~leonardolemos/pantheon-mail/fix-translations | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Corentin Noël | Needs Fixing | ||
|
Review via email:
|
|||
Commit message
Correctly translate the Desktop files.
Translate the contract files.
Description of the change
This branch fixes lp:1577023 and lp:1577995 issues by making correct use of CMake Translations module for .desktop files and using the Translations.vala workaround for .contract files.
To post a comment you must log in.
Revision history for this message
| Rico Tzschichholz (ricotz) wrote | # |
Revision history for this message
| Rico Tzschichholz (ricotz) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Two remaining issues in the code