- tor-commits - lists.torproject.org

[translation/gettor] Update translations for gettor
by translation＠torproject.org 03 Sep '11

03 Sep '11

commit 026dbce025271412140f4c3f15c6c1af3cf61bf1 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 3 13:34:27 2011 +0000 Update translations for gettor --- el_GR/gettor.po | 2 +- hu_HU/gettor.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/el_GR/gettor.po b/el_GR/gettor.po index 7f29133..36d86d8 100644 --- a/el_GR/gettor.po +++ b/el_GR/gettor.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-08-21 21:50-0400\n" -"PO-Revision-Date: 2011-09-03 13:12+0000\n" +"PO-Revision-Date: 2011-09-03 13:34+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/hu_HU/gettor.po b/hu_HU/gettor.po index bca4593..9ef26de 100644 --- a/hu_HU/gettor.po +++ b/hu_HU/gettor.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-08-21 21:50-0400\n" -"PO-Revision-Date: 2011-09-03 13:12+0000\n" +"PO-Revision-Date: 2011-09-03 13:34+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 03 Sep '11

03 Sep '11

commit 02d2e39904487340ce1e744a09e036f66875a81e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 26 16:44:55 2011 +0000 Update translations for gettor --- el_GR/gettor.po | 11 +++++------ hu_HU/gettor.po | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/el_GR/gettor.po b/el_GR/gettor.po index c1a8e07..b574d41 100644 --- a/el_GR/gettor.po +++ b/el_GR/gettor.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-02-27 00:10+0100\n" -"PO-Revision-Date: 2011-08-22 15:42+0000\n" +"POT-Creation-Date: 2011-08-21 21:50-0400\n" +"PO-Revision-Date: 2011-08-26 16:44+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -243,24 +243,23 @@ msgstr "" #: lib/gettor/i18n.py:536 msgid "" -"Thank you for your request. \n" "It was successfully understood. Your request is currently being processed.\n" "Your package should arrive within the next ten minutes." msgstr "" -#: lib/gettor/i18n.py:540 +#: lib/gettor/i18n.py:539 msgid "" "If it doesn't arrive, the package might be too big for your mail provider.\n" "Try resending the mail from a GMAIL.COM or YAHOO.COM account." msgstr "" -#: lib/gettor/i18n.py:543 +#: lib/gettor/i18n.py:542 msgid "" "Unfortunately we are currently experiencing problems and we can't fulfill\n" "your request right now. Please be patient as we try to resolve this issue." msgstr "" -#: lib/gettor/i18n.py:546 +#: lib/gettor/i18n.py:545 msgid "" "Unfortunately there is no split package available for the package you\n" "requested. Please send us another package name or request the same package \n" diff --git a/hu_HU/gettor.po b/hu_HU/gettor.po index 1fa3f6a..ad32a0a 100644 --- a/hu_HU/gettor.po +++ b/hu_HU/gettor.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-02-27 00:10+0100\n" -"PO-Revision-Date: 2011-08-22 15:42+0000\n" +"POT-Creation-Date: 2011-08-21 21:50-0400\n" +"PO-Revision-Date: 2011-08-26 16:44+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -243,24 +243,23 @@ msgstr "" #: lib/gettor/i18n.py:536 msgid "" -"Thank you for your request. \n" "It was successfully understood. Your request is currently being processed.\n" "Your package should arrive within the next ten minutes." msgstr "" -#: lib/gettor/i18n.py:540 +#: lib/gettor/i18n.py:539 msgid "" "If it doesn't arrive, the package might be too big for your mail provider.\n" "Try resending the mail from a GMAIL.COM or YAHOO.COM account." msgstr "" -#: lib/gettor/i18n.py:543 +#: lib/gettor/i18n.py:542 msgid "" "Unfortunately we are currently experiencing problems and we can't fulfill\n" "your request right now. Please be patient as we try to resolve this issue." msgstr "" -#: lib/gettor/i18n.py:546 +#: lib/gettor/i18n.py:545 msgid "" "Unfortunately there is no split package available for the package you\n" "requested. Please send us another package name or request the same package \n"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 03 Sep '11

03 Sep '11

commit fa6e19de4520eb1cef6d42e3e8b60faecf3ff4cb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 26 16:54:53 2011 +0000 Update translations for gettor --- el_GR/gettor.po | 2 +- hu_HU/gettor.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/el_GR/gettor.po b/el_GR/gettor.po index 0835387..aa209e5 100644 --- a/el_GR/gettor.po +++ b/el_GR/gettor.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-08-21 21:50-0400\n" -"PO-Revision-Date: 2011-08-26 16:53+0000\n" +"PO-Revision-Date: 2011-08-26 16:54+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/hu_HU/gettor.po b/hu_HU/gettor.po index 8b277f0..e0de6c3 100644 --- a/hu_HU/gettor.po +++ b/hu_HU/gettor.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-08-21 21:50-0400\n" -"PO-Revision-Date: 2011-08-26 16:53+0000\n" +"PO-Revision-Date: 2011-08-26 16:54+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 03 Sep '11

03 Sep '11

commit ee33016851fee506a3d77475001329808556df3d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 26 16:53:36 2011 +0000 Update translations for gettor --- el_GR/gettor.po | 2 +- hu_HU/gettor.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/el_GR/gettor.po b/el_GR/gettor.po index b574d41..0835387 100644 --- a/el_GR/gettor.po +++ b/el_GR/gettor.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-08-21 21:50-0400\n" -"PO-Revision-Date: 2011-08-26 16:44+0000\n" +"PO-Revision-Date: 2011-08-26 16:53+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" diff --git a/hu_HU/gettor.po b/hu_HU/gettor.po index ad32a0a..8b277f0 100644 --- a/hu_HU/gettor.po +++ b/hu_HU/gettor.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-08-21 21:50-0400\n" -"PO-Revision-Date: 2011-08-26 16:44+0000\n" +"PO-Revision-Date: 2011-08-26 16:53+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 03 Sep '11

03 Sep '11

commit 9bb3d863ce2f8eee1bbd44de3ad9c53540b78981 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 3 11:59:53 2011 +0000 Update translations for bridgedb --- hu/bridgedb.po | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/hu/bridgedb.po b/hu/bridgedb.po new file mode 100644 index 0000000..2dfd245 --- /dev/null +++ b/hu/bridgedb.po @@ -0,0 +1,79 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-01-01 07:48-0800\n" +"PO-Revision-Date: 2011-08-30 07:31+0000\n" +"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#: lib/bridgedb/I18n.py:21 +msgid "Here are your bridge relays: " +msgstr "Az Ön Hídkapcsolati elosztói:" + +#: lib/bridgedb/I18n.py:23 +msgid "" +"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" +"in the main directory. Since there is no complete public list of them,\n" +"even if your ISP is filtering connections to all the known Tor relays,\n" +"they probably won't be able to block all the bridges." +msgstr "" +"A Hídkapcsolati Elosztók (röviden Hidak) olyan Tor Elosztók, amik nem " +"kerülnek listázásra a központi címtárban. Mivel nincs publikus listájuk, még" +" ha az Internet szolgáltatója szűri is az ismert Tor Elosztókhoz történő " +"kapcsolódást, nem fogják tudni az összes hidat blokkolni." + +#: lib/bridgedb/I18n.py:28 +msgid "" +"To use the above lines, go to Vidalia's Network settings page, and click\n" +"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" +"address one at a time." +msgstr "" + +#: lib/bridgedb/I18n.py:32 +msgid "" +"Configuring more than one bridge address will make your Tor connection\n" +"more stable, in case some of the bridges become unreachable." +msgstr "" +"Egynél több hídkapcsolat engedélyezésével a Tor kapcsolat sokkal stabilabb " +"lesz, abban az esetben, ha néhány hídkapcsolat elérhetetlenné válna." + +#: lib/bridgedb/I18n.py:35 +msgid "" +"Another way to find public bridge addresses is to send mail to\n" +"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" +"of the mail. However, so we can make it harder for an attacker to learn\n" +"lots of bridge addresses, you must send this request from an email address at\n" +"one of the following domains:" +msgstr "" + +#: lib/bridgedb/I18n.py:41 +msgid "[This is an automated message; please do not reply.]" +msgstr "[Ez egy automata levél, kérjük ne válaszoljon.]" + +#: lib/bridgedb/I18n.py:43 +msgid "" +"Another way to find public bridge addresses is to visit\n" +"https://bridges.torproject.org/. The answers you get from that page\n" +"will change every few days, so check back periodically if you need more\n" +"bridge addresses." +msgstr "" + +#: lib/bridgedb/I18n.py:48 +msgid "(no bridges currently available)" +msgstr "(nincs elérhető hídkapcsolat jelenleg)" + +#: lib/bridgedb/I18n.py:50 +msgid "(e-mail requests not currently supported)" +msgstr "(az e-mail kérések jelenleg nem támogatottak)" + + diff --git a/templates/bridgedb.pot b/templates/bridgedb.pot new file mode 100644 index 0000000..e69de29

1 0

[translation-tools/master] Add a simple pidfile mechanic to update_translations
by sebastian＠torproject.org 03 Sep '11

03 Sep '11

commit 7bfa0f6af76d035c98579e81527202b94e0a8ece Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Sep 3 16:47:29 2011 +0200 Add a simple pidfile mechanic to update_translations --- config | 2 ++ update_translations | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/config b/config index e98d644..1366e69 100644 --- a/config +++ b/config @@ -8,3 +8,5 @@ TRANSLATION_REPO=/srv/translation.torproject.org/translations/ TX=/srv/translation.torproject.org/transifex-client/bin/tx PROJECTS="bridgedb gettor orbot vidalia vidalia_help vidalia_installer" + +PIDFILE=/srv/translation.torproject.org/run/update_translations.pid diff --git a/update_translations b/update_translations index 6a9ae44..15692f7 100755 --- a/update_translations +++ b/update_translations @@ -4,6 +4,18 @@ cd `dirname $0` source config +SCRIPT=`basename $0` + +if [ -f ${PIDFILE} ]; then + OLDPID=`cat ${PIDFILE}` + STILL_RUNNING=`ps -ef | grep ${OLDPID} | grep ${SCRIPT}` + if [ -n "${STILL_RUNNING}" ]; then + exit 2 + fi +fi +PID=`ps -ef | grep ${SCRIPT} | head -n1 | awk ' {print $2;} '` +echo ${PID} > ${PIDFILE} + # Prepare the repository by making sure it is up to date. cd $TRANSLATION_REPO @@ -13,13 +25,22 @@ cd $TRANSLATION_REPO for project in $PROJECTS; do cd $project; + + # Fetch new translations for this project ... $TX pull -a -s > /dev/null; + # ... add them to git ... git add . > /dev/null; git commit -qm "Update translations for $project" > /dev/null || test $? = 1; + # ... and push them live. git push origin $project; cd ..; done +# Remove the pidfile again +if [ -f ${PIDFILE} ]; then + rm ${PIDFILE} +fi +

1 0

[translation/master] initial import: Add a short readme
by sebastian＠torproject.org 03 Sep '11

03 Sep '11

commit d3cbb4061693a7f50357d50ef50590a46011f363 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Aug 11 11:41:59 2011 +0200 initial import: Add a short readme --- README | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/README b/README new file mode 100644 index 0000000..7ad811e --- /dev/null +++ b/README @@ -0,0 +1 @@ +This repository holds all translations, with one branch per project.

1 0

[gettor/master] Minor fix in package handling
by kaner＠torproject.org 03 Sep '11

03 Sep '11

commit 71dd434d71fb1c683c2840753a4547501094af03 Author: Christian Fromme <kaner(a)strace.org> Date: Sat Sep 3 15:19:30 2011 +0200 Minor fix in package handling --- lib/gettor/packages.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/gettor/packages.py b/lib/gettor/packages.py index 2159a6a..cbfddb4 100644 --- a/lib/gettor/packages.py +++ b/lib/gettor/packages.py @@ -101,7 +101,7 @@ class Packages: r = RouterVersion(f) ret = f except: - return "" + pass if ret is not None: logging.debug("Of the list %s, I return %s" % (fileList, ret))

1 0

[gettor/master] Merge branch 'improve_usability'
by kaner＠torproject.org 03 Sep '11

03 Sep '11

commit 459bbe99b81824f0dad8c80b9a5df0ce7a101910 Merge: 0018116 e1ac870 Author: Christian Fromme <kaner(a)strace.org> Date: Sat Sep 3 14:34:06 2011 +0200 Merge branch 'improve_usability' Conflicts: lib/gettor/i18n.py README | 2 +- README.USER-HOWTO | 12 +- README.locale-spec-draft | 14 +- gettor.conf | 122 ++++++--- i18n/.tx/config | 2 +- i18n/af/gettor.po | 341 +++++++++++++++++++------ i18n/ak/gettor.po | 341 +++++++++++++++++++------ i18n/am/gettor.po | 341 +++++++++++++++++++------ i18n/ar/gettor.po | 416 ++++++++++++++++++++++-------- i18n/arn/gettor.po | 341 +++++++++++++++++++------ i18n/ast/gettor.po | 341 +++++++++++++++++++------ i18n/az/gettor.po | 424 +++++++++++++++++++++++-------- i18n/be/gettor.po | 341 +++++++++++++++++++------ i18n/bg/gettor.po | 341 +++++++++++++++++++------ i18n/bms/gettor.po | 564 ---------------------------------------- i18n/bn/gettor.po | 417 +++++++++++++++++++++++-------- i18n/bn_IN/gettor.po | 341 +++++++++++++++++++------ i18n/bo/gettor.po | 341 +++++++++++++++++++------ i18n/br/gettor.po | 341 +++++++++++++++++++------ i18n/bs/gettor.po | 341 +++++++++++++++++++------ i18n/ca/gettor.po | 417 +++++++++++++++++++++++-------- i18n/cs/gettor.po | 346 +++++++++++++++++++------ i18n/csb/gettor.po | 341 +++++++++++++++++++------ i18n/cy/gettor.po | 341 +++++++++++++++++++------ i18n/da/gettor.po | 415 ++++++++++++++++++++++-------- i18n/de/gettor.po | 425 +++++++++++++++++++++++-------- i18n/dz/gettor.po | 341 +++++++++++++++++++------ i18n/el/gettor.po | 341 +++++++++++++++++++------ i18n/en/gettor.po | 341 +++++++++++++++++++------ i18n/eo/gettor.po | 341 +++++++++++++++++++------ i18n/es/gettor.po | 424 +++++++++++++++++++++++-------- i18n/et/gettor.po | 346 +++++++++++++++++++------ i18n/eu/gettor.po | 341 +++++++++++++++++++------ i18n/fa/gettor.po | 422 +++++++++++++++++++++++-------- i18n/fi/gettor.po | 417 +++++++++++++++++++++++-------- i18n/fil/gettor.po | 341 +++++++++++++++++++------ i18n/fo/gettor.po | 341 +++++++++++++++++++------ i18n/fr/gettor.po | 426 +++++++++++++++++++++++-------- i18n/fur/gettor.po | 341 +++++++++++++++++++------ i18n/fy/gettor.po | 341 +++++++++++++++++++------ i18n/ga/gettor.po | 341 +++++++++++++++++++------ i18n/gl/gettor.po | 341 +++++++++++++++++++------ i18n/gu/gettor.po | 341 +++++++++++++++++++------ i18n/gun/gettor.po | 341 +++++++++++++++++++------ i18n/ha/gettor.po | 341 +++++++++++++++++++------ i18n/he/gettor.po | 341 +++++++++++++++++++------ i18n/hi/gettor.po | 341 +++++++++++++++++++------ i18n/hr/gettor.po | 341 +++++++++++++++++++------ i18n/ht/gettor.po | 341 +++++++++++++++++++------ i18n/hu/gettor.po | 341 +++++++++++++++++++------ i18n/hy/gettor.po | 341 +++++++++++++++++++------ i18n/id/gettor.po | 418 +++++++++++++++++++++++-------- i18n/is/gettor.po | 415 ++++++++++++++++++++++-------- i18n/it/gettor.po | 378 +++++++++++++++++++++------- i18n/ja/gettor.po | 352 ++++++++++++++++++++------ i18n/jv/gettor.po | 341 +++++++++++++++++++------ i18n/ka/gettor.po | 341 +++++++++++++++++++------ i18n/km/gettor.po | 341 +++++++++++++++++++------ i18n/kn/gettor.po | 341 +++++++++++++++++++------ i18n/ko/gettor.po | 346 +++++++++++++++++++------ i18n/ku/gettor.po | 341 +++++++++++++++++++------ i18n/kw/gettor.po | 341 +++++++++++++++++++------ i18n/ky/gettor.po | 341 +++++++++++++++++++------ i18n/lb/gettor.po | 341 +++++++++++++++++++------ i18n/lg/gettor.po | 271 -------------------- i18n/ln/gettor.po | 341 +++++++++++++++++++------ i18n/lo/gettor.po | 341 +++++++++++++++++++------ i18n/lt/gettor.po | 341 +++++++++++++++++++------ i18n/lv/gettor.po | 341 +++++++++++++++++++------ i18n/mg/gettor.po | 341 +++++++++++++++++++------ i18n/mi/gettor.po | 341 +++++++++++++++++++------ i18n/mk/gettor.po | 341 +++++++++++++++++++------ i18n/ml/gettor.po | 341 +++++++++++++++++++------ i18n/mn/gettor.po | 341 +++++++++++++++++++------ i18n/mr/gettor.po | 341 +++++++++++++++++++------ i18n/ms/gettor.po | 341 +++++++++++++++++++------ i18n/mt/gettor.po | 341 +++++++++++++++++++------ i18n/nah/gettor.po | 341 +++++++++++++++++++------ i18n/nap/gettor.po | 341 +++++++++++++++++++------ i18n/nb/gettor.po | 341 +++++++++++++++++++------ i18n/ne/gettor.po | 341 +++++++++++++++++++------ i18n/nl/gettor.po | 417 ++++++++++++++++++++++-------- i18n/nn/gettor.po | 341 +++++++++++++++++++------ i18n/nso/gettor.po | 341 +++++++++++++++++++------ i18n/oc/gettor.po | 341 +++++++++++++++++++------ i18n/or/gettor.po | 341 +++++++++++++++++++------ i18n/pa/gettor.po | 341 +++++++++++++++++++------ i18n/pap/gettor.po | 341 +++++++++++++++++++------ i18n/pl/gettor.po | 417 +++++++++++++++++++++++-------- i18n/pms/gettor.po | 341 +++++++++++++++++++------ i18n/ps/gettor.po | 341 +++++++++++++++++++------ i18n/pt/gettor.po | 341 +++++++++++++++++++------ i18n/pt_BR/gettor.po | 346 +++++++++++++++++++------ i18n/ro/gettor.po | 341 +++++++++++++++++++------ i18n/ru/gettor.po | 420 +++++++++++++++++++++++-------- i18n/sco/gettor.po | 341 +++++++++++++++++++------ i18n/sk/gettor.po | 341 +++++++++++++++++++------ i18n/sl/gettor.po | 341 +++++++++++++++++++------ i18n/so/gettor.po | 341 +++++++++++++++++++------ i18n/son/gettor.po | 341 +++++++++++++++++++------ i18n/sq/gettor.po | 341 +++++++++++++++++++------ i18n/sr/gettor.po | 417 +++++++++++++++++++++++-------- i18n/st/gettor.po | 341 +++++++++++++++++++------ i18n/su/gettor.po | 341 +++++++++++++++++++------ i18n/sv/gettor.po | 341 +++++++++++++++++++------ i18n/sw/gettor.po | 341 +++++++++++++++++++------ i18n/ta/gettor.po | 341 +++++++++++++++++++------ i18n/te/gettor.po | 341 +++++++++++++++++++------ i18n/templates/gettor.pot | 340 +++++++++++++++++++------ i18n/tg/gettor.po | 341 +++++++++++++++++++------ i18n/th/gettor.po | 341 +++++++++++++++++++------ i18n/ti/gettor.po | 341 +++++++++++++++++++------ i18n/tk/gettor.po | 341 +++++++++++++++++++------ i18n/tr/gettor.po | 384 +++++++++++++++++++++------- i18n/uk/gettor.po | 370 ++++++++++++++++++++------- i18n/ur/gettor.po | 402 ++++++++++++++++++++++-------- i18n/ve/gettor.po | 341 +++++++++++++++++++------ i18n/vi/gettor.po | 341 +++++++++++++++++++------ i18n/wa/gettor.po | 341 +++++++++++++++++++------ i18n/wo/gettor.po | 341 +++++++++++++++++++------ i18n/zh_CN/gettor.po | 408 ++++++++++++++++++++++-------- i18n/zh_HK/gettor.po | 341 +++++++++++++++++++------ i18n/zh_TW/gettor.po | 341 +++++++++++++++++++------ i18n/zu/gettor.po | 341 +++++++++++++++++++------ lib/gettor/blacklist.py | 42 +++- lib/gettor/config.py | 5 +- lib/gettor/filters.py | 16 +- lib/gettor/i18n.py | 623 +++++++++++---------------------------------- lib/gettor/packages.py | 100 +++++++- lib/gettor/requests.py | 10 +- lib/gettor/responses.py | 276 +++++++++++++------- lib/gettor/utils.py | 110 +++++++- 132 files changed, 32040 insertions(+), 11544 deletions(-)

1 0

[gettor/master] Add arma's suggestions for help text enhancement.
by kaner＠torproject.org 03 Sep '11

03 Sep '11

commit b9b714efd53ed7f5ce954f3456c174cb87e46226 Author: Christian Fromme <kaner(a)strace.org> Date: Tue Aug 30 14:25:00 2011 +0200 Add arma's suggestions for help text enhancement. Also fix a bug in email alias handling. Closes: --- lib/gettor/filters.py | 4 ++++ lib/gettor/i18n.py | 39 ++++++++++++++++++--------------------- lib/gettor/requests.py | 4 ++-- lib/gettor/responses.py | 31 ++++++++++++++++++++----------- 4 files changed, 44 insertions(+), 34 deletions(-) diff --git a/lib/gettor/filters.py b/lib/gettor/filters.py index ff0cfb4..9825e8f 100644 --- a/lib/gettor/filters.py +++ b/lib/gettor/filters.py @@ -18,6 +18,10 @@ def doPackageHacks(packageName, locale): suffix. This isn't nice because we're hard-coding package names here Attention: This needs to correspond to the packages in packages.py """ + # If someone sent a request for a "tor-browser-bundle" (whatever that is ;) + # we reply with a "windows" package + if packageName == "tor-browser-bundle": + packageName = "windows" if packageName == "windows" \ or packageName == "linux-i386" \ or packageName == "linux-x86_64": diff --git a/lib/gettor/i18n.py b/lib/gettor/i18n.py index 54e365e..186b518 100644 --- a/lib/gettor/i18n.py +++ b/lib/gettor/i18n.py @@ -28,7 +28,7 @@ _("""Hello, This is the "GetTor" robot."""), # GETTOR_TEXT[1] _("""Thank you for your request."""), # GETTOR_TEXT[2] -_(""" Unfortunately, we won't answer you at this address. You should make +_("""Unfortunately, we won't answer you at this address. You should make an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from one of those."""), # GETTOR_TEXT[3] @@ -62,10 +62,10 @@ _("""OBTAINING LOCALIZED VERSIONS OF TOR _("""To get a version of Tor translated into your language, specify the language you want in the address you send the mail to: - gettor+zh_CN(a)torproject.org"""), + gettor+fa(a)torproject.org"""), # GETTOR_TEXT[10] _("""This example will give you the requested package in a localized -version for Chinese. Check below for a list of supported language +version for Farsi (Persian). Check below for a list of supported language codes. """), # GETTOR_TEXT[11] _(""" List of supported locales:"""), @@ -89,12 +89,12 @@ _("""If you select no language, you will receive the English version."""), _("""SMALLER SIZED PACKAGES ======================"""), # GETTOR_TEXT[16] -_("""If your bandwith is low or your provider doesn't allow you to -receive large attachments in your email, there is a feature of -GetTor you can use to make it send you a number of small packages -instead of one big one."""), +_("""If your bandwith is low or your provider doesn't allow you to +receive large attachments in your email, GetTor can send you several +small packages instead of one big one."""), # GETTOR_TEXT[17] -_("""Simply include the keyword 'split' somewhere in your email like so: +_("""Simply include the keyword 'split' in a new line on its own (this part +is important!) like so: windows split"""), @@ -130,7 +130,7 @@ _("""SUPPORT _("""If you have any questions or it doesn't work, you can contact a human at this support email address: tor-assistants(a)torproject.org"""), # GETTOR_TEXT[28] -_(""" Here's your requested software as a zip file. Please unzip the +_("""Here's your requested software as a zip file. Please unzip the package and verify the signature."""), # GETTOR_TEXT[29] _("""VERIFY SIGNATURE @@ -177,7 +177,7 @@ _("""Packages might arrive out of order! Please make sure you received all packages before you attempt to unpack them!"""), # GETTOR_TEXT[38] _("""It was successfully understood. Your request is currently being processed. -Your package should arrive within the next ten minutes."""), +Your package (%s) should arrive within the next ten minutes."""), # GETTOR_TEXT[39] _("""If it doesn't arrive, the package might be too big for your mail provider. Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."""), @@ -193,10 +193,9 @@ package. Make sure this is what you want."""), _("""UNPACKING THE FILES ==================="""), # GETTOR_TEXT[43] -_("""To unpack the files you received, there's a number of alternatives on -how to do it. The easiest way is to install 7-Zip, a free file compression/ -uncompression tool. If it isn't installed on your computer yet, you can -download it here: +_("""The easiest way to unpack the files you received is to install 7-Zip, +a free file compression/uncompression tool. If it isn't installed on +your computer yet, you can download it here: http://www.7-zip.org/"""), # GETTOR_TEXT[44] @@ -208,9 +207,8 @@ _("""An alternative way to get the .z files extraced is to rename them to "windows.zip". You should then be able to extract the archive with common file archiver programs that probably are already installed on your computer."""), # GETTOR_TEXT[46] -_("""Please reply to this mail, and tell me a single package name anywhere in -the body of your email. To make your decision a bit easier, here's a -short explanation of what these packages are:"""), +_("""Please reply to this mail, and tell me a single package name anywhere +in your reply. Here's a short explanation of what these packages are:"""), # GETTOR_TEXT[47] _("""windows: The Tor Browser Bundle package for Windows operating systems. If you're @@ -222,8 +220,8 @@ The Tor Browser Bundle package for OS X, Intel CPU architecture. In general, newer Mac hardware will require you to use this package."""), # GETTOR_TEXT[49] _("""macos-ppc: -This is a Vidalia Bundle for older Macs running OS X on PowerPC CPUs. -Note that this package will be deprecated soon."""), +This is an older installer (the "Vidalia bundle") for older Macs running +OS X on PowerPC CPUs. Note that this package will be deprecated soon."""), # GETTOR_TEXT[50] _("""linux-i386: The Tor Browser Bundle package for Linux, 32bit versions."""), @@ -235,8 +233,7 @@ _("""linux-x86_64: The Tor Browser Bundle package for Linux, 64bit versions."""), # GETTOR_TEXT[53] _("""source: -The Tor source code. Only request this package if you know what you're -doing. This isn't the package a normal user wants."""), +The Tor source code, for experts. Most users do not want this package."""), # GETTOR_TEXT[54] _("""FREQUENTLY ASKED QUESTIONS =========================="""), diff --git a/lib/gettor/requests.py b/lib/gettor/requests.py index 977b776..b29e335 100644 --- a/lib/gettor/requests.py +++ b/lib/gettor/requests.py @@ -153,14 +153,14 @@ class requestMail: return locale if aliases is not None: if locale in aliases: - logging.debug("Request for %s via alias %s" % (lang, alias)) + logging.debug("Request for %s via alias %s" % (lang, locale)) # Return the 'official' name return lang else: logging.debug("Requested language %s not supported. Fallback: %s" \ % (self.replyLocale, self.config.DEFAULT_LOCALE)) self.replyLocale = self.config.DEFAULT_LOCALE - return + return self.config.DEFAULT_LOCALE def getRawMessage(self): return self.rawMessage diff --git a/lib/gettor/responses.py b/lib/gettor/responses.py index bf1d2cb..0f3d2f8 100644 --- a/lib/gettor/responses.py +++ b/lib/gettor/responses.py @@ -142,9 +142,9 @@ def getInitialHelpMsg(t, config): def getPackageMsg(t): return getGreetingText(t) \ + t.gettext(i18n.GETTOR_TEXT[28]) + "\n\n" \ - + getVerifySignatureText(t) \ + getUnpackingText(t) \ + getBridgesHelpText(t) \ + + getVerifySignatureText(t) \ + getFAQText(t) \ + getSupportText(t) @@ -157,9 +157,9 @@ def getSplitPackageMsg(t): + getFAQText(t) \ + getSupportText(t) -def getDelayAlertMsg(t): +def getDelayAlertMsg(t, packageInfo): return getGreetingText(t) \ - + t.gettext(i18n.GETTOR_TEXT[38]) + "\n\n" \ + + t.gettext(i18n.GETTOR_TEXT[38]) % packageInfo + "\n\n" \ + t.gettext(i18n.GETTOR_TEXT[39]) + "\n\n" \ + getSupportText(t) @@ -305,11 +305,6 @@ class Response: # Inform the user return self.sendTextEmail(getNoSplitAvailable(self.t)) - # Be a polite bot and send message that mail is on the way - if self.config.DELAY_ALERT: - if not self.sendDelayAlert(): - logging.error("Failed to sent delay alert.") - if self.isBlacklistedForMessageType("sendSplitPackage"): # Don't send anything return False @@ -321,6 +316,12 @@ class Response: splitpack = self.reqInfo['package'] + ".split" splitDir = os.path.join(self.config.BASEDIR, "packages", splitpack) fileList = os.listdir(splitDir) + + # Be a polite bot and send message that mail is on the way + if self.config.DELAY_ALERT: + if not self.sendDelayAlert(): + logging.error("Failed to sent delay alert.") + # Sort the files, so we can send 01 before 02 and so on.. fileList.sort() nFiles = len(fileList) @@ -344,14 +345,22 @@ class Response: return status - def sendDelayAlert(self): - """Send a polite delay notification + def sendDelayAlert(self, packageCount=1): + """Send a polite delay notification. Add the number of packages that + the user can expect to arrive. """ if self.isBlacklistedForMessageType("sendDelayAlert"): # Don't send anything return False + + if packageCount > 1: + packageInfo = "%s [%d parts]" \ + % (self.reqInfo['package'], packageCount) + else: + packageInfo = self.reqInfo['package'] + logging.info("Sending delay alert to %s" % self.reqInfo['hashed_user']) - return self.sendTextEmail(getDelayAlertMsg(self.t)) + return self.sendTextEmail(getDelayAlertMsg(self.t), packageInfo) def sendHelp(self): """Send a help mail. This happens when a user sent us a request we

1 0