Commit 34ededd6 authored by Michael Terry's avatar Michael Terry

use itstool for translating the help

parent 30b8163f
......@@ -21,14 +21,19 @@ SUBDIRS = data po vapi common widgets monitor preferences deja-dup nautilus help
# Distribute pot file
update-pot:
$(MAKE) -C po "$(GETTEXT_PACKAGE).pot"
$(MAKE) -C help update-pot
$(MAKE) -C help pot
dist-hook: update-pot
# call like 'make copy-po TD=path-to-translation-dir'
copy-po:
test -d $(TD)
cp -a $(TD)/po/*.po po && bzr add po/*.po
cp -a $(TD)/help/translations/*.po help/translations && bzr add help/translations/*.po
cp -a $(TD)/po/*.po po
for po in $(TD)/help/*.po; do \
mkdir -p help/$(basename $(po) .po); \
cp -a $(po) help/$(basename $(po) .po)/; \
done
bzr add po/*.po
bzr add help/*/*.po
sign:
gpg --armor --sign --detach-sig deja-dup-$(PACKAGE_VERSION).tar.bz2
......
......@@ -30,7 +30,7 @@ AM_INIT_AUTOMAKE([1.11 foreign tar-ustar dist-bzip2 no-dist-gzip])
AM_SILENT_RULES([yes])
AM_MAINTAINER_MODE()
GNOME_DOC_INIT
YELP_HELP_INIT
GLIB_GSETTINGS
# Checks for programs.
......
......@@ -9,29 +9,39 @@
<link type="guide" xref="index#about"/>
</info>
<title>Credits</title>
<list>
<section>
<title>Development</title>
<list>
<item its:translate="no"><p><link href="mailto:temposs@gmail.com">Andrew Fister</link></p></item>
<item its:translate="no"><p><link href="mailto:mike@mterry.name">Michael Terry</link></p></item>
<item its:translate="no"><p><link href="mailto:michael.vogt@ubuntu.com">Michael Vogt</link></p></item>
<item its:translate="no"><p><link href="mailto:urban.skudnik@gmail.com">Urban Skudnik</link></p></item>
<item its:translate="no"><p><link href="http://www.canonical.com/">Canonical Ltd</link></p></item>
</list>
</section>
<list>
<section>
<title>Documentation</title>
<list>
<item its:translate="no"><p><link href="mailto:mike@mterry.name">Michael Terry</link></p></item>
<item its:translate="no"><p><link href="http://www.canonical.com/">Canonical Ltd</link></p></item>
</list>
</section>
<list>
<section>
<title>Art</title>
<list>
<item its:translate="no"><p><link href="mailto:nisses.mail@home.se">Andreas Nilsson</link></p></item>
<item its:translate="no"><p><link href="mailto:jimmac@novell.com">Jakub Steiner</link></p></item>
<item its:translate="no"><p><link href="mailto:calamandrei@gmail.com">Lapo Calamandrei</link></p></item>
<item its:translate="no"><p><link href="mailto:mike@mterry.name">Michael Terry</link></p></item>
</list>
</section>
<list><title>Translation</title><item><p>translator-credits</p></item></list>
<section>
<title>Translation</title>
<code>translator-credits</code>
</section>
</page>
<?xml version="1.0" encoding="utf-8"?>
<page xmlns="http://projectmallard.org/1.0/"
xmlns:its="http://www.w3.org/2005/11/its"
its:version="1.0"
type="topic"
id="restore-lost">
<info>
......@@ -16,5 +18,5 @@
<item><p>Review your selections and click <gui style="button">Restore</gui>.</p></item>
</steps>
<note style="advanced"><p>You can restore lost files from the command line as well, if you remember what their filenames were:</p>
<screen>deja-dup --restore FILE1 FILE2</screen></note>
<screen><span its:translate="no">deja-dup --restore </span>FILE1 FILE2</screen></note>
</page>
<?xml version="1.0" encoding="utf-8"?>
<page xmlns="http://projectmallard.org/1.0/"
xmlns:its="http://www.w3.org/2005/11/its"
its:version="1.0"
type="topic"
id="restore-revert">
<info>
......@@ -17,5 +19,5 @@
</steps>
<note style="tip"><p>You can select multiple files at once before right clicking.</p></note>
<note style="advanced"><p>You can also revert files on the command line:</p>
<screen>deja-dup --restore FILE1 FILE2</screen></note>
<screen><span its:translate="no">deja-dup --restore </span>FILE1 FILE2</screen></note>
</page>
<?xml version="1.0" encoding="utf-8"?>
<page xmlns="http://projectmallard.org/1.0/"
xmlns:its="http://www.w3.org/2005/11/its"
its:version="1.0"
type="topic"
id="restore-worst-case">
<info>
......@@ -15,8 +17,8 @@
<steps>
<item><p>Open a <app>Terminal</app> window by pressing <keyseq><key>Ctrl</key><key>Alt</key><key>T</key></keyseq>.</p></item>
<item><p>Create the directory in which you will place your restored files. This guide will use <file>/tmp/restore</file>:</p>
<screen>mkdir -p /tmp/restore</screen></item>
<item><p>Create the directory in which you will place your restored files. This guide will use <file its:translate="no">/tmp/restore</file>:</p>
<screen its:translate="no">mkdir -p /tmp/restore</screen></item>
</steps>
<section id="duplicity">
......@@ -26,69 +28,69 @@
<note style="advanced"><p>If you want more information about <app>duplicity</app> than presented here, run <cmd>man duplicity</cmd>.</p></note>
<p>The first thing we’ll try is a simple restore of all your data. Assuming your files are on an external drive mounted as <file>/media/backup</file> and you chose to encrypt the backup, try this:</p>
<screen>duplicity --gio file:///media/backup /tmp/restore</screen>
<p>The first thing we’ll try is a simple restore of all your data. Assuming your files are on an external drive mounted as <file its:translate="no">/media/backup</file> and you chose to encrypt the backup, try this:</p>
<screen its:translate="no">duplicity --gio file:///media/backup /tmp/restore</screen>
<p>If you didn’t encrypt the backup, add <cmd>--no-encryption</cmd> to the command.</p>
<p>If you didn’t encrypt the backup, add <cmd its:translate="no">--no-encryption</cmd> to the command.</p>
<section id="locations">
<title>Other Backup Locations</title>
<p>If you backed up to a remote or cloud server, the syntax you use with <app>duplicity</app> will be different than the external drive example above. See below for how to connect to your chosen backup location.</p>
<note><p>Remember to add <cmd>--no-encryption</cmd> to any example commands if you’re backup is not encrypted.</p></note>
<note><p>Remember to add <cmd its:translate="no">--no-encryption</cmd> to any example commands if your backup is not encrypted.</p></note>
<p>If <app>duplicity</app> appears to be having trouble connecting to your server, try downloading all the <app>duplicity</app> files yourself to a local folder and following the simpler example above.</p>
<terms>
<item>
<title>Amazon S3</title>
<p>Look up your Amazon S3 access key ID and secret access key and replace instances of <var>ID</var> and <var>SECRET</var> in the example below with those respective values.</p>
<p>You may have specified a folder in which to put the backup files. In the example below, replace any instance of <var>FOLDER</var> with that path.</p>
<screen>
export AWS_ACCESS_KEY_ID=<var>ID</var>
export AWS_SECRET_ACCESS_KEY=<var>SECRET</var>
duplicity s3+http://deja-dup-auto-<var>LOWERCASE_ID</var>/<var>FOLDER</var> /tmp/restore</screen>
<screen its:translate="no">
export AWS_ACCESS_KEY_ID=<var its:translate="yes">ID</var>
export AWS_SECRET_ACCESS_KEY=<var its:translate="yes">SECRET</var>
duplicity s3+http://deja-dup-auto-<var its:translate="yes">LOWERCASE_ID</var>/<var its:translate="yes">FOLDER</var> /tmp/restore</screen>
</item>
<item>
<title>Rackspace Cloud Files</title>
<p>Look up your Rackspace username and API key and replace instances of <var>USERNAME</var> and <var>KEY</var> in the example below with those respective values.</p>
<p>You may have specified a container in which to put the backup files. In the example below, replace any instance of <var>CONTAINER</var> with that name.</p>
<screen>
export CLOUDFILES_USERNAME=<var>USERNAME</var>
export CLOUDFILES_APIKEY=<var>KEY</var>
duplicity cf+http://<var>CONTAINER</var> /tmp/restore</screen>
<screen its:translate="no">
export CLOUDFILES_USERNAME=<var its:translate="yes">USERNAME</var>
export CLOUDFILES_APIKEY=<var its:translate="yes">KEY</var>
duplicity cf+http://<var its:translate="yes">CONTAINER</var> /tmp/restore</screen>
</item>
<item>
<title>FTP</title>
<p>Look up your server address, port, username, and password and replace instances of <var>SERVER</var>, <var>PORT</var>, <var>USERNAME</var>, and <var>PASSWORD</var> in the example below with those respective values.</p>
<p>You may have specified a folder in which to put the backup files. In the example below, replace any instance of <var>FOLDER</var> with that path.</p>
<p>If you chose to not log in with a username, use <var>anonymous</var> as your <var>USERNAME</var> below.</p>
<screen>
gvfs-mount ftp://<var>USERNAME</var>@<var>SERVER</var>:<var>PORT</var>/<var>FOLDER</var>
duplicity --gio ftp://<var>USERNAME</var>@<var>SERVER</var>:<var>PORT</var>/<var>FOLDER</var> /tmp/restore</screen>
<p>If you chose to not log in with a username, use <var its:translate="no">anonymous</var> as your <var>USERNAME</var> below.</p>
<screen its:translate="no">
gvfs-mount ftp://<var its:translate="yes">USERNAME</var>@<var its:translate="yes">SERVER</var>:<var its:translate="yes">PORT</var>/<var its:translate="yes">FOLDER</var>
duplicity --gio ftp://<var its:translate="yes">USERNAME</var>@<var its:translate="yes">SERVER</var>:<var its:translate="yes">PORT</var>/<var its:translate="yes">FOLDER</var> /tmp/restore</screen>
</item>
<item>
<title>SSH</title>
<p>Look up your server address, port, username, and password and replace instances of <var>SERVER</var>, <var>PORT</var>, <var>USERNAME</var>, and <var>PASSWORD</var> in the example below with those respective values.</p>
<p>You may have specified a folder in which to put the backup files. In the example below, replace any instance of <var>FOLDER</var> with that path.</p>
<screen>
gvfs-mount ssh://<var>USERNAME</var>@<var>SERVER</var>:<var>PORT</var>/<var>FOLDER</var>
duplicity --gio ssh://<var>USERNAME</var>@<var>SERVER</var>:<var>PORT</var>/<var>FOLDER</var> /tmp/restore</screen>
<screen its:translate="no">
gvfs-mount ssh://<var its:translate="yes">USERNAME</var>@<var its:translate="yes">SERVER</var>:<var its:translate="yes">PORT</var>/<var its:translate="yes">FOLDER</var>
duplicity --gio ssh://<var its:translate="yes">USERNAME</var>@<var its:translate="yes">SERVER</var>:<var its:translate="yes">PORT</var>/<var its:translate="yes">FOLDER</var> /tmp/restore</screen>
</item>
<item>
<title>WebDAV</title>
<p>Look up your server address, port, username, and password and replace instances of <var>SERVER</var>, <var>PORT</var>, <var>USERNAME</var>, and <var>PASSWORD</var> in the example below with those respective values.</p>
<p>You may have specified a folder in which to put the backup files. In the example below, replace any instance of <var>FOLDER</var> with that path.</p>
<p>If you chose to use a secure connection (HTTPS) when backing up, use <var>davs://</var> instead of <var>dav://</var> in the example below.</p>
<screen>
gvfs-mount dav://<var>USERNAME</var>@<var>SERVER</var>:<var>PORT</var>/<var>FOLDER</var>
duplicity --gio dav://<var>USERNAME</var>@<var>SERVER</var>:<var>PORT</var>/<var>FOLDER</var> /tmp/restore</screen>
<p>If you chose to use a secure connection (HTTPS) when backing up, use <var its:translate="no">davs://</var> instead of <var its:translate="no">dav://</var> in the example below.</p>
<screen its:translate="no">
gvfs-mount dav://<var its:translate="yes">USERNAME</var>@<var its:translate="yes">SERVER</var>:<var its:translate="yes">PORT</var>/<var its:translate="yes">FOLDER</var>
duplicity --gio dav://<var its:translate="yes">USERNAME</var>@<var its:translate="yes">SERVER</var>:<var its:translate="yes">PORT</var>/<var its:translate="yes">FOLDER</var> /tmp/restore</screen>
</item>
<item>
<title>Windows Share</title>
<p>Look up your server address, username, and password and replace instances of <var>SERVER</var>, <var>USERNAME</var>, and <var>PASSWORD</var> in the example below with those respective values.</p>
<p>You may have specified a folder in which to put the backup files. In the example below, replace any instance of <var>FOLDER</var> with that path.</p>
<p>If you specified a domain for your Windows server, add it to the beginning of <var>USERNAME</var> with a semicolon between them. For example, <var>domain;username</var>.</p>
<screen>
gvfs-mount smb://<var>USERNAME</var>@<var>SERVER</var>/<var>FOLDER</var>
duplicity --gio smb://<var>USERNAME</var>@<var>SERVER</var>/<var>FOLDER</var> /tmp/restore</screen>
<screen its:translate="no">
gvfs-mount smb://<var its:translate="yes">USERNAME</var>@<var its:translate="yes">SERVER</var>/<var its:translate="yes">FOLDER</var>
duplicity --gio smb://<var its:translate="yes">USERNAME</var>@<var its:translate="yes">SERVER</var>/<var its:translate="yes">FOLDER</var> /tmp/restore</screen>
</item>
</terms>
</section>
......@@ -104,23 +106,23 @@ duplicity --gio smb://<var>USERNAME</var>@<var>SERVER</var>/<var>FOLDER</var> /t
<p><app>Duplicity</app> stores your data in small chunks called volumes. Some volumes belong to the periodic ‘full’ or fresh backups and others to the ‘inc’ or incremental backups. Starting with a full backup set of volumes at volume 1, you’ll need to restore files volume by volume.</p>
<p>If you encrypted your backup, first you must decrypt the volume with <cmd>gpg</cmd>. Say you have <file>duplicity-full.20110127T131352Z.vol1.difftar.gpg</file>:</p>
<screen>gpg --output duplicity-full.20110127T131352Z.vol1.difftar --decrypt duplicity-full.20110127T131352Z.vol1.difftar.gpg</screen>
<p>If you encrypted your backup, first you must decrypt the volume with <cmd its:translate="no">gpg</cmd>. Say you have <file its:translate="no">duplicity-full.20110127T131352Z.vol1.difftar.gpg</file>:</p>
<screen its:translate="no">gpg --output duplicity-full.20110127T131352Z.vol1.difftar --decrypt duplicity-full.20110127T131352Z.vol1.difftar.gpg</screen>
<p>Or to do all at once (make sure you have plenty of space!):</p>
<screen>gpg --multifile --decrypt duplicity-full.20110127T131352Z.*.difftar.gpg</screen>
<screen its:translate="no">gpg --multifile --decrypt duplicity-full.20110127T131352Z.*.difftar.gpg</screen>
<p>Now you have either a <file>.difftar</file> or a <file>.difftar.gz</file> volume (depending on whether you had to decrypt it or not). Use <cmd>tar</cmd> on whichever one you have to extract the individual patch files:</p>
<screen>tar xf duplicity-full.20110127T131352Z.vol1.difftar</screen>
<p>Now you have either a <file its:translate="no">.difftar</file> or a <file its:translate="no">.difftar.gz</file> volume (depending on whether you had to decrypt it or not). Use <cmd its:translate="no">tar</cmd> on whichever one you have to extract the individual patch files:</p>
<screen its:translate="no">tar xf duplicity-full.20110127T131352Z.vol1.difftar</screen>
<p>Or again, to do all at once:</p>
<screen>for t in duplicity-full.20110127T131352Z.*.difftar; do tar xf $t; done</screen>
<screen its:translate="no">for t in duplicity-full.20110127T131352Z.*.difftar; do tar xf $t; done</screen>
<p>Now the patch files will be in <file>multivolume_snapshot</file> and <file>snapshot</file> folders. Each file that spanned multiple volumes will be in <file>multivolume_snapshot</file>. Let’s say you backed up <file>/home/jane/essay.txt</file>:</p>
<screen>cd multivolume_snapshot/home/jane/essay.txt
<p>Now the patch files will be in <file its:translate="no">multivolume_snapshot</file> and <file its:translate="no">snapshot</file> folders. Each file that spanned multiple volumes will be in <file its:translate="no">multivolume_snapshot</file>. Let’s say you backed up <file its:translate="no">/home/jane/essay.txt</file>:</p>
<screen its:translate="no">cd multivolume_snapshot/home/jane/essay.txt
cat * > essay.txt</screen>
<p>To recover data from incremental backups, use <cmd>rdiff</cmd> to stitch the files together. See <cmd>man rdiff</cmd> for usage.</p>
<p>To recover data from incremental backups, use <cmd its:translate="no">rdiff</cmd> to stitch the files together. See <cmd its:translate="no">man rdiff</cmd> for usage.</p>
</section>
......
......@@ -17,11 +17,11 @@
# You should have received a copy of the GNU General Public License
# along with Déjà Dup. If not, see <http://www.gnu.org/licenses/>.
include $(top_srcdir)/gnome-doc-utils.make
@YELP_HELP_RULES@
DOC_ID = deja-dup
HELP_ID = deja-dup
DOC_PAGES = \
HELP_FILES = \
backup-auto.page \
backup-first.page \
credits.page \
......@@ -35,28 +35,10 @@ DOC_PAGES = \
restore-worst-case.page \
support.page
REAL_LINGUAS = ar cs da de en_GB es eu fi fr gl he hu id it ja lt nb nl pl ps pt_BR ru sv th tr zh_CN zh_TW
DOC_LINGUAS = POT $(REAL_LINGUAS)
HELP_LINGUAS = ar cs da de en_GB es eu fi fr gl he hu id it ja lt nb nl pl ps pt_BR ru sv th tr zh_CN zh_TW
$(_DOC_LC_DOCS) : po.stamp
deja-dup-help.pot: deja-dup.pot
cp -a $^ $@
po.stamp: $(wildcard translations/*.po)
for p in $?; do $(mkdir_p) $$(basename $$p .po)/; \
cp -a $$p $$(basename $$p .po)/; done
touch $@
update-pot: translations/deja-dup-help.pot
POT/POT.po: $(foreach page,$(DOC_PAGES),C/$(page))
translations/deja-dup-help.pot: POT/POT.po
$(mkdir_p) $(dir $@)
sed 's|^#: /.*/\(.*\)|#: \1|g' $^ > $@
dist-hook: doc-dist-hook
for p in $(REAL_LINGUAS); do \
sed -i "s|<list><title>.*</title><item><p>translator-credits</p></item></list>||" "$(distdir)/$$p/credits.page"; \
done
EXTRA_DIST = translations po.stamp
DISTCLEANFILES = translations/deja-dup-help.pot
.PHONY: update-pot
pot: deja-dup-help.pot
all: deja-dup-help.pot
......@@ -619,8 +619,8 @@ msgstr ""
#: restore-full.page:28(p)
msgid "Review your selections and click <gui style=\"button\">Restore</gui>."
msgstr ""
"Überprüfen Sie Ihre ausgewählten Dateien und klicken Sie auf <gui style=\\"
"\"button\\\">Wiederherstellen</gui>."
"Überprüfen Sie Ihre ausgewählten Dateien und klicken Sie auf <gui style="
"\"button\">Wiederherstellen</gui>."
#: restore-lost.page:18(p)
msgid ""
......
This diff is collapsed.
......@@ -409,7 +409,7 @@ msgstr "Premi il tasto destro sul file che si desidera ripristinare"
#: restore-revert.page:13(p)
msgid "Choose <gui style=\"menuitem\">Revert to Previous Version…</gui>."
msgstr ""
"Scegli <gui style=\"menuitem\"> Ripristina versione precedente ... </> GUI."
"Scegli <gui style=\"menuitem\"> Ripristina versione precedente ... </gui>."
#: restore-revert.page:14(p)
msgid ""
......@@ -481,7 +481,7 @@ msgstr ""
#: restore-full.page:28(p)
msgid "Review your selections and click <gui style=\"button\">Restore</gui>."
msgstr ""
"Verifica le selezioni e fai clic su <gui style=\"button\"> Restore </ gui>"
"Verifica le selezioni e fai clic su <gui style=\"button\"> Restore </gui>"
#: restore-lost.page:18(p)
msgid ""
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment