January 2014 - tor-commits - lists.torproject.org

[oonib/master] Make the 'content' field in the report creation optional
by art＠torproject.org 31 Jan '14

31 Jan '14

commit 1a77b236eb63b65496166b3814b2cda15da9c146 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Jan 28 18:41:10 2014 +0100 Make the 'content' field in the report creation optional (as per oonib specification) --- oonib/report/handlers.py | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/oonib/report/handlers.py b/oonib/report/handlers.py index a970f4d..43c7499 100644 --- a/oonib/report/handlers.py +++ b/oonib/report/handlers.py @@ -258,17 +258,27 @@ class NewReportHandlerFile(OONIBHandler, UpdateReportMixin): raise e.InputHashNotProvided self.checkPolicy() - content = yaml.safe_load(report_data['content']) - content['backend_version'] = config.backend_version + if 'content' in report_data: + content = yaml.safe_load(report_data['content']) + try: + report_header = validate_report_header(content) - try: - report_header = validate_report_header(content) + except MissingReportHeaderKey, key: + raise e.MissingReportHeaderKey(key) - except MissingReportHeaderKey, key: - raise e.MissingReportHeaderKey(key) + except InvalidReportHeader, key: + raise e.InvalidReportHeader(key) + else: + content = { + 'software_name': software_name, + 'software_version': software_version, + 'probe_asn': probe_asn, + 'test_name': self.testName, + 'test_version': self.testVersion, + 'input_hashes': self.inputHashes + } - except InvalidReportHeader, key: - raise e.InvalidReportHeader(key) + content['backend_version'] = config.backend_version report_header = yaml.dump(report_header) content = "---\n" + report_header + '...\n' @@ -289,7 +299,6 @@ class NewReportHandlerFile(OONIBHandler, UpdateReportMixin): 'report_id': report_id } - try: requested_helper = report_data['test_helper'] except KeyError:

1 0

[oonib/master] Add ooni-backend SysV Init Script
by art＠torproject.org 31 Jan '14

31 Jan '14

commit 934b4b694c20d292698a8c1e91aec42d38e50716 Author: anadahz <anadahz@github> Date: Fri Jan 24 20:42:19 2014 +0100 Add ooni-backend SysV Init Script --- scripts/oonibd | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/scripts/oonibd b/scripts/oonibd new file mode 100755 index 0000000..c29a980 --- /dev/null +++ b/scripts/oonibd @@ -0,0 +1,65 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: oonibd +# Required-Start: $local_fs $remote_fs $network +# Required-Stop: $local_fs $remote_fs $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: OONI Backend system init script +# Description: This script will start the open observatory +# of network interference backend system. +### END INIT INFO + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.2-14) to ensure that this file is present +# and status_of_proc is working. +. /lib/lsb/init-functions + +# oonib executable +DAEMON="/var/oonib/bin/oonib" +# oonib config file +ARGS="-c /var/oonib/oonib.conf" +PROC_NAME="python $DAEMON $ARGS" + + +case "$1" in + start) + CPIDS=$(pgrep -f "$PROC_NAME") + if [ -z "$CPIDS" ]; then + printf "Starting ooni-backend...\n" + $DAEMON $ARGS& + else + printf "ooni-backend already running\n" + fi + ;; + stop) + printf "Stopping ooni-backend...\n" + CPIDS=$(pgrep -f "$PROC_NAME") + if [ -n "$CPIDS" ]; then + sleep 5 + printf "Killing procs:\n$CPIDS\n" + kill -KILL $CPIDS + else + printf "No running ooni-backend procs\n" + fi + ;; + status) + printf "ooni-backend Status\nListing all ooni-backend procs\n" + CPIDS=$(pgrep -l -f "$PROC_NAME") + if [ -n "$CPIDS" ]; then + printf "$CPIDS\n" + else + printf "No running ooni-backend procs\n" + fi + ;; + *) + printf "Usage: /etc/init.d/oonibd {start|stop|status}\n" + exit 1 + ;; +esac + +exit 0

1 0

[oonib/master] Merge pull request #27 from anadahz/initd_script
by art＠torproject.org 31 Jan '14

31 Jan '14

commit fa783dc07180e64199371258ab6ad17f15a93f32 Merge: 293a1df 934b4b6 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Tue Jan 28 13:25:01 2014 -0800 Merge pull request #27 from anadahz/initd_script Add ooni-backend SysV Init Script scripts/oonibd | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+)

1 0

[oonib/master] Update the version of Tor used in the tor2web build script.
by art＠torproject.org 31 Jan '14

31 Jan '14

commit 446f247d647e81a7f66d545fbf965803d075105a Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Jan 29 15:51:40 2014 +0100 Update the version of Tor used in the tor2web build script. Fail if the tor signature is invalid. --- scripts/build_tor2web_tor.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/build_tor2web_tor.sh b/scripts/build_tor2web_tor.sh index 537f1b9..80880bc 100755 --- a/scripts/build_tor2web_tor.sh +++ b/scripts/build_tor2web_tor.sh @@ -4,7 +4,7 @@ OPENSSL_VERSION=1.0.1e LIBEVENT_VERSION=2.0.21-stable ZLIB_VERSION=1.2.8 -TOR_VERSION=0.2.4.17-rc +TOR_VERSION=0.2.4.20 ZLIB_MD5=44d667c142d7cda120332623eab69f40 SCRIPT_ROOT=`pwd` @@ -80,6 +80,7 @@ cd zlib-$ZLIB_VERSION # set up tor with tor2web mode cd $SCRIPT_ROOT gpg --verify tor-$TOR_VERSION.tar.gz.asc tor-$TOR_VERSION.tar.gz +if [ $? -ne 0 ];then exit ;fi tar xfz tor-$TOR_VERSION.tar.gz cd tor-$TOR_VERSION ./configure --enable-static-tor --with-libevent-dir=$BUILD/libevent-$LIBEVENT_VERSION --with-openssl-dir=$BUILD/openssl-$OPENSSL_VERSION --with-zlib-dir=$BUILD/zlib-$ZLIB_VERSION --enable-tor2web-mode && make

1 0

[oonib/master] Merge branch 'master' of github.com:TheTorProject/ooni-backend
by art＠torproject.org 31 Jan '14

31 Jan '14

commit d19e59f60d42a62137d6f32474207672e4ebbf21 Merge: 446f247 fa783dc Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Jan 29 15:52:47 2014 +0100 Merge branch 'master' of github.com:TheTorProject/ooni-backend * 'master' of github.com:TheTorProject/ooni-backend: Add ooni-backend SysV Init Script scripts/oonibd | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+)

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 31 Jan '14

31 Jan '14

commit a50e1d92c10f2c96060c37a985b238655f5f228d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 31 10:15:19 2014 +0000 Update translations for liveusb-creator --- km/km.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/km/km.po b/km/km.po index 37ba03d..f53bc5d 100644 --- a/km/km.po +++ b/km/km.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-29 14:16+0100\n" -"PO-Revision-Date: 2014-01-31 09:45+0000\n" +"PO-Revision-Date: 2014-01-31 10:10+0000\n" "Last-Translator: soksophea <sksophea(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgstr "" #: ../liveusb/gui.py:445 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" -msgstr "" +msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" #: ../liveusb/creator.py:1020 #, python-format @@ -50,7 +50,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">documentation</a>.</body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\nNeed help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">documentation</a>.</body></html>" #: ../liveusb/launcher_ui.py:160 msgid "" @@ -59,7 +59,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\nCopy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</body></html>" #: ../liveusb/launcher_ui.py:162 msgid "" @@ -68,7 +68,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\nCopy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</body></html>" #: ../liveusb/launcher_ui.py:164 msgid "" @@ -77,7 +77,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "Upgrade an already installed Tails device from a new ISO image.</body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\nUpgrade an already installed Tails device from a new ISO image.</body></html>" #: ../liveusb/dialog.py:163 msgid "Alt+B" @@ -131,7 +131,7 @@ msgstr "ការបង្កើតកម្រិតសំឡេង #: ../liveusb/gui.py:567 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -msgstr "" +msgstr "ឧបករណ៍មិនទាន់បានម៉ោន ដូច្នេះយើងមិនអាចកំណត់ទំហំទំនេរបានទេ។" #: ../liveusb/dialog.py:166 #, python-format @@ -158,7 +158,7 @@ msgstr "ដ្រាយគឺជារង្វិលជុំត្ #: ../liveusb/creator.py:813 #, python-format msgid "Entering unmount_device for '%(device)s'" -msgstr "" +msgstr "បញ្ចូល unmount_device សម្រាប់ '%(device)s'" #: ../liveusb/creator.py:1198 msgid "Error probing device" @@ -178,7 +178,7 @@ msgstr "កំហុស៖ SHA1 នៃ LiveCD របស់អ្នកគ #: ../liveusb/creator.py:145 msgid "Extracting live image to the target device..." -msgstr "" +msgstr "ស្រង់រូបភាពបន្តផ្ទាល់ចេញទៅកាន់ឧបករណ៍គោលដៅ..." #: ../liveusb/creator.py:1063 #, python-format @@ -254,7 +254,7 @@ msgstr "រកមិនឃើញចំណុចម៉ោន" msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "" +msgstr "មិនមានទំហំទំនេរគ្រប់គ្រាន់នៅលើឧបករណ៍។\n%dMB ISO + គម្រប %dMB > ទំហំទំនេរ %dMB" #: ../liveusb/gui.py:554 msgid "Partition is FAT16; Restricting overlay size to 2G" @@ -262,12 +262,12 @@ msgstr "ភាគថាសគឺ FAT16; ការដាក់កម #: ../liveusb/gui.py:550 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "" +msgstr "ភាគថាសគឺ FAT32; ទំហំដាក់កម្រិតជាន់គ្នាទៅ 4G" #: ../liveusb/creator.py:226 ../liveusb/creator.py:842 #, python-format msgid "Partitioning device %(device)s" -msgstr "" +msgstr "ការចែកភាគថាសឧបករណ៍ %(device)s" #: ../liveusb/gui.py:621 msgid "Persistent Storage" @@ -279,7 +279,7 @@ msgstr "ការផ្ទុកថេរ (0 MB)" #: ../liveusb/gui.py:702 ../liveusb/gui.py:731 msgid "Please confirm your device selection" -msgstr "" +msgstr "សូមបញ្ជាក់ជម្រើសឧបករណ៍របស់អ្នក" #: ../liveusb/gui.py:467 msgid "Refreshing releases..." @@ -473,12 +473,12 @@ msgstr "មិនស្គាល់ការចេញផ្សាយ៖ #: ../liveusb/creator.py:827 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" -msgstr "" +msgstr "ការអាន់ម៉ោន '%(udi)s' នៅលើ '%(device)s'" #: ../liveusb/creator.py:823 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" -msgstr "" +msgstr "ការអាន់ម៉ោនប្រព៏ន្ធេកសារដែលបានម៉ោននៅលើ '%(device)s'" #: ../liveusb/creator.py:876 #, python-format @@ -495,7 +495,7 @@ msgstr "ប្រព័ន្ធេកសារមិនគាំទ្ msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." -msgstr "មិនគាំទ្រប្រព័ន្ធឯកសារ៖ %s\nក្នុងករណីដែលអ្នកកំពុងព្យាយាមធ្វើបច្ចុប្បន្នភាពប្រព័ន្ធ Tails ដែលបានដំឡើងដោយដៃ (គឺថា៖ បើវាត្រូវបានដំឡើងដោយគ្មានកម្មវិធីដំឡើង) ជម្រើសនេះនឹងមិនគាំទ្រឡើយ៖ អ្នកត្រូវដំឡើងថ្មី ហើយចាប់ផ្ដើមដោយជ្រើស \"ក្លូន & ដំឡើង\" ជំនួសវិញ។" +msgstr "មិនគាំទ្រប្រព័ន្ធឯកសារ៖ %s\nក្នុងករណីដែលអ្នកកំពុងព្យាយាមធ្វើបច្ចុប្បន្នភាពប្រព័ន្ធ Tails ដែលបានដំឡើងដោយដៃ (គឺថា៖ បើវាត្រូវបានដំឡើងដោយគ្មានកម្មវិធីដំឡើង) ជម្រើសនេះនឹងមិនគាំទ្រឡើយ អ្នកត្រូវដំឡើងថ្មី ហើយចាប់ផ្ដើមដោយជ្រើស \"ក្លូន & ដំឡើង\" ជំនួសវិញ។" #: ../liveusb/creator.py:1213 #, python-format @@ -510,7 +510,7 @@ msgstr "ធ្វើបច្ចុប្បន្នភាពពី ISO" #: ../liveusb/dialog.py:161 msgid "Use existing Live system ISO" -msgstr "" +msgstr "ប្រើ Live system ISO ដែលមានស្រាប់" #: ../liveusb/creator.py:133 msgid "Verifying ISO MD5 checksum" @@ -583,4 +583,4 @@ msgstr "អ្នកត្រូវដំណើរការកម្ម #: ../liveusb/dialog.py:164 msgid "or" -msgstr "" +msgstr "ឬ"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 31 Jan '14

31 Jan '14

commit 18ab28ff6b1a97d6f4fd0b5ee90387ce3214bbff Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 31 09:45:20 2014 +0000 Update translations for liveusb-creator --- km/km.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/km/km.po b/km/km.po index 66690fd..37ba03d 100644 --- a/km/km.po +++ b/km/km.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-29 14:16+0100\n" -"PO-Revision-Date: 2014-01-31 09:10+0000\n" +"PO-Revision-Date: 2014-01-31 09:45+0000\n" "Last-Translator: soksophea <sksophea(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" @@ -363,23 +363,23 @@ msgid "" "optionally downloading a release (if an existing one wasn't selected), " "extracting the ISO to the USB device, creating the persistent overlay, and " "installing the bootloader." -msgstr "" +msgstr "ប៊ូតុងនេះនឹងចាប់ផ្ដើមការបង្កើត LiveUSB ។ ភាពចាំបាច់នេះគឺទាញយកការចេញផ្សាយជាជម្រើស (បើមិនបានជ្រើសការចេញផ្សាយដែលមានស្រាប់) ស្រង់ ISO ចេញទៅកាន់ឧបករណ៍ USB បង្កើតកម្រិតសំឡេងថេរជាន់គ្នា រួចដំឡើងកម្មវិធីចាប់ផ្ដើមឡើងវិញ។" #: ../liveusb/dialog.py:167 msgid "" "This is the USB stick that you want to install your Live system on. This " "device must be formatted with the FAT filesystem." -msgstr "" +msgstr "នេះជាយូអេសប៊ីដែលអ្នកចង់បានដើម្បីដំឡើង Live system របស់អ្នក។ ឧបករណ៍នេះត្រូវតែបានធ្វើទ្រង់ទ្រាយដោយប្រើប្រព័ន្ធឯកសារ FAT ។" #: ../liveusb/dialog.py:172 msgid "" "This is the progress bar that will indicate how far along in the LiveUSB " "creation process you are" -msgstr "" +msgstr "នេះជារបារវឌ្ឍនភាពដែលបង្ហាញអំពីរយៈពេលដំណើរការបង្កើត LiveUSB" #: ../liveusb/dialog.py:171 msgid "This is the status console, where all messages get written to." -msgstr "" +msgstr "នេះជាកុងសូលស្ថានភាព ដែលសារទាំងអស់នឹងត្រូវបានសរសេរទៅ។" #: ../liveusb/creator.py:879 msgid "Trying to continue anyway." @@ -495,7 +495,7 @@ msgstr "ប្រព័ន្ធេកសារមិនគាំទ្ msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." -msgstr "" +msgstr "មិនគាំទ្រប្រព័ន្ធឯកសារ៖ %s\nក្នុងករណីដែលអ្នកកំពុងព្យាយាមធ្វើបច្ចុប្បន្នភាពប្រព័ន្ធ Tails ដែលបានដំឡើងដោយដៃ (គឺថា៖ បើវាត្រូវបានដំឡើងដោយគ្មានកម្មវិធីដំឡើង) ជម្រើសនេះនឹងមិនគាំទ្រឡើយ៖ អ្នកត្រូវដំឡើងថ្មី ហើយចាប់ផ្ដើមដោយជ្រើស \"ក្លូន & ដំឡើង\" ជំនួសវិញ។" #: ../liveusb/creator.py:1213 #, python-format @@ -506,7 +506,7 @@ msgstr "មិនគាំទ្រប្រព័ន្ធឯកសា #: ../liveusb/launcher_ui.py:163 msgid "Upgrade from ISO" -msgstr "" +msgstr "ធ្វើបច្ចុប្បន្នភាពពី ISO" #: ../liveusb/dialog.py:161 msgid "Use existing Live system ISO"

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 31 Jan '14

31 Jan '14

commit 5c0bb0876f17ce57ac0919c211a860f200ca4976 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 31 09:45:08 2014 +0000 Update translations for tsum --- km/short-user-manual_km_noimg.xhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/km/short-user-manual_km_noimg.xhtml b/km/short-user-manual_km_noimg.xhtml index 12a040f..33ef726 100644 --- a/km/short-user-manual_km_noimg.xhtml +++ b/km/short-user-manual_km_noimg.xhtml @@ -82,9 +82,9 @@ sub 2048R/EB399FD7 2003-10-16 <ol style="list-style-type: decimal"> <li>បើកផ្ទាំងត្រួតពិនិត្យ Vidalia , ចុចលើ ការកំណត់ ។</li> <li>ចុចជ្រើស បណ្ដាញ។ ខ្ញុំប្រើប្រូកស៊ីដើម្បីចូលដំណើរការអ៊ីនធឺណិត ។</li> - <li>នៅលបន្ទាត់ អាសយដ្ឋាន , បញ្ចូលអាសយដ្ឋានប្រូកស៊ីបើក។ វាអាចជាឈ្មោះម៉ាស៊ីន ឬអាសយដ្ឋាន IP ។</li> + <li>នៅលើបន្ទាត់ អាសយដ្ឋាន , បញ្ចូលអាសយដ្ឋានប្រូកស៊ីបើក។ វាអាចជាឈ្មោះម៉ាស៊ីន ឬអាសយដ្ឋាន IP ។</li> <li>បញ្ចូលច្រកសម្រាប់ប្រូកស៊ី។</li> - <li>Generally, you do not need a username and password. If you do, enter the information in the proper fields.</li> + <li>ជាទូទៅ, អ្នកមិនត្រូវការពាក្យសម្ងាត់ ឬឈ្មោះអ្នកប្រើ។ ប្រសិនបើអ្នកត្រូវការ, បញ្ចូលព័ត៌មាននៅក្នុងវាលត្រឹមត្រូវ។</li> <li>Choose the Type of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li> <li>Push the OK button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li> </ol>

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 31 Jan '14

31 Jan '14

commit da4bce6e901de49bae1c323aa03480677c35a11d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 31 09:15:20 2014 +0000 Update translations for liveusb-creator --- km/km.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/km/km.po b/km/km.po index 57f1445..66690fd 100644 --- a/km/km.po +++ b/km/km.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-29 14:16+0100\n" -"PO-Revision-Date: 2014-01-31 08:41+0000\n" +"PO-Revision-Date: 2014-01-31 09:10+0000\n" "Last-Translator: soksophea <sksophea(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" @@ -81,11 +81,11 @@ msgstr "" #: ../liveusb/dialog.py:163 msgid "Alt+B" -msgstr "" +msgstr "Alt+B" #: ../liveusb/dialog.py:162 msgid "Browse" -msgstr "" +msgstr "រកមើល" #: ../liveusb/dialog.py:169 msgid "" @@ -93,7 +93,7 @@ msgid "" "will be able to store data and make permanent modifications to your live " "operating system. Without it, you will not be able to save data that will " "persist after a reboot." -msgstr "" +msgstr "ដោយការបម្រុងទុកទំហំបន្ថែមនៅលើយូអេសប៊ីរបស់អ្នកសម្រាប់កម្រិតសំឡេងថេរជាន់គ្នា អ្នកនឹងអាចផ្ទុកទិន្នន័យ ហើយធ្វើការកែប្រែជាអចិន្ត្រៃយ៍ទៅកាន់ប្រព័ន្ធប្រតិបត្តិការផ្ទាល់របស់អ្នក។ បើមិនបម្រុងទុកទេ អ្នកនឹងមិនអាចរក្សាទុកទិន្នន័យដែលនឹងបន្ត បន្ទាប់ពីចាប់ផ្ដើមឡើងវិញបានឡើយ។" #: ../liveusb/creator.py:1122 ../liveusb/creator.py:1385 #, python-format @@ -102,7 +102,7 @@ msgstr "កំពុងគណនា SHA1 នៃ %s" #: ../liveusb/creator.py:1333 msgid "Cannot find" -msgstr "" +msgstr "រកមិនឃើញ" #: ../liveusb/creator.py:542 #, python-format @@ -114,14 +114,14 @@ msgid "" "Clone\n" "&&\n" "Install" -msgstr "" +msgstr "ក្លូន\n&&\nដំឡើង" #: ../liveusb/launcher_ui.py:161 msgid "" "Clone\n" "&&\n" "Upgrade" -msgstr "" +msgstr "ក្លូន\n&&\nធ្វើបច្ចុប្បន្នភាប" #: ../liveusb/creator.py:400 #, python-format @@ -136,7 +136,7 @@ msgstr "" #: ../liveusb/dialog.py:166 #, python-format msgid "Download %(distribution)s" -msgstr "" +msgstr "ទាញយក %(distribution)s" #: ../liveusb/gui.py:782 msgid "Download complete!" @@ -197,7 +197,7 @@ msgstr "ការផ្ទៀងផ្ទាត់ឆេកសាំ ISO M msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." -msgstr "" +msgstr "បើអ្នកមិនជ្រើស Live ISO ដែលមានស្រាប់ទេ ការចេញផ្សាយដែលបានជ្រើសនឹងត្រូវបានទាញយកសម្រាប់អ្នក។" #: ../liveusb/dialog.py:174 msgid "Install Tails" @@ -228,7 +228,7 @@ msgstr "ការបង្កើត LiveUSB បានបរាជ័យ!" msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." -msgstr "" +msgstr "សូមប្រាកដថាបានស្រង់ឯកសារ liveusb-creator zip ចេញទាំងស្រុង មុនពេលដំណើរការកម្មវិធីនេះ។" #: ../liveusb/creator.py:1210 msgid "" @@ -275,7 +275,7 @@ msgstr "ទំហំផ្ទុកថេរ" #: ../liveusb/dialog.py:170 msgid "Persistent Storage (0 MB)" -msgstr "" +msgstr "ការផ្ទុកថេរ (0 MB)" #: ../liveusb/gui.py:702 ../liveusb/gui.py:731 msgid "Please confirm your device selection" @@ -283,11 +283,11 @@ msgstr "" #: ../liveusb/gui.py:467 msgid "Refreshing releases..." -msgstr "" +msgstr "កំពុងផ្ទុកការចេញផ្សាយឡើងវិញ..." #: ../liveusb/gui.py:472 msgid "Releases updated!" -msgstr "" +msgstr "បានធ្វើបច្ចុប្បន្នការចេញផ្សាយ!" #: ../liveusb/creator.py:939 ../liveusb/creator.py:1257 #, python-format @@ -329,7 +329,7 @@ msgstr "កំពុងធ្វើសមកាលកម្មទិន #: ../liveusb/dialog.py:168 msgid "Target Device" -msgstr "" +msgstr "ឧបករណ៍គោលដៅ" #: ../liveusb/gui.py:667 msgid "" @@ -341,7 +341,7 @@ msgstr "" msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." -msgstr "" +msgstr "ឯកសារដែលបានជ្រើសជាឯកសារដែលមិនអាចអានបាន។ សូមកែសិទ្ធិ ឬជ្រើសេកសារផ្សេង។" #: ../liveusb/creator.py:337 #, python-format @@ -355,7 +355,7 @@ msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." -msgstr "" +msgstr "ប៊ូតុងនេះអនុញ្ញាតឲ្យអ្នករកមើល Live system ISO មានស្រាប់ដែលអ្នកបានទាញយកពីមុន។ បើអ្នកមិនជ្រើសទេ ការចេញផ្សាយនឹងត្រូវបានទាញយកសម្រាប់អ្នកដោយស្វ័យប្រវត្តិ។" #: ../liveusb/dialog.py:173 msgid "" @@ -415,7 +415,7 @@ msgstr "រកមិនឃើញភាគថាស" #: ../liveusb/creator.py:1280 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" -msgstr "" +msgstr "មិនអាចយក Win32_LogicalDisk; សំណួរ win32com មិនបានត្រឡប់តម្លៃណាមួយ" #: ../liveusb/gui.py:695 msgid "Unable to mount device"

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 31 Jan '14

31 Jan '14

commit 55ee79d7a561966a5816c4e3c080f3fe3e59acfb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 31 09:15:07 2014 +0000 Update translations for tsum --- km/short-user-manual_km_noimg.xhtml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/km/short-user-manual_km_noimg.xhtml b/km/short-user-manual_km_noimg.xhtml index d2fb747..12a040f 100644 --- a/km/short-user-manual_km_noimg.xhtml +++ b/km/short-user-manual_km_noimg.xhtml @@ -78,12 +78,12 @@ sub 2048R/EB399FD7 2003-10-16 ááâáááâá¢áááâáááááâááááŸ bridges , ááŸáâáááááâááááœá áá·áááâ, áá»áâááŸ áá¶áâááááá, ááááá¶á á áŸáâáážáâáááá¢áá áá¶áâááááá¶ááâáá¶áâááááááá¶ááâ ISP ááááâáááá»áâááâáá¶ááâááááá¶á Tor á áááááŒá bridges ááâáááá»áâáááá¢ááâáá¶áâááááá, áá¶áá ááááááá á áŸáâáá¶ááááááŸá Tor áááááááá <h3 id="how-to-use-an-open-proxy">ááááâááááŸâááááŒáááážâááŸá</h3> ááááá·áááŸâááááŸ bridge áá·áâááááŸááá¶á, áááá¶áá¶áâáááááâáááá¶áááááááá Tor ááŸáááážâááááŸââááááŒááááž SOCKS á¬ HTTPS áá¶ááœáâááŸáááážâááŒáâááááŸááá¶áâááâááááá¶á Tor á áá¶âáá¶áâáááâáá¶âááááážâááááá·áááŸâ Tor ááááŒáâáá¶áâááááááá¶ááâáááâááááá¶áâááŒááááá¶áâááááâá¢ááá, ááŸáâááááŒáááážâáááâá¢á¶áââááááŒáâáá¶áâááááŸâáááâáá¶áâáá»ááááá·áá¶áâáááá»áâáá¶áâááááá¶ááâááâááááá¶á Tor áá·áâááâáááâá¢áážáááºáá·áâáá·áâááááŒáâáá¶áâááááœááá·áá·á ááá - The steps below assume you have a functional Tor/Vidalia configuration, and you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies. + ááá á¶áâáá¶áââáááááâáááááâáá¶ââá¢áááâáá¶áâáááááâáááá¶áááááááá Tor/Vidalia á áŸáâá¢áááâáá¶áâááâáááá»á HTTPS, SOCKS4, á¬âááááŒááááž SOCKS5 á <ol style="list-style-type: decimal"> - <li>Open the Vidalia control panel, click on Settings.</li> - <li>Click Network. Select I use a proxy to access the Internet.</li> - <li>On the Address line, enter the open proxy address. This can be a hostname or an IP Address.</li> - <li>Enter the port for the proxy.</li> + <li>ááŸáâáááá¶ááâááááœááá·áá·ááá Vidalia , áá»áâááŸ áá¶áâááááá á</li> + <li>áá»áâááááŸá ááááá¶áá áááá»áâááááŸâááááŒáááážâááŸáááážâááŒáâááááŸááá¶áâá¢áážáááºáá·á á</li> + <li>ááâáâááááá¶áá á¢á¶áááááá¶á , áááááŒáâá¢á¶áááááá¶áâááááŒáááážâááŸáá áá¶âá¢á¶áâáá¶âáááááâááá¶ááážá á¬âá¢á¶áááááá¶á IP á</li> + <li>áááááŒáâááááâááááá¶ááâááááŒáááážá</li> <li>Generally, you do not need a username and password. If you do, enter the information in the proper fields.</li> <li>Choose the Type of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li> <li>Push the OK button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li>

1 0