Merge lp:~nobuto/ubuntu/raring/ecryptfs-utils/record-passphrase-dialogue-translatable into lp:ubuntu/raring/ecryptfs-utils

[Nobuto Murata]

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://wiki.ubuntu.com/InteractiveUpgradeHooks

Besides removing line breaks(.) to workaround lp bug 1075304. Because if a hook contains line breaks(.) on the description, translations are not loaded.

[Marc Deslauriers (mdeslaur)]

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?

review: Needs Fixing

[lp:~nobuto/ubuntu/raring/ecryptfs-utils/record-passphrase-dialogue-translatable]

91. By Nobuto Murata on 2012-12-06

write up changelog

[Nobuto Murata (nobuto)]

I have written the changelog. Thanks!

[Marc Deslauriers (mdeslaur)]

Looks good, ACK. I've uploaded it to raring. Thanks!

review: Approve

=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2012-12-06 14:48:21 +0000
@@ -0,0 +1,1 @@
+record-passphrase-dialogue-translatable.patch

=== removed file '.pc/applied-patches'
=== added directory '.pc/record-passphrase-dialogue-translatable.patch'
=== added directory '.pc/record-passphrase-dialogue-translatable.patch/src'
=== added directory '.pc/record-passphrase-dialogue-translatable.patch/src/desktop'
=== added file '.pc/record-passphrase-dialogue-translatable.patch/src/desktop/ecryptfs-record-passphrase'
--- .pc/record-passphrase-dialogue-translatable.patch/src/desktop/ecryptfs-record-passphrase	1970-01-01 00:00:00 +0000
+++ .pc/record-passphrase-dialogue-translatable.patch/src/desktop/ecryptfs-record-passphrase	2012-12-06 14:48:21 +0000
@@ -0,0 +1,19 @@
+Name: Record your encryption passphrase
+Priority: High
+OnlyAdminUsers: False
+DisplayIf: test -e $HOME/.ecryptfs/wrapped-passphrase -a ! -e $HOME/.ecryptfs/.wrapped-passphrase.recorded
+Terminal: True
+GettextDomain: ecryptfs-utils
+Command: "sh -c 'ecryptfs-unwrap-passphrase $HOME/.ecryptfs/wrapped-passphrase 2>/dev/null && echo [Enter] && head -n1 && touch $HOME/.ecryptfs/.wrapped-passphrase.recorded '"
+Description: To encrypt your home directory or "Private" folder, a strong
+ passphrase has been automatically generated. Usually your directory is unlocked
+ with your user password, but if you ever need to manually recover this
+ directory, you will need this passphrase. Please print or write it down and
+ store it in a safe location.
+ .
+ If you click "Run this action now", enter your login password at the
+ "Passphrase" prompt and you can display your randomly generated passphrase.
+ .
+ Otherwise, you will need to run "ecryptfs-unwrap-passphrase" from the command
+ line to retrieve and record your generated passphrase.
+

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-25 16:13:28 +0000
+++ debian/changelog	2012-12-06 14:48:21 +0000
@@ -1,3 +1,13 @@
+ecryptfs-utils (101-0ubuntu2) raring; urgency=low
+
+  * debian/patches/record-passphrase-dialogue-translatable.patch:
+    - make "Record your encryption passphrase" dialogue translatable
+      (LP: #982924)
+    - to workaround lp bug 1075304, removing line breaks(.) in the
+      dialogue
+
+ -- Nobuto MURATA <[e-mail]>  Thu, 06 Dec 2012 23:37:38 +0900
+
 ecryptfs-utils (101-0ubuntu1) raring; urgency=low
 
   [ Eric Lammerts ]

=== removed file 'debian/patches/00list'
=== added file 'debian/patches/record-passphrase-dialogue-translatable.patch'
--- debian/patches/record-passphrase-dialogue-translatable.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/record-passphrase-dialogue-translatable.patch	2012-12-06 14:48:21 +0000
@@ -0,0 +1,35 @@
+## Description: translatable "Record your encryption passphrase" dialogue
+##  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://wiki.ubuntu.com/InteractiveUpgradeHooks
+##  Besides removing line breaks(.) to workaround lp bug 1075304.
+## Author: Nobuto MURATA <[e-mail]>
+## Bug-Ubuntu: https://launchpad.net/bugs/982924
+## Forwarded: no
+--- a/src/desktop/ecryptfs-record-passphrase
++++ b/src/desktop/ecryptfs-record-passphrase
+@@ -1,19 +1,18 @@
+-Name: Record your encryption passphrase
++_Name: Record your encryption passphrase
+ Priority: High
+ OnlyAdminUsers: False
+ DisplayIf: test -e $HOME/.ecryptfs/wrapped-passphrase -a ! -e $HOME/.ecryptfs/.wrapped-passphrase.recorded
+ Terminal: True
+ GettextDomain: ecryptfs-utils
+ Command: "sh -c 'ecryptfs-unwrap-passphrase $HOME/.ecryptfs/wrapped-passphrase 2>/dev/null && echo [Enter] && head -n1 && touch $HOME/.ecryptfs/.wrapped-passphrase.recorded '"
+-Description: To encrypt your home directory or "Private" folder, a strong
++_Description:
++ To encrypt your home directory or "Private" folder, a strong
+  passphrase has been automatically generated. Usually your directory is unlocked
+  with your user password, but if you ever need to manually recover this
+  directory, you will need this passphrase. Please print or write it down and
+  store it in a safe location.
+- .
+  If you click "Run this action now", enter your login password at the
+  "Passphrase" prompt and you can display your randomly generated passphrase.
+- .
+  Otherwise, you will need to run "ecryptfs-unwrap-passphrase" from the command
+  line to retrieve and record your generated passphrase.
+ 

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2012-12-06 14:48:21 +0000
@@ -0,0 +1,1 @@
+record-passphrase-dialogue-translatable.patch

=== modified file 'debian/rules'
--- debian/rules	2012-10-25 16:13:28 +0000
+++ debian/rules	2012-12-06 14:48:21 +0000
@@ -36,6 +36,9 @@
 	chmod 4755 debian/ecryptfs-utils/sbin/mount.ecryptfs_private
 
 override_dh_install:
+	# Removing translation markers to work as an update-notifier hook
+	sed -i 's/^_//' debian/tmp/usr/share/ecryptfs-utils/ecryptfs-record-passphrase
+
 	dh_install --fail-missing --sourcedir=debian/tmp
 
 override_dh_python2:

=== modified file 'src/desktop/ecryptfs-record-passphrase'
--- src/desktop/ecryptfs-record-passphrase	2012-10-25 16:13:28 +0000
+++ src/desktop/ecryptfs-record-passphrase	2012-12-06 14:48:21 +0000
@@ -1,19 +1,18 @@
-Name: Record your encryption passphrase
+_Name: Record your encryption passphrase
 Priority: High
 OnlyAdminUsers: False
 DisplayIf: test -e $HOME/.ecryptfs/wrapped-passphrase -a ! -e $HOME/.ecryptfs/.wrapped-passphrase.recorded
 Terminal: True
 GettextDomain: ecryptfs-utils
 Command: "sh -c 'ecryptfs-unwrap-passphrase $HOME/.ecryptfs/wrapped-passphrase 2>/dev/null && echo [Enter] && head -n1 && touch $HOME/.ecryptfs/.wrapped-passphrase.recorded '"
-Description: To encrypt your home directory or "Private" folder, a strong
+_Description:
+ To encrypt your home directory or "Private" folder, a strong
  passphrase has been automatically generated. Usually your directory is unlocked
  with your user password, but if you ever need to manually recover this
  directory, you will need this passphrase. Please print or write it down and
  store it in a safe location.
- .
  If you click "Run this action now", enter your login password at the
  "Passphrase" prompt and you can display your randomly generated passphrase.
- .
  Otherwise, you will need to run "ecryptfs-unwrap-passphrase" from the command
  line to retrieve and record your generated passphrase.