Merge lp:~nobuto/ecryptfs/fix-empty-window into lp:ecryptfs

Proposed by Nobuto Murata
Status: Merged
Merged at revision: 773
Proposed branch: lp:~nobuto/ecryptfs/fix-empty-window
Merge into: lp:ecryptfs
Diff against target: 32 lines (+9/-1)
2 files modified
debian/changelog (+6/-1)
debian/rules (+3/-0)
To merge this branch: bzr merge lp:~nobuto/ecryptfs/fix-empty-window
Reviewer Review Type Date Requested Status
Tyler Hicks Approve
Review via email: mp+149634@code.launchpad.net

Description of the change

Changes made in Rev.758 was not complete to make a update-notifier window translatable.

Incomplete commit causes an empty window described in Bug #1107650. This branch adds a missing part to complete i18n.

Note:
Why we have to remove translations markers after pot creation is explained here:
 https://wiki.ubuntu.com/InteractiveUpgradeHooks

To post a comment you must log in.
Revision history for this message
Tyler Hicks (tyhicks) wrote :

Looks good. Thanks Nobuto!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-01-25 18:58:29 +0000
3+++ debian/changelog 2013-02-20 17:09:47 +0000
4@@ -1,8 +1,13 @@
5 ecryptfs-utils (104) UNRELEASED; urgency=low
6
7+ [ Dustin Kirkland ]
8 * UNRELEASED
9
10- -- Dustin Kirkland <kirkland@ubuntu.com> Fri, 25 Jan 2013 12:58:07 -0600
11+ [ Nobuto MURATA ]
12+ * fix an empty update-notifier window (LP: #1107650)
13+ - changes made in Rev.758 was incomplete
14+
15+ -- Nobuto MURATA <nobuto@ubuntu.com> Thu, 21 Feb 2013 01:56:33 +0900
16
17 ecryptfs-utils (103) quantal; urgency=low
18
19
20=== modified file 'debian/rules'
21--- debian/rules 2013-01-23 02:39:17 +0000
22+++ debian/rules 2013-02-20 17:09:47 +0000
23@@ -39,6 +39,9 @@
24 chmod 4755 debian/ecryptfs-utils/sbin/mount.ecryptfs_private
25
26 override_dh_install:
27+ # Removing translation markers to work as an update-notifier hook
28+ sed -i 's/^_//' debian/tmp/usr/share/ecryptfs-utils/ecryptfs-record-passphrase
29+
30 dh_install --fail-missing --sourcedir=debian/tmp
31
32 override_dh_python2:

Subscribers

People subscribed via source and target branches