Ubuntu
ecryptfs-utils package

Merge lp:~dpm/ubuntu/lucid/ecryptfs-utils/bug-358283 into lp:ubuntu/lucid/ecryptfs-utils

  1. Lucid (10.04)
  2. bug-358283
  3. Merge into lucid
Proposed by David Planella
Status: Merged
Merge reported by: David Planella
Merged at revision: not available
Proposed branch: lp:~dpm/ubuntu/lucid/ecryptfs-utils/bug-358283
Merge into: lp:ubuntu/lucid/ecryptfs-utils
Diff against target: 1066 lines (+117/-803)
16 files modified
Makefile.am (+1/-1)
configure.ac (+16/-0)
debian/control (+1/-0)
debian/po/POTFILES.sh (+0/-5)
debian/po/ecryptfs-utils.pot (+0/-384)
debian/po/fr.po (+0/-366)
debian/rules (+3/-20)
po/LINGUAS (+3/-0)
po/POTFILES.in (+9/-0)
po/ca.po (+50/-0)
src/desktop/Makefile.am (+14/-1)
src/desktop/ecryptfs-mount-private.desktop (+0/-7)
src/desktop/ecryptfs-mount-private.desktop.in (+8/-0)
src/desktop/ecryptfs-record-passphrase (+4/-12)
src/desktop/ecryptfs-setup-private.desktop (+0/-7)
src/desktop/ecryptfs-setup-private.desktop.in (+8/-0)
To merge this branch: bzr merge lp:~dpm/ubuntu/lucid/ecryptfs-utils/bug-358283
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+17980@code.launchpad.net
To post a comment you must log in.
Revision history for this message
David Planella (dpm) wrote :

Completed internationalisation support (bug 358283) See comment #7 and #8 for some more details.

lp:~dpm/ubuntu/lucid/ecryptfs-utils/bug-358283 updated
64. By David Planella

Add the .desktop files to the list of generated files

65. By David Planella

Added Catalan translation for testing purposes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2009-02-18 17:34:17 +0000
3+++ Makefile.am 2010-02-17 18:44:15 +0000
4@@ -23,7 +23,7 @@
5 $(srcdir)/m4/ltoptions.m4 \
6 $(srcdir)/debian
7
8-SUBDIRS = doc src
9+SUBDIRS = doc src po
10
11 dist_doc_DATA = README
12
13
14=== modified file 'configure.ac'
15--- configure.ac 2009-11-10 11:36:15 +0000
16+++ configure.ac 2010-02-17 18:44:15 +0000
17@@ -345,6 +345,19 @@
18 rootsbindir="\$(sbindir)"
19 fi
20
21+GETTEXT_PACKAGE=ecryptfs-utils
22+AC_SUBST(GETTEXT_PACKAGE)
23+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
24+ [the gettext translation domain])
25+
26+AM_GLIB_GNU_GETTEXT
27+
28+IT_PROG_INTLTOOL([0.41.0])
29+
30+LOCALEDIR='${prefix}/${datadir}/locale'
31+AC_SUBST(LOCALEDIR)
32+
33+
34 CRYPTO_CFLAGS=${NSS_CFLAGS}
35 CRYPTO_LIBS=${NSS_LIBS}
36
37@@ -395,11 +408,14 @@
38 src/key_mod/Makefile
39 src/daemon/Makefile
40 src/desktop/Makefile
41+ src/desktop/ecryptfs-mount-private.desktop
42+ src/desktop/ecryptfs-setup-private.desktop
43 src/include/Makefile
44 doc/manpage/Makefile
45 src/pam_ecryptfs/Makefile
46 src/libecryptfs/libecryptfs.pc
47 src/libecryptfs-swig/Makefile
48+ po/Makefile.in
49 ])
50 AC_OUTPUT
51
52
53=== modified file 'debian/control'
54--- debian/control 2009-11-10 11:36:15 +0000
55+++ debian/control 2010-02-17 18:44:15 +0000
56@@ -8,6 +8,7 @@
57 autotools-dev,
58 autoconf,
59 automake,
60+ intltool,
61 libtool,
62 libgcrypt11-dev,
63 libgpg-error-dev,
64
65=== removed file 'debian/po/POTFILES.sh'
66--- debian/po/POTFILES.sh 2009-08-17 11:57:15 +0000
67+++ debian/po/POTFILES.sh 1970-01-01 00:00:00 +0000
68@@ -1,5 +0,0 @@
69-src/utils/ecryptfs-mount-private
70-src/utils/ecryptfs-rewrite-file
71-src/utils/ecryptfs-setup-private
72-src/utils/ecryptfs-setup-swap
73-src/utils/ecryptfs-umount-private
74
75=== removed file 'debian/po/ecryptfs-utils.pot'
76--- debian/po/ecryptfs-utils.pot 2009-11-10 12:05:58 +0000
77+++ debian/po/ecryptfs-utils.pot 1970-01-01 00:00:00 +0000
78@@ -1,384 +0,0 @@
79-# SOME DESCRIPTIVE TITLE.
80-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
81-# This file is distributed under the same license as the PACKAGE package.
82-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
83-#
84-#, fuzzy
85-msgid ""
86-msgstr ""
87-"Project-Id-Version: PACKAGE VERSION\n"
88-"Report-Msgid-Bugs-To: \n"
89-"POT-Creation-Date: 2009-11-10 12:07-0600\n"
90-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
91-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
92-"Language-Team: LANGUAGE <LL@li.org>\n"
93-"MIME-Version: 1.0\n"
94-"Content-Type: text/plain; charset=CHARSET\n"
95-"Content-Transfer-Encoding: 8bit\n"
96-
97-#: src/utils/ecryptfs-mount-private:19
98-msgid "Enter your login passphrase:"
99-msgstr ""
100-
101-#: src/utils/ecryptfs-mount-private:24
102-msgid "Enter your wrapping passphrase:"
103-msgstr ""
104-
105-#: src/utils/ecryptfs-mount-private:49 src/utils/ecryptfs-mount-private:55
106-#: src/utils/ecryptfs-mount-private:60 src/utils/ecryptfs-rewrite-file:24
107-#: src/utils/ecryptfs-setup-swap:25
108-msgid "ERROR:"
109-msgstr ""
110-
111-#: src/utils/ecryptfs-mount-private:49
112-msgid "Your passphrase is incorrect"
113-msgstr ""
114-
115-#: src/utils/ecryptfs-mount-private:55 src/utils/ecryptfs-setup-private:293
116-msgid "Too many incorrect password attempts, exiting"
117-msgstr ""
118-
119-#: src/utils/ecryptfs-mount-private:60
120-msgid "Encrypted private directory is not setup properly"
121-msgstr ""
122-
123-#: src/utils/ecryptfs-mount-private:65 src/utils/ecryptfs-mount-private:66
124-#: src/utils/ecryptfs-rewrite-file:30 src/utils/ecryptfs-setup-private:280
125-#: src/utils/ecryptfs-setup-private:348 src/utils/ecryptfs-setup-private:353
126-#: src/utils/ecryptfs-setup-swap:30 src/utils/ecryptfs-umount-private:21
127-#: src/utils/ecryptfs-umount-private:22
128-msgid "INFO:"
129-msgstr ""
130-
131-#: src/utils/ecryptfs-mount-private:65
132-msgid "Your private directory has been mounted."
133-msgstr ""
134-
135-#: src/utils/ecryptfs-mount-private:66 src/utils/ecryptfs-umount-private:22
136-msgid "To see this change in your current shell:"
137-msgstr ""
138-
139-#: src/utils/ecryptfs-rewrite-file:23
140-msgid "[FAILED]"
141-msgstr ""
142-
143-#: src/utils/ecryptfs-rewrite-file:30
144-msgid "Rewriting"
145-msgstr ""
146-
147-#: src/utils/ecryptfs-rewrite-file:32
148-msgid "File does not exist"
149-msgstr ""
150-
151-#: src/utils/ecryptfs-rewrite-file:36
152-msgid "[EXCLUDED]"
153-msgstr ""
154-
155-#: src/utils/ecryptfs-rewrite-file:43
156-msgid "Could not create tempdir"
157-msgstr ""
158-
159-#: src/utils/ecryptfs-rewrite-file:47 src/utils/ecryptfs-rewrite-file:52
160-#: src/utils/ecryptfs-rewrite-file:66
161-msgid "Could not rename"
162-msgstr ""
163-
164-#: src/utils/ecryptfs-rewrite-file:57
165-msgid "Could not create tempfile"
166-msgstr ""
167-
168-#: src/utils/ecryptfs-rewrite-file:61
169-msgid "Could not copy"
170-msgstr ""
171-
172-#: src/utils/ecryptfs-rewrite-file:70
173-msgid "[OK]"
174-msgstr ""
175-
176-#: src/utils/ecryptfs-rewrite-file:73
177-msgid "rewrites succeeded"
178-msgstr ""
179-
180-#: src/utils/ecryptfs-setup-private:14
181-msgid "Enter your login passphrase"
182-msgstr ""
183-
184-#: src/utils/ecryptfs-setup-private:84 src/utils/ecryptfs-setup-private:179
185-#: src/utils/ecryptfs-setup-private:184 src/utils/ecryptfs-setup-private:268
186-#: src/utils/ecryptfs-setup-private:276 src/utils/ecryptfs-setup-private:286
187-#: src/utils/ecryptfs-setup-private:317
188-msgid "ERROR: "
189-msgstr ""
190-
191-#: src/utils/ecryptfs-setup-private:105
192-msgid "Cannot get ecryptfs version, ecryptfs kernel module not loaded?"
193-msgstr ""
194-
195-#: src/utils/ecryptfs-setup-private:132
196-msgid "Enter your wrapping passphrase"
197-msgstr ""
198-
199-#: src/utils/ecryptfs-setup-private:156
200-msgid "You must be root to bootstrap encrypt a home directory"
201-msgstr ""
202-
203-#: src/utils/ecryptfs-setup-private:175
204-msgid "Enter the username: "
205-msgstr ""
206-
207-#: src/utils/ecryptfs-setup-private:179
208-msgid "You must provide a username"
209-msgstr ""
210-
211-#: src/utils/ecryptfs-setup-private:184 src/utils/ecryptfs-setup-private:192
212-msgid "User does not exist"
213-msgstr ""
214-
215-#: src/utils/ecryptfs-setup-private:201
216-msgid "User needs to be a member of ecryptfs group"
217-msgstr ""
218-
219-#: src/utils/ecryptfs-setup-private:208
220-msgid "User home directory does not exist"
221-msgstr ""
222-
223-#: src/utils/ecryptfs-setup-private:227
224-msgid "wrapped-passphrase file already exists, use --force to overwrite."
225-msgstr ""
226-
227-#: src/utils/ecryptfs-setup-private:230
228-msgid "file already exists, use --force to overwrite."
229-msgstr ""
230-
231-#: src/utils/ecryptfs-setup-private:234 src/utils/ecryptfs-setup-private:235
232-msgid "is already mounted"
233-msgstr ""
234-
235-#: src/utils/ecryptfs-setup-private:242 src/utils/ecryptfs-setup-private:246
236-msgid "must be empty before proceeding"
237-msgstr ""
238-
239-#: src/utils/ecryptfs-setup-private:268
240-msgid "Wrapping passphrases must match"
241-msgstr ""
242-
243-#: src/utils/ecryptfs-setup-private:276
244-msgid "You must provide a login passphrase"
245-msgstr ""
246-
247-#: src/utils/ecryptfs-setup-private:280
248-msgid "Skipping password verification"
249-msgstr ""
250-
251-#: src/utils/ecryptfs-setup-private:286
252-msgid "Your login passphrase is incorrect"
253-msgstr ""
254-
255-#: src/utils/ecryptfs-setup-private:302
256-msgid "Enter your mount passphrase [leave blank to generate one]: "
257-msgstr ""
258-
259-#: src/utils/ecryptfs-setup-private:312
260-msgid "Enter your mount passphrase (again): "
261-msgstr ""
262-
263-#: src/utils/ecryptfs-setup-private:317
264-msgid "Mount passphrases do not match"
265-msgstr ""
266-
267-#: src/utils/ecryptfs-setup-private:325
268-msgid "Too many incorrect passphrase attempts, exiting"
269-msgstr ""
270-
271-#: src/utils/ecryptfs-setup-private:331
272-msgid ""
273-"YOU SHOULD RECORD YOUR MOUNT PASSPHRASE AND STORE IT IN A SAFE LOCATION."
274-msgstr ""
275-
276-#: src/utils/ecryptfs-setup-private:333
277-msgid "THIS WILL BE REQUIRED IF YOU NEED TO RECOVER YOUR DATA AT A LATER TIME."
278-msgstr ""
279-
280-#: src/utils/ecryptfs-setup-private:340
281-msgid "Could not create crypt directory"
282-msgstr ""
283-
284-#: src/utils/ecryptfs-setup-private:341
285-msgid "Could not create mount directory"
286-msgstr ""
287-
288-#: src/utils/ecryptfs-setup-private:348
289-msgid "will not be mounted on login"
290-msgstr ""
291-
292-#: src/utils/ecryptfs-setup-private:350
293-msgid "Could not setup ecryptfs auto-mount"
294-msgstr ""
295-
296-#: src/utils/ecryptfs-setup-private:353
297-msgid "will not be unmounted on logout"
298-msgstr ""
299-
300-#: src/utils/ecryptfs-setup-private:355
301-msgid "Could not setup ecryptfs auto-umount"
302-msgstr ""
303-
304-#: src/utils/ecryptfs-setup-private:359
305-msgid "Could not remove ecryptfs wrapping-independent"
306-msgstr ""
307-
308-#: src/utils/ecryptfs-setup-private:361
309-msgid "Could not setup ecryptfs wrapping-independent"
310-msgstr ""
311-
312-#: src/utils/ecryptfs-setup-private:385
313-msgid "Could not wrap passphrase"
314-msgstr ""
315-
316-#: src/utils/ecryptfs-setup-private:393
317-msgid "Could not add passphrase to the current keyring"
318-msgstr ""
319-
320-#: src/utils/ecryptfs-setup-private:397
321-msgid "Could not obtain the key signature"
322-msgstr ""
323-
324-#: src/utils/ecryptfs-setup-private:400
325-msgid "Could not create signature file"
326-msgstr ""
327-
328-#: src/utils/ecryptfs-setup-private:403
329-msgid "Could not create mountpoint file"
330-msgstr ""
331-
332-#: src/utils/ecryptfs-setup-private:407
333-msgid "Done configuring."
334-msgstr ""
335-
336-#: src/utils/ecryptfs-setup-private:437
337-msgid "Testing mount/write/umount/read..."
338-msgstr ""
339-
340-#: src/utils/ecryptfs-setup-private:438
341-msgid "Could not mount private ecryptfs directory"
342-msgstr ""
343-
344-#: src/utils/ecryptfs-setup-private:439
345-msgid "Could not create empty file"
346-msgstr ""
347-
348-#: src/utils/ecryptfs-setup-private:440
349-msgid "Could not generate random data"
350-msgstr ""
351-
352-#: src/utils/ecryptfs-setup-private:441
353-msgid "Could not write encrypted file"
354-msgstr ""
355-
356-#: src/utils/ecryptfs-setup-private:442
357-msgid "Could not read encrypted file"
358-msgstr ""
359-
360-#: src/utils/ecryptfs-setup-private:443
361-msgid "Could not unmount private ecryptfs directory"
362-msgstr ""
363-
364-#: src/utils/ecryptfs-setup-private:444
365-msgid "Could not mount private ecryptfs directory (2)"
366-msgstr ""
367-
368-#: src/utils/ecryptfs-setup-private:445
369-msgid "Could not read encrypted file (2)"
370-msgstr ""
371-
372-#: src/utils/ecryptfs-setup-private:449
373-msgid "Could not unmount private ecryptfs directory (2)"
374-msgstr ""
375-
376-#: src/utils/ecryptfs-setup-private:451
377-msgid "Testing failed."
378-msgstr ""
379-
380-#: src/utils/ecryptfs-setup-private:453
381-msgid "Testing succeeded."
382-msgstr ""
383-
384-#: src/utils/ecryptfs-setup-private:457
385-msgid "Logout, and log back in to begin using your encrypted directory."
386-msgstr ""
387-
388-#: src/utils/ecryptfs-setup-swap:34 src/utils/ecryptfs-setup-swap:128
389-msgid "WARNING:"
390-msgstr ""
391-
392-#: src/utils/ecryptfs-setup-swap:39
393-msgid "Usage:"
394-msgstr ""
395-
396-#: src/utils/ecryptfs-setup-swap:64
397-msgid "Please install"
398-msgstr ""
399-
400-#: src/utils/ecryptfs-setup-swap:67
401-msgid "This program must be run with 'sudo', or as root"
402-msgstr ""
403-
404-#: src/utils/ecryptfs-setup-swap:75
405-msgid "You can create a swap file by doing:"
406-msgstr ""
407-
408-#: src/utils/ecryptfs-setup-swap:80
409-msgid "And then re-run"
410-msgstr ""
411-
412-#: src/utils/ecryptfs-setup-swap:91
413-msgid "does not appear to be swap space, skipping."
414-msgstr ""
415-
416-#: src/utils/ecryptfs-setup-swap:96
417-msgid "is a RAM device, skipping."
418-msgstr ""
419-
420-#: src/utils/ecryptfs-setup-swap:102
421-msgid "already appears to be encrypted, skipping."
422-msgstr ""
423-
424-#: src/utils/ecryptfs-setup-swap:108 src/utils/ecryptfs-setup-swap:112
425-msgid "already has an entry in /etc/crypttab, skipping."
426-msgstr ""
427-
428-#: src/utils/ecryptfs-setup-swap:129
429-msgid ""
430-"An encrypted swap is required to help ensure that encrypted files are not "
431-"leaked to disk in an unencrypted format."
432-msgstr ""
433-
434-#: src/utils/ecryptfs-setup-swap:131
435-msgid ""
436-"HOWEVER, THE SWAP ENCRYPTION CONFIGURATION PRODUCED BY THIS PROGRAM WILL "
437-"BREAK HIBERNATE/RESUME ON THIS SYSTEM!"
438-msgstr ""
439-
440-#: src/utils/ecryptfs-setup-swap:133
441-msgid "NOTE: Your suspend/resume capabilities will not be affected."
442-msgstr ""
443-
444-#: src/utils/ecryptfs-setup-swap:135
445-msgid "Do you want to proceed with encrypting your swap?"
446-msgstr ""
447-
448-#: src/utils/ecryptfs-setup-swap:140
449-msgid "Aborting."
450-msgstr ""
451-
452-#: src/utils/ecryptfs-setup-swap:150
453-msgid "Setting up swap:"
454-msgstr ""
455-
456-#: src/utils/ecryptfs-setup-swap:181
457-msgid "Successfully setup encrypted swap!"
458-msgstr ""
459-
460-#: src/utils/ecryptfs-umount-private:21
461-msgid "Your private directory has been unmounted."
462-msgstr ""
463
464=== removed file 'debian/po/fr.po'
465--- debian/po/fr.po 2009-11-10 11:36:15 +0000
466+++ debian/po/fr.po 1970-01-01 00:00:00 +0000
467@@ -1,366 +0,0 @@
468-#: src/utils/ecryptfs-mount-private:19
469-msgid "Enter your login passphrase:"
470-msgstr ""
471-
472-#: src/utils/ecryptfs-mount-private:24
473-msgid "Enter your wrapping passphrase:"
474-msgstr ""
475-
476-#: src/utils/ecryptfs-mount-private:49 src/utils/ecryptfs-mount-private:55
477-#: src/utils/ecryptfs-mount-private:60 src/utils/ecryptfs-rewrite-file:24
478-#: src/utils/ecryptfs-setup-swap:25
479-msgid "ERROR:"
480-msgstr ""
481-
482-#: src/utils/ecryptfs-mount-private:49
483-msgid "Your passphrase is incorrect"
484-msgstr ""
485-
486-#: src/utils/ecryptfs-mount-private:55 src/utils/ecryptfs-setup-private:293
487-msgid "Too many incorrect password attempts, exiting"
488-msgstr ""
489-
490-#: src/utils/ecryptfs-mount-private:60
491-msgid "Encrypted private directory is not setup properly"
492-msgstr ""
493-
494-#: src/utils/ecryptfs-mount-private:65 src/utils/ecryptfs-mount-private:66
495-#: src/utils/ecryptfs-rewrite-file:30 src/utils/ecryptfs-setup-private:280
496-#: src/utils/ecryptfs-setup-private:348 src/utils/ecryptfs-setup-private:353
497-#: src/utils/ecryptfs-setup-swap:30 src/utils/ecryptfs-umount-private:21
498-#: src/utils/ecryptfs-umount-private:22
499-msgid "INFO:"
500-msgstr ""
501-
502-#: src/utils/ecryptfs-mount-private:65
503-msgid "Your private directory has been mounted."
504-msgstr ""
505-
506-#: src/utils/ecryptfs-mount-private:66 src/utils/ecryptfs-umount-private:22
507-msgid "To see this change in your current shell:"
508-msgstr ""
509-
510-#: src/utils/ecryptfs-rewrite-file:23
511-msgid "[FAILED]"
512-msgstr ""
513-
514-#: src/utils/ecryptfs-rewrite-file:30
515-msgid "Rewriting"
516-msgstr ""
517-
518-#: src/utils/ecryptfs-rewrite-file:32
519-msgid "File does not exist"
520-msgstr ""
521-
522-#: src/utils/ecryptfs-rewrite-file:36
523-msgid "[EXCLUDED]"
524-msgstr ""
525-
526-#: src/utils/ecryptfs-rewrite-file:43
527-msgid "Could not create tempdir"
528-msgstr ""
529-
530-#: src/utils/ecryptfs-rewrite-file:47 src/utils/ecryptfs-rewrite-file:52
531-#: src/utils/ecryptfs-rewrite-file:66
532-msgid "Could not rename"
533-msgstr ""
534-
535-#: src/utils/ecryptfs-rewrite-file:57
536-msgid "Could not create tempfile"
537-msgstr ""
538-
539-#: src/utils/ecryptfs-rewrite-file:61
540-msgid "Could not copy"
541-msgstr ""
542-
543-#: src/utils/ecryptfs-rewrite-file:70
544-msgid "[OK]"
545-msgstr ""
546-
547-#: src/utils/ecryptfs-rewrite-file:73
548-msgid "rewrites succeeded"
549-msgstr ""
550-
551-#: src/utils/ecryptfs-setup-private:14
552-msgid "Enter your login passphrase"
553-msgstr ""
554-
555-#: src/utils/ecryptfs-setup-private:84 src/utils/ecryptfs-setup-private:179
556-#: src/utils/ecryptfs-setup-private:184 src/utils/ecryptfs-setup-private:268
557-#: src/utils/ecryptfs-setup-private:276 src/utils/ecryptfs-setup-private:286
558-#: src/utils/ecryptfs-setup-private:317
559-msgid "ERROR: "
560-msgstr ""
561-
562-#: src/utils/ecryptfs-setup-private:105
563-msgid "Cannot get ecryptfs version, ecryptfs kernel module not loaded?"
564-msgstr ""
565-
566-#: src/utils/ecryptfs-setup-private:132
567-msgid "Enter your wrapping passphrase"
568-msgstr ""
569-
570-#: src/utils/ecryptfs-setup-private:156
571-msgid "You must be root to bootstrap encrypt a home directory"
572-msgstr ""
573-
574-#: src/utils/ecryptfs-setup-private:175
575-msgid "Enter the username: "
576-msgstr ""
577-
578-#: src/utils/ecryptfs-setup-private:179
579-msgid "You must provide a username"
580-msgstr ""
581-
582-#: src/utils/ecryptfs-setup-private:184 src/utils/ecryptfs-setup-private:192
583-msgid "User does not exist"
584-msgstr ""
585-
586-#: src/utils/ecryptfs-setup-private:201
587-msgid "User needs to be a member of ecryptfs group"
588-msgstr ""
589-
590-#: src/utils/ecryptfs-setup-private:208
591-msgid "User home directory does not exist"
592-msgstr ""
593-
594-#: src/utils/ecryptfs-setup-private:227
595-msgid "wrapped-passphrase file already exists, use --force to overwrite."
596-msgstr ""
597-
598-#: src/utils/ecryptfs-setup-private:230
599-msgid "file already exists, use --force to overwrite."
600-msgstr ""
601-
602-#: src/utils/ecryptfs-setup-private:234 src/utils/ecryptfs-setup-private:235
603-msgid "is already mounted"
604-msgstr ""
605-
606-#: src/utils/ecryptfs-setup-private:242 src/utils/ecryptfs-setup-private:246
607-msgid "must be empty before proceeding"
608-msgstr ""
609-
610-#: src/utils/ecryptfs-setup-private:268
611-msgid "Wrapping passphrases must match"
612-msgstr ""
613-
614-#: src/utils/ecryptfs-setup-private:276
615-msgid "You must provide a login passphrase"
616-msgstr ""
617-
618-#: src/utils/ecryptfs-setup-private:280
619-msgid "Skipping password verification"
620-msgstr ""
621-
622-#: src/utils/ecryptfs-setup-private:286
623-msgid "Your login passphrase is incorrect"
624-msgstr ""
625-
626-#: src/utils/ecryptfs-setup-private:302
627-msgid "Enter your mount passphrase [leave blank to generate one]: "
628-msgstr ""
629-
630-#: src/utils/ecryptfs-setup-private:312
631-msgid "Enter your mount passphrase (again): "
632-msgstr ""
633-
634-#: src/utils/ecryptfs-setup-private:317
635-msgid "Mount passphrases do not match"
636-msgstr ""
637-
638-#: src/utils/ecryptfs-setup-private:325
639-msgid "Too many incorrect passphrase attempts, exiting"
640-msgstr ""
641-
642-#: src/utils/ecryptfs-setup-private:331
643-msgid ""
644-"YOU SHOULD RECORD YOUR MOUNT PASSPHRASE AND STORE IT IN A SAFE LOCATION."
645-msgstr ""
646-
647-#: src/utils/ecryptfs-setup-private:333
648-msgid "THIS WILL BE REQUIRED IF YOU NEED TO RECOVER YOUR DATA AT A LATER TIME."
649-msgstr ""
650-
651-#: src/utils/ecryptfs-setup-private:340
652-msgid "Could not create crypt directory"
653-msgstr ""
654-
655-#: src/utils/ecryptfs-setup-private:341
656-msgid "Could not create mount directory"
657-msgstr ""
658-
659-#: src/utils/ecryptfs-setup-private:348
660-msgid "will not be mounted on login"
661-msgstr ""
662-
663-#: src/utils/ecryptfs-setup-private:350
664-msgid "Could not setup ecryptfs auto-mount"
665-msgstr ""
666-
667-#: src/utils/ecryptfs-setup-private:353
668-msgid "will not be unmounted on logout"
669-msgstr ""
670-
671-#: src/utils/ecryptfs-setup-private:355
672-msgid "Could not setup ecryptfs auto-umount"
673-msgstr ""
674-
675-#: src/utils/ecryptfs-setup-private:359
676-msgid "Could not remove ecryptfs wrapping-independent"
677-msgstr ""
678-
679-#: src/utils/ecryptfs-setup-private:361
680-msgid "Could not setup ecryptfs wrapping-independent"
681-msgstr ""
682-
683-#: src/utils/ecryptfs-setup-private:385
684-msgid "Could not wrap passphrase"
685-msgstr ""
686-
687-#: src/utils/ecryptfs-setup-private:393
688-msgid "Could not add passphrase to the current keyring"
689-msgstr ""
690-
691-#: src/utils/ecryptfs-setup-private:397
692-msgid "Could not obtain the key signature"
693-msgstr ""
694-
695-#: src/utils/ecryptfs-setup-private:400
696-msgid "Could not create signature file"
697-msgstr ""
698-
699-#: src/utils/ecryptfs-setup-private:403
700-msgid "Could not create mountpoint file"
701-msgstr ""
702-
703-#: src/utils/ecryptfs-setup-private:407
704-msgid "Done configuring."
705-msgstr ""
706-
707-#: src/utils/ecryptfs-setup-private:437
708-msgid "Testing mount/write/umount/read..."
709-msgstr ""
710-
711-#: src/utils/ecryptfs-setup-private:438
712-msgid "Could not mount private ecryptfs directory"
713-msgstr ""
714-
715-#: src/utils/ecryptfs-setup-private:439
716-msgid "Could not create empty file"
717-msgstr ""
718-
719-#: src/utils/ecryptfs-setup-private:440
720-msgid "Could not generate random data"
721-msgstr ""
722-
723-#: src/utils/ecryptfs-setup-private:441
724-msgid "Could not write encrypted file"
725-msgstr ""
726-
727-#: src/utils/ecryptfs-setup-private:442
728-msgid "Could not read encrypted file"
729-msgstr ""
730-
731-#: src/utils/ecryptfs-setup-private:443
732-msgid "Could not unmount private ecryptfs directory"
733-msgstr ""
734-
735-#: src/utils/ecryptfs-setup-private:444
736-msgid "Could not mount private ecryptfs directory (2)"
737-msgstr ""
738-
739-#: src/utils/ecryptfs-setup-private:445
740-msgid "Could not read encrypted file (2)"
741-msgstr ""
742-
743-#: src/utils/ecryptfs-setup-private:449
744-msgid "Could not unmount private ecryptfs directory (2)"
745-msgstr ""
746-
747-#: src/utils/ecryptfs-setup-private:451
748-msgid "Testing failed."
749-msgstr ""
750-
751-#: src/utils/ecryptfs-setup-private:453
752-msgid "Testing succeeded."
753-msgstr ""
754-
755-#: src/utils/ecryptfs-setup-private:457
756-msgid "Logout, and log back in to begin using your encrypted directory."
757-msgstr ""
758-
759-#: src/utils/ecryptfs-setup-swap:34 src/utils/ecryptfs-setup-swap:128
760-msgid "WARNING:"
761-msgstr ""
762-
763-#: src/utils/ecryptfs-setup-swap:39
764-msgid "Usage:"
765-msgstr ""
766-
767-#: src/utils/ecryptfs-setup-swap:64
768-msgid "Please install"
769-msgstr ""
770-
771-#: src/utils/ecryptfs-setup-swap:67
772-msgid "This program must be run with 'sudo', or as root"
773-msgstr ""
774-
775-#: src/utils/ecryptfs-setup-swap:75
776-msgid "You can create a swap file by doing:"
777-msgstr ""
778-
779-#: src/utils/ecryptfs-setup-swap:80
780-msgid "And then re-run"
781-msgstr ""
782-
783-#: src/utils/ecryptfs-setup-swap:91
784-msgid "does not appear to be swap space, skipping."
785-msgstr ""
786-
787-#: src/utils/ecryptfs-setup-swap:96
788-msgid "is a RAM device, skipping."
789-msgstr ""
790-
791-#: src/utils/ecryptfs-setup-swap:102
792-msgid "already appears to be encrypted, skipping."
793-msgstr ""
794-
795-#: src/utils/ecryptfs-setup-swap:108 src/utils/ecryptfs-setup-swap:112
796-msgid "already has an entry in /etc/crypttab, skipping."
797-msgstr ""
798-
799-#: src/utils/ecryptfs-setup-swap:129
800-msgid ""
801-"An encrypted swap is required to help ensure that encrypted files are not "
802-"leaked to disk in an unencrypted format."
803-msgstr ""
804-
805-#: src/utils/ecryptfs-setup-swap:131
806-msgid ""
807-"HOWEVER, THE SWAP ENCRYPTION CONFIGURATION PRODUCED BY THIS PROGRAM WILL "
808-"BREAK HIBERNATE/RESUME ON THIS SYSTEM!"
809-msgstr ""
810-
811-#: src/utils/ecryptfs-setup-swap:133
812-msgid "NOTE: Your suspend/resume capabilities will not be affected."
813-msgstr ""
814-
815-#: src/utils/ecryptfs-setup-swap:135
816-msgid "Do you want to proceed with encrypting your swap?"
817-msgstr ""
818-
819-#: src/utils/ecryptfs-setup-swap:140
820-msgid "Aborting."
821-msgstr ""
822-
823-#: src/utils/ecryptfs-setup-swap:150
824-msgid "Setting up swap:"
825-msgstr ""
826-
827-#: src/utils/ecryptfs-setup-swap:181
828-msgid "Successfully setup encrypted swap!"
829-msgstr ""
830-
831-#: src/utils/ecryptfs-umount-private:21
832-msgid "Your private directory has been unmounted."
833-msgstr ""
834
835=== modified file 'debian/rules'
836--- debian/rules 2009-11-10 12:05:58 +0000
837+++ debian/rules 2010-02-17 18:44:15 +0000
838@@ -20,30 +20,12 @@
839
840 CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
841
842-install-po: update-pot
843- for po in ${PO_DIR}/*.po ; do \
844- lang=$${po#po/}; lang=$${lang%.po}; \
845- mkdir -p ${PO_DIR}/locale/$${lang}/LC_MESSAGES/; \
846- msgfmt $${po} -o ${PO_DIR}/locale/$${lang}/LC_MESSAGES/${PKG}.mo ; \
847- done
848-
849-update-pot:
850- rm -f ${PO_DIR}/${PKG}.pot
851- xgettext -o ${PO_DIR}/${PKG}.pot -L Shell -f ${PO_DIR}/POTFILES.sh
852- for po in ${PO_DIR}/*.po ; do \
853- msgmerge $${po} ${PO_DIR}/${PKG}.pot -o $${po} ; \
854- done
855-
856 clean:
857 dh_testdir
858 dh_testroot
859 rm -f build-stamp
860 rm -f config.guess config.sub
861- for po in ${PO_DIR}/*.po ; do \
862- lang=$${po#po/}; lang=$${lang%.po}; \
863- rm -f ${PO_DIR}/locale/$${lang}/LC_MESSAGES/${PKG}.mo ; \
864- done
865-
866+ rm -f po/*.pot
867
868 [ ! -f Makefile ] || $(MAKE) distclean
869
870@@ -66,10 +48,11 @@
871 dh_testdir
872
873 $(MAKE)
874+ cd po; intltool-update -p
875
876 touch build-stamp
877
878-install: build install-po
879+install: build
880 dh_testdir
881 dh_testroot
882 dh_prep
883
884=== added directory 'po'
885=== added file 'po/LINGUAS'
886--- po/LINGUAS 1970-01-01 00:00:00 +0000
887+++ po/LINGUAS 2010-02-17 18:44:15 +0000
888@@ -0,0 +1,3 @@
889+# please keep this list sorted alphabetically
890+#
891+ca
892
893=== added file 'po/POTFILES.in'
894--- po/POTFILES.in 1970-01-01 00:00:00 +0000
895+++ po/POTFILES.in 2010-02-17 18:44:15 +0000
896@@ -0,0 +1,9 @@
897+[type: gettext/rfc822deb] src/desktop/ecryptfs-record-passphrase
898+src/desktop/ecryptfs-mount-private.desktop.in
899+src/desktop/ecryptfs-setup-private.desktop.in
900+src/utils/ecryptfs-mount-private
901+src/utils/ecryptfs-rewrite-file
902+src/utils/ecryptfs-setup-private
903+src/utils/ecryptfs-setup-swap
904+src/utils/ecryptfs-umount-private
905+
906
907=== added file 'po/ca.po'
908--- po/ca.po 1970-01-01 00:00:00 +0000
909+++ po/ca.po 2010-02-17 18:44:15 +0000
910@@ -0,0 +1,50 @@
911+# Catalan translations for ecryptfs-utils package
912+# Traduccions al català del paquet «ecryptfs-utils».
913+# Copyright (C) 2010 THE ecryptfs-utils'S COPYRIGHT HOLDER
914+# This file is distributed under the same license as the ecryptfs-utils package.
915+# David Planella <david.planella@ubuntu.com>, 2010.
916+#
917+msgid ""
918+msgstr ""
919+"Project-Id-Version: ecryptfs-utils 82\n"
920+"Report-Msgid-Bugs-To: \n"
921+"POT-Creation-Date: 2010-02-17 19:18+0100\n"
922+"PO-Revision-Date: 2010-02-17 19:39+0100\n"
923+"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
924+"Language-Team: Catalan\n"
925+"MIME-Version: 1.0\n"
926+"Content-Type: text/plain; charset=UTF-8\n"
927+"Content-Transfer-Encoding: 8bit\n"
928+
929+#. Name
930+#: ../src/desktop/ecryptfs-record-passphrase:1
931+msgid "Record your encryption passphrase"
932+msgstr "Establiu la vostra contrasenya de xifratge"
933+
934+#. Description
935+#: ../src/desktop/ecryptfs-record-passphrase:8
936+msgid ""
937+"To encrypt your home directory or \"Private\" folder, a strong passphrase "
938+"has been autogenerated. Usually your directory is unlocked with your user "
939+"password, but if you ever need to manually recover this directory, you will "
940+"need this passphrase. Please print or write it down and store it in a safe "
941+"location."
942+msgstr ""
943+"S'ha generat automàticament una contrasenya forta per poder xifrar la vostra carpeta d'usuari o la carpeta «Private». Generalment la carpeta es desbloca amb la contrasenya d'usuari, però si mai us cal recuperar la carpeta manualment, caldrà que utilitzeu aquesta contrasenya. Imprimiu-la o escriviu-la i deseu-la en un lloc segur."
944+
945+#. Description
946+#: ../src/desktop/ecryptfs-record-passphrase:8
947+msgid ""
948+"You can run the \"ecryptfs-unwrap-passphrase\" command now to do this. Enter "
949+"your user password at the \"Passphrase\" prompt."
950+msgstr ""
951+"Ara podeu executar l'ordre «ecryptfs-unwrap-passphrase» per a poder-ho fer. "
952+"Introduïu la vostra contrasenya d'usuari quan se us demani com a «Passphrase»."
953+
954+#: ../src/desktop/ecryptfs-mount-private.desktop.in.h:1
955+msgid "Access Your Private Data"
956+msgstr "Accediu a les vostres dades privades"
957+
958+#: ../src/desktop/ecryptfs-setup-private.desktop.in.h:1
959+msgid "Setup Your Encrypted Private Directory"
960+msgstr "Configureu el vostre directori privat xifrat"
961
962=== modified file 'src/desktop/Makefile.am'
963--- src/desktop/Makefile.am 2009-07-17 18:33:44 +0000
964+++ src/desktop/Makefile.am 2010-02-17 18:44:15 +0000
965@@ -1,4 +1,17 @@
966 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
967
968 eudatarootdir = $(datarootdir)/ecryptfs-utils
969-dist_eudataroot_SCRIPTS = ecryptfs-mount-private.desktop ecryptfs-setup-private.desktop ecryptfs-record-passphrase
970+dist_eudataroot_SCRIPTS = ecryptfs-record-passphrase
971+
972+desktopdir = $(datarootdir)/ecryptfs-utils
973+
974+desktop_in_files = \
975+ ecryptfs-mount-private.desktop.in \
976+ ecryptfs-setup-private.desktop.in
977+
978+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
979+
980+@INTLTOOL_DESKTOP_RULE@
981+
982+
983+
984
985=== removed file 'src/desktop/ecryptfs-mount-private.desktop'
986--- src/desktop/ecryptfs-mount-private.desktop 2009-07-17 18:33:44 +0000
987+++ src/desktop/ecryptfs-mount-private.desktop 1970-01-01 00:00:00 +0000
988@@ -1,7 +0,0 @@
989-[Desktop Entry]
990-Name=Access Your Private Data
991-GenericName=Access Your Private Data
992-Exec=/usr/bin/ecryptfs-mount-private
993-Terminal=true
994-Type=Application
995-Categories=System;Security;
996
997=== added file 'src/desktop/ecryptfs-mount-private.desktop.in'
998--- src/desktop/ecryptfs-mount-private.desktop.in 1970-01-01 00:00:00 +0000
999+++ src/desktop/ecryptfs-mount-private.desktop.in 2010-02-17 18:44:15 +0000
1000@@ -0,0 +1,8 @@
1001+[Desktop Entry]
1002+_Name=Access Your Private Data
1003+_GenericName=Access Your Private Data
1004+Exec=/usr/bin/ecryptfs-mount-private
1005+Terminal=true
1006+Type=Application
1007+Categories=System;Security;
1008+X-Ubuntu-Gettext-Domain=ecryptfs-utils
1009
1010=== modified file 'src/desktop/ecryptfs-record-passphrase'
1011--- src/desktop/ecryptfs-record-passphrase 2009-07-17 18:33:44 +0000
1012+++ src/desktop/ecryptfs-record-passphrase 2010-02-17 18:44:15 +0000
1013@@ -1,11 +1,12 @@
1014-Name: Record your encryption passphrase
1015-Name-de: Notieren Sie Ihr Verschlüsselungs-Passwort
1016+_Name: Record your encryption passphrase
1017 Priority: High
1018 OnlyAdminUsers: False
1019 DisplayIf: test -e $HOME/.ecryptfs/wrapped-passphrase -a ! -e $HOME/.ecryptfs/.wrapped-passphrase.recorded
1020 Terminal: True
1021+GettextDomain: ecryptfs-utils
1022 Command: "sh -c 'ecryptfs-unwrap-passphrase $HOME/.ecryptfs/wrapped-passphrase 2>/dev/null && echo [Enter] && head -n1 && touch $HOME/.ecryptfs/.wrapped-passphrase.recorded '"
1023-Description: To encrypt your home directory or "Private" folder, a strong
1024+_Description:
1025+ To encrypt your home directory or "Private" folder, a strong
1026 passphrase has been autogenerated. Usually your directory is unlocked
1027 with your user password, but if you ever need to manually recover this
1028 directory, you will need this passphrase. Please print or write it down and
1029@@ -13,12 +14,3 @@
1030 .
1031 You can run the "ecryptfs-unwrap-passphrase" command now to do this. Enter
1032 your user password at the "Passphrase" prompt.
1033-Description-de: Um Ihr Heimat- oder "Private"-Verzeichnis zu verschlüsseln,
1034- wurde automatisch ein starkes Passwort geniert. Normalerweise wird Ihr
1035- Verzeichnis mit Ihrem Benutzerpasswort freigegeben, aber wenn Sie jemals
1036- dieses Verzeichnis manuell wiederherstellen müssen, benötigen Sie dieses
1037- Passwort. Bitte drucken Sie es aus oder schreiben es auf und lagern es an
1038- einem sicheren Ort.
1039- .
1040- Sie können den "ecryptfs-unwrap-passphrase"-Befehl jetzt ausführen lassen.
1041- Geben Sie Ihr Benutzerpasswort bei der "Passphrase"-Aufforderung ein.
1042
1043=== removed file 'src/desktop/ecryptfs-setup-private.desktop'
1044--- src/desktop/ecryptfs-setup-private.desktop 2009-07-17 18:33:44 +0000
1045+++ src/desktop/ecryptfs-setup-private.desktop 1970-01-01 00:00:00 +0000
1046@@ -1,7 +0,0 @@
1047-[Desktop Entry]
1048-Name=Setup Your Encrypted Private Directory
1049-GenericName=Setup Your Encrypted Private Directory
1050-Exec=/usr/bin/ecryptfs-setup-private
1051-Terminal=true
1052-Type=Application
1053-Categories=Settings;Security;
1054
1055=== added file 'src/desktop/ecryptfs-setup-private.desktop.in'
1056--- src/desktop/ecryptfs-setup-private.desktop.in 1970-01-01 00:00:00 +0000
1057+++ src/desktop/ecryptfs-setup-private.desktop.in 2010-02-17 18:44:15 +0000
1058@@ -0,0 +1,8 @@
1059+[Desktop Entry]
1060+_Name=Setup Your Encrypted Private Directory
1061+_GenericName=Setup Your Encrypted Private Directory
1062+Exec=/usr/bin/ecryptfs-setup-private
1063+Terminal=true
1064+Type=Application
1065+Categories=Settings;Security;
1066+X-Ubuntu-Gettext-Domain=ecryptfs-utils

Subscribers

People subscribed via source and target branches

to all changes: