Merge lp://qastaging/~nobuto/ubuntu/raring/ecryptfs-utils/record-passphrase-dialogue-translatable into lp://qastaging/ubuntu/raring/ecryptfs-utils
Proposed by
Nobuto Murata
| Status: | Merged |
|---|---|
| Merge reported by: | Marc Deslauriers |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~nobuto/ubuntu/raring/ecryptfs-utils/record-passphrase-dialogue-translatable |
| Merge into: | lp://qastaging/ubuntu/raring/ecryptfs-utils |
| Diff against target: |
138 lines (+72/-4) 7 files modified
.pc/applied-patches (+1/-0) .pc/record-passphrase-dialogue-translatable.patch/src/desktop/ecryptfs-record-passphrase (+19/-0) debian/changelog (+10/-0) debian/patches/record-passphrase-dialogue-translatable.patch (+35/-0) debian/patches/series (+1/-0) debian/rules (+3/-0) src/desktop/ecryptfs-record-passphrase (+3/-4) |
| To merge this branch: | bzr merge lp://qastaging/~nobuto/ubuntu/raring/ecryptfs-utils/record-passphrase-dialogue-translatable |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marc Deslauriers | Approve | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
Adding translation markers to the messages shown in the dialogue.
The markers will be removed by override_dh_install to work as an update-notifier hook.
The specification of translatable update-notifier hooks is:
https:/
Besides removing line breaks(.) to workaround lp bug 1075304. Because if a hook contains line breaks(.) on the description, translations are not loaded.
To post a comment you must log in.
Revision history for this message
| Nobuto Murata (nobuto) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks for the merge request. The changes look good, although I would really like to see bug 1075304 fixed instead of removing the line breaks, but I guess that isn't a show-stopper.
Could you please include an appropriate debian/changelog entry?