Commit 64f3c9f0 authored by Tails developers's avatar Tails developers

Merge remote-tracking branch 'winterfairy/feature/import-translations' into devel

parents 42e9d73f 2b40ccb5
......@@ -34,7 +34,7 @@
/vagrant/squeeze.box
# Files managed by intltool
/config/chroot_local-includes/etc/skel/Desktop/Report_a_Bug.desktop
/config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop
/config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop
/config/chroot_local-includes/usr/share/applications/tails-reboot.desktop
/config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop
......
......@@ -39,7 +39,6 @@ rm -rf cache/stages_rootfs
# save variables that are needed by chroot_local-hooks
echo "LB_DISTRIBUTION=${LB_DISTRIBUTION}" >> config/chroot_local-includes/usr/share/amnesia/build/variables
echo "AMNESIA_SUPPORTED_LANGUAGES='${AMNESIA_SUPPORTED_LANGUAGES}'" >> config/chroot_local-includes/usr/share/amnesia/build/variables
echo "POTFILES_DOT_IN='$(
/bin/grep -E --no-filename '[^ #]*\.in$' po/POTFILES.in \
| sed -e 's,^config/chroot_local-includes,,' | tr "\n" ' '
......
......@@ -33,6 +33,3 @@ AMNESIA_FULL_VERSION="${AMNESIA_VERSION} - ${AMNESIA_TODAY}"
AMNESIA_DEV_FULLNAME='Tails developers'
AMNESIA_DEV_EMAIL="[email protected]"
AMNESIA_DEV_KEYID="BE2CD9C1"
# Supported languages (displayed in this order by the syslinux menu)
AMNESIA_SUPPORTED_LANGUAGES="ar zh en fa fr de it pt ru es vi sv"
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Report an error
Name[fr]=Rapporter une erreur
Type=Application
Terminal=false
Exec=/usr/local/bin/tails-documentation support/troubleshooting
Icon=/usr/share/pixmaps/whisperback.svg
#!/bin/sh
set -e
EXCLUDE_LANGS="fr pt_BR"
# Clone or update the translation repository
mkdir -p tmp
cd tmp
if [ -d translation ]; then
cd translation
git fetch origin
cd ..
else
git clone https://git.torproject.org/translation.git
fi
# Checkout the correct branch
cd translation
git checkout tails-misc_completed
git merge origin/tails-misc_completed
# For each completely translated language, merge it,
# unless it is translated outside Transifex
for i in *.po; do
lang="`echo $i | tr - _ | sed 's/\.po$//'`"
skip='n'
for j in $EXCLUDE_LANGS; do
if [ "$lang" = "$j" ]; then skip='y'; fi
done
if [ "$skip" = 'n' ]; then
echo $lang
cp $lang.po ../../po/
fi
done
# Fix syntax of the po files
cd ../../po
for i in *.po; do
lang="`echo $i | tr - _ | sed 's/\.po$//'`"
intltool-update --dist --gettext-package=tails $lang
done
......@@ -12,8 +12,8 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-26 23:41+0200\n"
"PO-Revision-Date: 2013-10-22 06:40+0000\n"
"Last-Translator: Mohammed ALDOUB <voulnet@gmail.com>\n"
"PO-Revision-Date: 2013-11-26 20:10+0000\n"
"Last-Translator: Sherief Alaa <sheriefalaa.w@gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/"
"language/ar/)\n"
"Language: ar\n"
......@@ -454,9 +454,8 @@ msgid ""
msgstr "ستتم إزالة TrueCrypt من تايلز قريباً بسبب الرخصة ومشاكل بالتطوير."
#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
#, fuzzy
msgid "Report an error"
msgstr "ابلغ عن خطأ بالبرنامج"
msgstr "ابلغ عن خطأ"
#: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
msgid "Tails documentation"
......
......@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-26 23:41+0200\n"
"PO-Revision-Date: 2013-10-03 09:20+0000\n"
"PO-Revision-Date: 2013-11-06 09:10+0000\n"
"Last-Translator: andersd <[email protected]>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/torproject/"
"language/da/)\n"
......@@ -450,9 +450,8 @@ msgstr ""
"udvikling."
#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
#, fuzzy
msgid "Report an error"
msgstr "Rapporter en fejl"
msgstr "Rapportér en fejl"
#: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
msgid "Tails documentation"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# ivl1705 <[email protected]>, 2013
# skps <[email protected]>, 2013
# MarioBaier26 <[email protected]>, 2013
msgid ""
......@@ -10,8 +11,8 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-26 23:41+0200\n"
"PO-Revision-Date: 2013-10-01 16:22+0000\n"
"Last-Translator: skps <[email protected].de>\n"
"PO-Revision-Date: 2013-11-06 21:50+0000\n"
"Last-Translator: ivl1705 <[email protected].de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/torproject/"
"language/de/)\n"
"Language: de\n"
......@@ -452,9 +453,8 @@ msgstr ""
"Sorgen um die Entwicklung gibt."
#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
#, fuzzy
msgid "Report an error"
msgstr "Einen Bug melden"
msgstr "Einen Fehler melden"
#: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
msgid "Tails documentation"
......
......@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# strel <[email protected]>, 2013
# mm2herr <[email protected]>, 2013
# strel, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-26 23:41+0200\n"
"PO-Revision-Date: 2013-09-17 13:12+0000\n"
"Last-Translator: strel <[email protected]>\n"
"PO-Revision-Date: 2013-11-10 01:10+0000\n"
"Last-Translator: strel\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/"
"language/es/)\n"
"Language: es\n"
......@@ -454,9 +455,8 @@ msgstr ""
"desarrollo."
#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
#, fuzzy
msgid "Report an error"
msgstr "Informar de un fallo"
msgstr "Informar de un error"
#: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
msgid "Tails documentation"
......
......@@ -4,15 +4,15 @@
#
# Translators:
# jan <[email protected]>, 2013
# Random_R <[email protected]>, 2013
# Random_R, 2013
# Rossano Praderi <[email protected]>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-26 23:41+0200\n"
"PO-Revision-Date: 2013-09-20 07:40+0000\n"
"Last-Translator: jan <[email protected]>\n"
"PO-Revision-Date: 2013-11-27 10:50+0000\n"
"Last-Translator: Random_R\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/torproject/"
"language/it/)\n"
"Language: it\n"
......@@ -452,9 +452,8 @@ msgstr ""
"lo sviluppo."
#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
#, fuzzy
msgid "Report an error"
msgstr "Segnala un Errore"
msgstr "Segnala un errore"
#: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
msgid "Tails documentation"
......
......@@ -4,13 +4,14 @@
#
# Translators:
# plazmism <[email protected]>, 2013
# Masaki Saito <[email protected]>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-26 23:41+0200\n"
"PO-Revision-Date: 2013-08-14 23:10+0000\n"
"Last-Translator: plazmism <[email protected]>\n"
"PO-Revision-Date: 2013-11-06 09:30+0000\n"
"Last-Translator: Masaki Saito <[email protected]>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/"
"language/ja/)\n"
"Language: ja\n"
......@@ -253,14 +254,14 @@ msgstr "追加ソフトウェア"
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
#, fuzzy
msgid ""
"The upgrade failed. This might be due to a network problem. Please check "
"your network connection, try to restart Tails, or read the system log to "
"understand better the problem."
msgstr ""
"アップグレード失敗。ネットワーク問題が原因の場合があります。ネットワーク接続"
"を確認するか、Tailsを再起動してください。"
"アップグレードに失敗しました。これはおそらくネットワーク上の問題によるもので"
"す。ネットワークの設定を確認した後にTailsを再起動するか、システムログを参照し"
"てください。"
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121
msgid "The upgrade was successful."
......@@ -448,9 +449,8 @@ msgstr ""
"す。"
#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
#, fuzzy
msgid "Report an error"
msgstr "バグを報告する"
msgstr "エラーを報告"
#: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
msgid "Tails documentation"
......
......@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-26 23:41+0200\n"
"PO-Revision-Date: 2013-09-17 13:12+0000\n"
"PO-Revision-Date: 2013-11-11 12:00+0000\n"
"Last-Translator: Ojars Balcers <[email protected]>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/"
"language/lv/)\n"
......@@ -453,7 +453,6 @@ msgstr ""
"apsvērumu dēļ."
#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
#, fuzzy
msgid "Report an error"
msgstr "Ziņot par kļūdu"
......
This diff is collapsed.
......@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-26 23:41+0200\n"
"PO-Revision-Date: 2013-09-17 13:12+0000\n"
"PO-Revision-Date: 2013-11-06 16:50+0000\n"
"Last-Translator: WinterFairy <[email protected]>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/"
"language/sv/)\n"
......@@ -449,9 +449,8 @@ msgstr ""
"licens och utveckling."
#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
#, fuzzy
msgid "Report an error"
msgstr "Bugg-anmälan"
msgstr "Felanmälan"
#: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
msgid "Tails documentation"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -4,14 +4,15 @@
#
# Translators:
# simabull tsai, 2013
# SanyaChang <[email protected]>, 2013
# Y.F Yang <[email protected]>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-26 23:41+0200\n"
"PO-Revision-Date: 2013-09-17 21:20+0000\n"
"Last-Translator: simabull tsai\n"
"PO-Revision-Date: 2013-11-17 07:42+0000\n"
"Last-Translator: Y.F Yang <[email protected]>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
"torproject/language/zh_CN/)\n"
"Language: zh_CN\n"
......@@ -37,19 +38,23 @@ msgid ""
"a Tails user. Time to wonder how much you trust your\n"
"Internet and mailbox providers?</p>\n"
msgstr ""
"<h1>Help us fix your bug!</h1>\n"
"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
"<h1>Help us fix your bug!</h1>帮助我们修复你的故障!\n"
"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>阅读我们的故障"
"报告说明\n"
"<p><strong>Do not include more personal information than\n"
"needed!</strong></p>\n"
"<h2>About giving us an email address</h2>\n"
"needed!</strong></p>不要包括多余的不必要的个人信息!\n"
"<h2>About giving us an email address</h2>关于给我们留一个email地址\n"
"<p>If you don't mind disclosing some bits of your identity\n"
"to Tails developers, you can provide an email address to\n"
"let us ask more details about the bug. Additionally entering\n"
"a public PGP key enables us to encrypt such future\n"
"communication.</p>\n"
"communication.</p>如果你不介意透露一点你的身份给Tails的开发者,你可以提供一个"
"email地址让我们可以问你更多的故障细节。另外键入一个公共的PGP 密匙可以让我们加"
"密那些进一步的通讯。\n"
"<p>Anyone who can see this reply will probably infer you are\n"
"a Tails user. Time to wonder how much you trust your\n"
"Internet and mailbox providers?</p>\n"
"Internet and mailbox providers?</p>任何看到这个回复的人都可能会认为你是一个"
"Tails 使用者。是时候去想想到底你有多信任你的互联网和邮箱供应商?\n"
#: config/chroot_local-includes/usr/local/bin/gpgApplet:136
msgid "OpenPGP encryption applet"
......@@ -426,9 +431,8 @@ msgid ""
msgstr "由于许可协议和开发问题,TrueCrypt 很快将从 Tails 中移除。"
#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
#, fuzzy
msgid "Report an error"
msgstr "报告缺陷"
msgstr "报告错误"
#: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1
msgid "Tails documentation"
......
......@@ -89,9 +89,10 @@ Upgrade bundled binary Debian packages
That is: make sure the bundled binary Debian packages contain
up-to-date localization files.
For each bundled Debian package, get updated PO files from the
For each bundled Debian package, run the included `import-translations`
script if one exists, or copy updated PO files from the
Transifex branches of `git://git.torproject.org/translation.git` (e.g.
`whisperback_completed`). Verify and commit.
`whisperback_completed`) manually if it doesn't. Verify and commit.
Then check the PO files [[using i18nspector|contribute/l10n_tricks]].
Correct all the errors that are not in the ignored list of
......@@ -114,14 +115,18 @@ Then see the relevant release processes:
Update PO files
---------------
Copy `*.po` from the `tails-misc_completed` branch in
`https://git.torproject.org/translation.git` into `po/`, **but** skip
[[languages that are maintained in
Git|contribute/how/translate#translate]].
Pull updated translations for languages translated in Transifex:
Refresh the code PO files, commit the result:
./import-translations
./refresh-translations && git commit po -m 'Update PO files.'
Refresh the code PO files:
./refresh-translations
Commit the result, including new PO files:
git add po
git commit -m 'Update PO files.'
Freeze
------
......
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