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

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 10 Jun '14

10 Jun '14

commit a6543362776a42a54ac74a34b88661785d764c17 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 10 02:45:42 2014 +0000 Update translations for tails-misc_completed --- km.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/km.po b/km.po index 9c92216..62f74c7 100644 --- a/km.po +++ b/km.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# khoemsokhem <sokhem(a)open.org.kh>, 2014 -# soksophea <sksophea(a)gmail.com>, 2014 +# Sokhem Khoem <sokhem(a)open.org.kh>, 2014 +# Sok Sophea <sksophea(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-27 19:29+0200\n" -"PO-Revision-Date: 2014-04-30 09:10+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-05-29 00:14+0200\n" +"PO-Revision-Date: 2014-06-10 02:40+0000\n" +"Last-Translator: Sokhem Khoem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -219,10 +219,6 @@ msgstr "បិទភ្លាមៗ" msgid "Reboot Immediately" msgstr "ចាប់ផ្ដើមឡើងវិញភ្លាម" -#: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:72 -msgid "Shutdown Helper" -msgstr "បិទកម្មវិធីជំនួយ" - #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available" msgstr "មិនមាន" @@ -244,6 +240,7 @@ msgid "" msgstr "ព័ត៌មានស្ថាបនា៖\n%s" #: config/chroot_local-includes/usr/local/bin/tails-about:27 +#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1 msgid "About Tails" msgstr "អំពី Tails" @@ -480,6 +477,10 @@ msgstr "i2p" msgid "Anonymous overlay network" msgstr "អនាមិកនៅលើបណ្ដាញ" +#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 +msgid "Learn more about Tails" +msgstr "ស្វែងយល់បន្ថែមអំពី Tails" + #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1 msgid "Reboot" msgstr "ចាប់ផ្ដើមឡើងវិញ"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 10 Jun '14

10 Jun '14

commit d06df695a2469b363ff37d3eaf6d6bca477acb1a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 10 02:45:39 2014 +0000 Update translations for tails-misc --- km.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/km.po b/km.po index fdafb26..62f74c7 100644 --- a/km.po +++ b/km.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# khoemsokhem <sokhem(a)open.org.kh>, 2014 -# soksophea <sksophea(a)gmail.com>, 2014 +# Sokhem Khoem <sokhem(a)open.org.kh>, 2014 +# Sok Sophea <sksophea(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-29 00:14+0200\n" -"PO-Revision-Date: 2014-05-29 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-10 02:40+0000\n" +"Last-Translator: Sokhem Khoem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -479,7 +479,7 @@ msgstr "អនាមិកនៅលើបណ្ដាញ" #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 msgid "Learn more about Tails" -msgstr "" +msgstr "ស្វែងយល់បន្ថែមអំពី Tails" #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1 msgid "Reboot"

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 10 Jun '14

10 Jun '14

commit 25e07e389a150452abc19ed503f449f8e7ed134c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 10 02:45:22 2014 +0000 Update translations for liveusb-creator_completed --- km/km.po | 211 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 108 insertions(+), 103 deletions(-) diff --git a/km/km.po b/km/km.po index fced4a6..3d4aa97 100644 --- a/km/km.po +++ b/km/km.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# khoemsokhem <sokhem(a)open.org.kh>, 2014 -# soksophea <sksophea(a)gmail.com>, 2014 +# Sokhem Khoem <sokhem(a)open.org.kh>, 2014 +# Sok Sophea <sksophea(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 18:42+0100\n" -"PO-Revision-Date: 2014-03-11 07:30+0000\n" -"Last-Translator: khoemsokhem <sokhem(a)open.org.kh>\n" +"POT-Creation-Date: 2014-05-28 16:00+0200\n" +"PO-Revision-Date: 2014-06-10 02:44+0000\n" +"Last-Translator: Sokhem Khoem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,22 +24,22 @@ msgstr "" msgid "%(distribution)s Installer" msgstr "កម្មវិធីដំឡើង %(distribution)s" -#: ../liveusb/gui.py:808 +#: ../liveusb/gui.py:794 #, python-format msgid "%(filename)s selected" msgstr "បានជ្រើស %(filename)s" -#: ../liveusb/gui.py:439 +#: ../liveusb/gui.py:425 #, python-format msgid "%(size)s %(label)s" msgstr "%(size)s %(label)s" -#: ../liveusb/gui.py:445 +#: ../liveusb/gui.py:431 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" -#: ../liveusb/creator.py:1020 +#: ../liveusb/creator.py:1046 #, python-format msgid "%s already bootable" msgstr "%s អាចចាប់ផ្ដើមឡើងវិញបាន" @@ -49,36 +49,36 @@ msgid "" "<!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\">\n" "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" -"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" -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;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">ត្រូវការជំនួយ? សូមអាន </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">ឯកសារ</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" +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:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">ត្រូវការជំនួយ? អាន </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">ឯកសារ</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" #: ../liveusb/launcher_ui.py:160 msgid "" "<!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\">\n" "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" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -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;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">ចម្លង Tails ដែលកំពុងដំណើរការដាក់ក្នុងយូអេសប៊ី ឬកាតអេសឌី។ ទិន្នន័យទាំងអស់នៅលើដ្រាយគោលដៅនឹងត្រូវបាត់បង់។</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" +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:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">ចម្លង Tails ដែលកំពុងដំណើរការនៅលើយូអេសប៊ី ឬកាតអេសឌី។ ទិន្នន័យទាំងអស់នៅលើដ្រាយគោលដៅនឹងបាត់បង់។</span></p></body></html>" #: ../liveusb/launcher_ui.py:162 msgid "" "<!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\">\n" "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" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -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;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">ចម្លង Tails ដែលកំពុងដំណើរការដាក់ក្នុងឧបករណ៍ Tails ដែលបានដំឡើងរួចហើយ។ ភាគថាសផ្សេងទៀតដែលបានរកឃើញនៅលើយូអេសប៊ីនឹងត្រូវបានរក្សាទុក។</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" +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:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">ចម្លង Tails ដែលកំពុងដំណើរលើឧបករណ៍ Tails ដែលបានដំឡើង។ រកឃើញភាគថាសផ្សេងៗនៅលើឧបករណ៍ផ្ទុកត្រូវបានបម្រុងទុក។</span></p></body></html>" #: ../liveusb/launcher_ui.py:164 msgid "" "<!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\">\n" "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" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -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;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">ធ្វើបច្ចុប្បន្នភាពឧបករណ៍ Tails ដែលបានដំឡើងរួច ចេញពីរូបភាព ISO ថ្មី។</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" +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:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">ធ្វើបច្ចុប្បន្នភាពឧបករណ៍ Tails ដែលបានដំឡើងរួចហើយពីរូបភាពអាយអេសអូថ្មី។</span></p></body></html>" #: ../liveusb/dialog.py:163 msgid "Alt+B" @@ -96,16 +96,16 @@ msgid "" "persist after a reboot." msgstr "ដោយការបម្រុងទុកទំហំបន្ថែមនៅលើយូអេសប៊ីរបស់អ្នកសម្រាប់កម្រិតសំឡេងថេរជាន់គ្នា អ្នកនឹងអាចផ្ទុកទិន្នន័យ ហើយធ្វើការផ្លាស់ប្ដូរជាអចិន្ត្រៃយ៍ចំពោះប្រព័ន្ធប្រតិបត្តិការផ្ទាល់របស់អ្នក។ បើមិនបម្រុងទុកទេ អ្នកនឹងមិនអាចរក្សាទុកទិន្នន័យដែលនឹងមានបន្ទាប់ពីចាប់ផ្ដើមឡើងវិញបានឡើយ។" -#: ../liveusb/creator.py:1122 ../liveusb/creator.py:1385 +#: ../liveusb/creator.py:1150 ../liveusb/creator.py:1413 #, python-format msgid "Calculating the SHA1 of %s" msgstr "កំពុងគណនា SHA1 នៃ %s" -#: ../liveusb/creator.py:1333 +#: ../liveusb/creator.py:1361 msgid "Cannot find" msgstr "រកមិនឃើញ" -#: ../liveusb/creator.py:542 +#: ../liveusb/creator.py:551 #, python-format msgid "Cannot find device %s" msgstr "មិនអាចរកឃើញឧបករណ៍ %s" @@ -124,12 +124,12 @@ msgid "" "Upgrade" msgstr "ក្លូន\n&&\nធ្វើបច្ចុប្បន្នភាព" -#: ../liveusb/creator.py:400 +#: ../liveusb/creator.py:407 #, python-format msgid "Creating %sMB persistent overlay" msgstr "ការបង្កើតកម្រិតសំឡេងថេរជាន់គ្នា %sMB" -#: ../liveusb/gui.py:567 +#: ../liveusb/gui.py:553 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "ឧបករណ៍មិនទាន់បានម៉ោន ដូច្នេះយើងមិនអាចកំណត់ទំហំទំនេរបានឡើយ។" @@ -139,11 +139,11 @@ msgstr "ឧបករណ៍មិនទាន់បានម៉ោន msgid "Download %(distribution)s" msgstr "ទាញយក %(distribution)s" -#: ../liveusb/gui.py:782 +#: ../liveusb/gui.py:768 msgid "Download complete!" msgstr "ការទាញយកបានបញ្ចប់!" -#: ../liveusb/gui.py:786 +#: ../liveusb/gui.py:772 msgid "Download failed: " msgstr "ការទាញយកបានបរាជ័យ៖" @@ -152,45 +152,45 @@ msgstr "ការទាញយកបានបរាជ័យ៖" msgid "Downloading %s..." msgstr "កំពុងទាញយក %s..." -#: ../liveusb/creator.py:1118 +#: ../liveusb/creator.py:1146 msgid "Drive is a loopback, skipping MBR reset" msgstr "ដ្រាយគឺជារង្វិលជុំត្រឡប់, រំលងការកំណត់ MBR ឡើងវិញ" -#: ../liveusb/creator.py:813 +#: ../liveusb/creator.py:822 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "បញ្ចូលឧបករណ៍អាន់ម៉ោនសម្រាប់ '%(device)s'" -#: ../liveusb/creator.py:1198 +#: ../liveusb/creator.py:1226 msgid "Error probing device" msgstr "កំហុសក្នុងការស្ទង់ឧបករណ៍" -#: ../liveusb/gui.py:227 +#: ../liveusb/gui.py:211 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." msgstr "កំហុស៖ មិនអាចកំណត់ស្លាក ឬយក UUID នៃឧបករណ៍របស់អ្នក។ មិនអាចបន្ត។" -#: ../liveusb/creator.py:376 +#: ../liveusb/creator.py:383 msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." msgstr "កំហុស៖ SHA1 នៃ LiveCD របស់អ្នកគឺមិនត្រឹមត្រូវ។ អ្នកអាចដំណើរការកម្មវិធីនេះដោយប្រើអាគុយម៉ង់ --noverify ដើម្បីចៀសការពិនិត្យផ្ទៀងផ្ទាត់នេះ។" -#: ../liveusb/creator.py:145 +#: ../liveusb/creator.py:146 msgid "Extracting live image to the target device..." msgstr "ស្រង់រូបភាពមានចលនាទៅកាន់ឧបករណ៍គោលដៅ..." -#: ../liveusb/creator.py:1063 +#: ../liveusb/creator.py:1089 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "ការធ្វើទ្រង់ទ្រាយ %(device)s ជា FAT32" -#: ../liveusb/creator.py:140 +#: ../liveusb/creator.py:141 msgid "ISO MD5 checksum passed" msgstr "ឆេកសាំ ISO MD5 បានបញ្ចប់" -#: ../liveusb/creator.py:138 +#: ../liveusb/creator.py:139 msgid "ISO MD5 checksum verification failed" msgstr "ការផ្ទៀងផ្ទាត់ឆេកសាំ ISO MD5 បានបរាជ័យ" @@ -204,70 +204,70 @@ msgstr "បើអ្នកមិនជ្រើស Live ISO ដែល msgid "Install Tails" msgstr "ដំឡើង Tails" -#: ../liveusb/gui.py:630 +#: ../liveusb/gui.py:616 msgid "Installation complete!" msgstr "ការដំឡើងបានបញ្ចប់!" -#: ../liveusb/gui.py:279 +#: ../liveusb/gui.py:265 #, python-format msgid "Installation complete! (%s)" msgstr "ការដំឡើងបានបញ្ចប់! (%s)" -#: ../liveusb/gui.py:631 +#: ../liveusb/gui.py:617 msgid "Installation was completed. Press OK to close this program." msgstr "ការដំឡើងបានបញ្ចប់។ ចុចយល់ព្រម ដើម្បីបិទកម្មវិធីនេះ។" -#: ../liveusb/creator.py:916 ../liveusb/creator.py:1239 +#: ../liveusb/creator.py:942 ../liveusb/creator.py:1267 msgid "Installing bootloader..." msgstr "កំពុងដំឡើងកម្មវិធីផ្ទុកការចាប់ផ្ដើមឡើងវិញ..." -#: ../liveusb/gui.py:284 +#: ../liveusb/gui.py:270 msgid "LiveUSB creation failed!" msgstr "ការបង្កើត LiveUSB បានបរាជ័យ!" -#: ../liveusb/creator.py:1334 +#: ../liveusb/creator.py:1362 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "សូមប្រាកដថាបានស្រង់ឯកសារ liveusb-creator zip ចេញទាំងស្រុង មុនពេលដំណើរការកម្មវិធីនេះ។" -#: ../liveusb/creator.py:1210 +#: ../liveusb/creator.py:1238 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "សូមប្រាកដថាបានដោតយូអេសប៊ីរបស់អ្នក ហើយធ្វើទ្រង់ទ្រាយដោយប្រើប្រព័ន្ធឯកសារ FAT" -#: ../liveusb/creator.py:835 +#: ../liveusb/creator.py:844 #, python-format msgid "Mount %s exists after unmounting" msgstr "ម៉ោន %s ដែលមានស្រាប់បន្ទាប់ពីអាន់ម៉ោន" -#: ../liveusb/gui.py:573 +#: ../liveusb/gui.py:559 #, python-format msgid "No free space on device %(device)s" msgstr "មិនមានទំហំទំនេរនៅលើឧបករណ៍ %(device)s" -#: ../liveusb/creator.py:802 +#: ../liveusb/creator.py:811 msgid "No mount points found" msgstr "រកមិនឃើញចំណុចម៉ោន" -#: ../liveusb/creator.py:393 +#: ../liveusb/creator.py:400 msgid "Not enough free space on device." msgstr "មិនមានទំហំទំនេរគ្រប់គ្រាន់លើឧបករណ៍។" -#: ../liveusb/gui.py:554 +#: ../liveusb/gui.py:540 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "ភាគថាសគឺ FAT16; ការដាក់កម្រិតលើទំហំទៅ 2G" -#: ../liveusb/gui.py:550 +#: ../liveusb/gui.py:536 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "ភាគថាសគឺ FAT32; ការដាក់កម្រិតលើទំហំទៅ 4G" -#: ../liveusb/creator.py:226 ../liveusb/creator.py:842 +#: ../liveusb/creator.py:227 ../liveusb/creator.py:851 #, python-format msgid "Partitioning device %(device)s" msgstr "ការចែកភាគថាសឧបករណ៍ %(device)s" -#: ../liveusb/gui.py:621 +#: ../liveusb/gui.py:607 msgid "Persistent Storage" msgstr "ទំហំផ្ទុកថេរ" @@ -275,53 +275,53 @@ msgstr "ទំហំផ្ទុកថេរ" msgid "Persistent Storage (0 MB)" msgstr "ការផ្ទុកថេរ (0 MB)" -#: ../liveusb/gui.py:702 ../liveusb/gui.py:731 +#: ../liveusb/gui.py:688 ../liveusb/gui.py:717 msgid "Please confirm your device selection" msgstr "សូមបញ្ជាក់ជម្រើសឧបករណ៍របស់អ្នក" -#: ../liveusb/gui.py:467 +#: ../liveusb/gui.py:453 msgid "Refreshing releases..." msgstr "កំពុងផ្ទុកការចេញផ្សាយឡើងវិញ..." -#: ../liveusb/gui.py:472 +#: ../liveusb/gui.py:458 msgid "Releases updated!" msgstr "បានធ្វើបច្ចុប្បន្នការចេញផ្សាយ!" -#: ../liveusb/creator.py:939 ../liveusb/creator.py:1257 +#: ../liveusb/creator.py:965 ../liveusb/creator.py:1285 #, python-format msgid "Removing %(file)s" msgstr "កំពុងលុប %(file)s" -#: ../liveusb/creator.py:469 +#: ../liveusb/creator.py:478 msgid "Removing existing Live OS" msgstr "លុប Live OS ដែលមានស្រាប់" -#: ../liveusb/creator.py:1112 +#: ../liveusb/creator.py:1140 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "កំណត់ Master Boot Record របស់ %s ឡើងវិញ" -#: ../liveusb/gui.py:793 +#: ../liveusb/gui.py:779 msgid "Select Live ISO" msgstr "ជ្រើស Live ISO" -#: ../liveusb/creator.py:182 +#: ../liveusb/creator.py:183 msgid "Setting up OLPC boot file..." msgstr "កំពុងរៀបចំឯកសារចាប់ផ្ដើមឡើងវិញ OLPC..." -#: ../liveusb/creator.py:716 +#: ../liveusb/creator.py:725 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." msgstr "ភាគថាសមួយចំនួននៃឧបករណ៍គោលដៅ %(device)s ត្រូវបានម៉ោន។ ពួកវានឹងត្រូវបានអាន់ម៉ោន មុនពេលចាប់ផ្ដើមដំណើរការដំឡើង។" -#: ../liveusb/creator.py:131 +#: ../liveusb/creator.py:132 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "ប្រភេទប្រភពមិនគាំទ្រការផ្ទៀងផ្ទាត់ឆេកសាំ ISO MD5, រំលង" -#: ../liveusb/creator.py:1146 +#: ../liveusb/creator.py:1174 msgid "Synchronizing data on disk..." msgstr "កំពុងធ្វើសមកាលកម្មទិន្នន័យនៅលើថាស..." @@ -329,19 +329,19 @@ msgstr "កំពុងធ្វើសមកាលកម្មទិន msgid "Target Device" msgstr "ឧបករណ៍គោលដៅ" -#: ../liveusb/gui.py:667 +#: ../liveusb/gui.py:653 msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." msgstr "Master Boot Record នៅលើឧបករណ៍របស់អ្នកគឺទទេ។ ចុច 'ដំឡើង Tails' ម្ដងទៀតដើម្បីកំណត់ MBR នៅលើឧបករណ៍នេះឡើងវិញ។" -#: ../liveusb/gui.py:796 +#: ../liveusb/gui.py:782 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." msgstr "ឯកសារដែលបានជ្រើសជាឯកសារដែលមិនអាចអានបាន។ សូមកែសិទ្ធិ ឬជ្រើសឯកសារផ្សេង។" -#: ../liveusb/creator.py:337 +#: ../liveusb/creator.py:344 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" @@ -379,87 +379,87 @@ msgstr "នេះជារបារវឌ្ឍនភាពដែល msgid "This is the status console, where all messages get written to." msgstr "នេះជាកុងសូលស្ថានភាព ដែលសារទាំងអស់នឹងត្រូវបានសរសេរទៅកាន់។" -#: ../liveusb/creator.py:879 +#: ../liveusb/creator.py:905 msgid "Trying to continue anyway." msgstr "នៅតែព្យាយាមបន្ត។" -#: ../liveusb/creator.py:911 +#: ../liveusb/creator.py:937 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "មិនអាចប្ដូរស្លាកកម្រិតសំឡេង៖ %(message)s" -#: ../liveusb/creator.py:478 ../liveusb/creator.py:489 +#: ../liveusb/creator.py:487 ../liveusb/creator.py:498 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "មិនអាចប្រើ chmod %(file)s ៖ %(message)s" -#: ../liveusb/creator.py:459 +#: ../liveusb/creator.py:468 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" msgstr "មិនអាចចម្លង %(infile)s ទៅកាន់ %(outfile)s ៖ %(message)s" -#: ../liveusb/gui.py:418 +#: ../liveusb/gui.py:404 msgid "Unable to find any USB drive" msgstr "រកមិនឃើញដ្រាយយូអេសប៊ី" -#: ../liveusb/creator.py:1200 +#: ../liveusb/creator.py:1228 msgid "Unable to find any supported device" msgstr "រកមិនឃើញឧបករណ៍គាំទ្រ" -#: ../liveusb/creator.py:1040 +#: ../liveusb/creator.py:1066 msgid "Unable to find partition" msgstr "រកមិនឃើញភាគថាស" -#: ../liveusb/creator.py:1280 +#: ../liveusb/creator.py:1308 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "មិនអាចយក Win32_LogicalDisk; សំណួរ win32com មិនបានត្រឡប់លទ្ធផលណាមួយ" -#: ../liveusb/gui.py:695 +#: ../liveusb/gui.py:681 msgid "Unable to mount device" msgstr "មិនអាចម៉ោនឧបករណ៍" -#: ../liveusb/creator.py:790 +#: ../liveusb/creator.py:799 #, python-format msgid "Unable to mount device: %(message)s" msgstr "មិនអាចម៉ោនឧបករណ៍៖ %(message)s" -#: ../liveusb/creator.py:494 +#: ../liveusb/creator.py:503 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" msgstr "មិនអាចលុបថតចេញពី LiveOS ពីមុន៖ %(message)s" -#: ../liveusb/creator.py:482 +#: ../liveusb/creator.py:491 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "មិនអាចលុបឯកសារចេញពី LiveOS ពីមុន៖ %(message)s" -#: ../liveusb/creator.py:1115 +#: ../liveusb/creator.py:1143 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "មិនអាចកំណត់ MBR ឡើងវិញ។ អ្នកប្រហែលជាមិនបានដំឡើងកញ្ចប់ `syslinux` ។" -#: ../liveusb/gui.py:802 +#: ../liveusb/gui.py:788 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" msgstr "មិនអាចប្រើឯកសារដែលបានជ្រើស។ អ្នកអាចមានសំណាងជាង បើអ្នកផ្លាស់ទី ISO ទៅ root នៃដ្រាយរបស់អ្នក (ie: C:\\)" -#: ../liveusb/creator.py:697 +#: ../liveusb/creator.py:706 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "មិនអាចសរសេរនៅលើ %(device)s, រំលង។" -#: ../liveusb/creator.py:382 +#: ../liveusb/creator.py:389 msgid "Unknown ISO, skipping checksum verification" msgstr "មិនស្គាល់ ISO, រំលងការផ្ទៀងផ្ទាត់ឆេកសាំ" -#: ../liveusb/creator.py:786 +#: ../liveusb/creator.py:795 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "មិនស្គាល់ការលើកលែង dbus ពេលព្យាយាមម៉ោនឧបករណ៍៖ %(message)s" -#: ../liveusb/creator.py:765 ../liveusb/creator.py:890 +#: ../liveusb/creator.py:774 ../liveusb/creator.py:916 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "មិនស្គាល់ប្រព័ន្ធឯកសារ។ ឧបករណ៍របស់អ្នកអាចចាំបាច់ត្រូវធ្វើទ្រង់ទ្រាយឡើងវិញ។" @@ -468,40 +468,45 @@ msgstr "មិនស្គាល់ប្រព័ន្ធឯកសា msgid "Unknown release: %s" msgstr "មិនស្គាល់ការចេញផ្សាយ៖ %s" -#: ../liveusb/creator.py:827 +#: ../liveusb/creator.py:836 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "ការអាន់ម៉ោន '%(udi)s' នៅលើ '%(device)s'" -#: ../liveusb/creator.py:823 +#: ../liveusb/creator.py:832 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "ការអាន់ម៉ោនប្រព័ន្ធឯកសារដែលបានម៉ោននៅលើ '%(device)s'" -#: ../liveusb/creator.py:876 +#: ../liveusb/creator.py:902 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "មិនគាំទ្រឧបករណ៍ '%(device)s', សូមរាយការណ៍កំហុស។" -#: ../liveusb/creator.py:770 ../liveusb/creator.py:893 +#: ../liveusb/creator.py:779 ../liveusb/creator.py:919 #, python-format msgid "Unsupported filesystem: %s" msgstr "ប្រព័ន្ធឯកសារមិនគាំទ្រ៖ %s" -#: ../liveusb/creator.py:768 +#: ../liveusb/creator.py:777 #, python-format 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 ដែលបានដំឡើងដោយដៃ (គឺថា៖ បើវាត្រូវបានដំឡើងដោយគ្មានកម្មវិធីដំឡើង) ជម្រើសនេះនឹងមិនគាំទ្រឡើយ អ្នកត្រូវដំឡើងថ្មី ហើយចាប់ផ្ដើមដោយជ្រើស \"ក្លូន & ដំឡើង\" ជំនួសវិញ។" -#: ../liveusb/creator.py:1213 +#: ../liveusb/creator.py:1241 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." msgstr "មិនគាំទ្រប្រព័ន្ធឯកសារ៖ %s\nសូមបម្រុងទុក និងធ្វើទ្រង់ទ្រាយយូអេសប៊ីរបស់អ្នកដោយប្រើប្រព័ន្ធឯកសារ FAT ។" +#: ../liveusb/creator.py:877 +#, python-format +msgid "Updating properties of system partition %(system_partition)s" +msgstr "ធ្វើបច្ចុប្បន្នភាពលក្ខណសម្បត្តិភាពថាសប្រព័ន្ធ %(system_partition)s" + #: ../liveusb/launcher_ui.py:163 msgid "Upgrade from ISO" msgstr "ធ្វើបច្ចុប្បន្នភាពពី ISO" @@ -510,54 +515,54 @@ msgstr "ធ្វើបច្ចុប្បន្នភាពពី ISO" msgid "Use existing Live system ISO" msgstr "ប្រើ Live system ISO ដែលមានស្រាប់" -#: ../liveusb/creator.py:133 +#: ../liveusb/creator.py:134 msgid "Verifying ISO MD5 checksum" msgstr "ការផ្ទៀងផ្ទាត់ឆេកសាំ ISO MD5" -#: ../liveusb/creator.py:356 +#: ../liveusb/creator.py:363 msgid "Verifying SHA1 checksum of LiveCD image..." msgstr "កំពុងផ្ទៀងផ្ទាត់ឆេកសាំ SHA1 នៃរូបភាព LiveCD..." -#: ../liveusb/creator.py:360 +#: ../liveusb/creator.py:367 msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "កំពុងផ្ទៀងផ្ទាត់ឆេកសាំ SHA256 នៃរូបភាព LiveCD..." -#: ../liveusb/creator.py:887 ../liveusb/creator.py:1206 +#: ../liveusb/creator.py:913 ../liveusb/creator.py:1234 msgid "Verifying filesystem..." msgstr "កំពុងផ្ទៀងផ្ទាត់ប្រព័ន្ធឯកសារ..." -#: ../liveusb/gui.py:729 +#: ../liveusb/gui.py:715 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "ព្រមាន៖ ការបង្កើតកម្រិតសំឡេងថេរជាន់លើ នឹងលុបកម្រិតសំឡេងដែលមានស្រាប់។" -#: ../liveusb/gui.py:681 +#: ../liveusb/gui.py:667 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." msgstr "ព្រមាន៖ Master Boot Record នៅលើឧបករណ៍របស់អ្នកមិនផ្គូផ្គងជាមួយ system's syslinux MBR របស់អ្នក។ បើអ្នកមានបញ្ហាជាមួយការចាប់ផ្ដើមឡើងវិញនេះ ចូរសាកល្បងដំណើរការ liveusb-creator ដោយប្រើជម្រើស --reset-mbr ។" -#: ../liveusb/gui.py:392 +#: ../liveusb/gui.py:378 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." msgstr "ព្រមាន៖ ឧបករណ៍នេះត្រូវដំណើរការជាអ្នកគ្រប់គ្រង។ ដើម្បីធ្វើវា អ្នកត្រូវចុចកណ្ដុរស្ដាំលើរូបតំណាង រួចបើកលក្ខណសម្បត្តិ។ នៅក្រោមផ្ទាំងភាពឆបគ្នា ធីកប្រអប់ \"ដំណើរការកម្មវិធីនេះជាអ្នកគ្រប់គ្រង\"" -#: ../liveusb/creator.py:152 +#: ../liveusb/creator.py:153 #, python-format msgid "Wrote to device at %(speed)d MB/sec" msgstr "បានសរសេរទៅកាន់ឧបករណ៍ %(speed)d MB/sec" -#: ../liveusb/gui.py:703 +#: ../liveusb/gui.py:689 #, python-format msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" msgstr "អ្នកនឹងដំឡើង Tails នៅលើឧបករណ៍ %(size)s %(vendor)s %(model)s (%(device)s) ។ ទិន្នន័យទាំងអស់នៅលើឧបករណ៍នឹងត្រូវបាត់បង់។ បន្ត?" -#: ../liveusb/gui.py:719 +#: ../liveusb/gui.py:705 #, python-format msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " @@ -565,17 +570,17 @@ msgid "" "unchanged. Continue?" msgstr "អ្នកនឹងបង្កើនទំហំ Tails នៅលើឧបករណ៍ %(parent_size)s %(vendor)s %(model)s (%(device)s) ។ កម្រិតសំឡេងថេរនៅលើឧបករណ៍នេះ នឹងមិនផ្លាស់ប្ដូរទេ។ បន្ត?" -#: ../liveusb/creator.py:604 +#: ../liveusb/creator.py:613 msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" msgstr "អ្នកកំពុងប្រើកំណែចាស់របស់ syslinux-extlinux ដែលមិនគាំទ្រប្រព័ន្ធឯកសារ ext4" -#: ../liveusb/gui.py:787 +#: ../liveusb/gui.py:773 msgid "You can try again to resume your download" msgstr "អ្នកអាចព្យាយាមម្ដងទៀតដើម្បីធ្វើបន្តការទាញយករបស់អ្នក" -#: ../liveusb/creator.py:92 +#: ../liveusb/creator.py:93 msgid "You must run this application as root" msgstr "អ្នកត្រូវតែដំណើរការកម្មវិធីនេះជា root"

1 0

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

10 Jun '14

commit 38574aee2056715f5072a3b1f96dade9bc2fafaa Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 10 02:45:18 2014 +0000 Update translations for liveusb-creator --- km/km.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/km/km.po b/km/km.po index 2eee365..3d4aa97 100644 --- a/km/km.po +++ b/km/km.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# khoemsokhem <sokhem(a)open.org.kh>, 2014 -# soksophea <sksophea(a)gmail.com>, 2014 +# Sokhem Khoem <sokhem(a)open.org.kh>, 2014 +# Sok Sophea <sksophea(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 16:00+0200\n" -"PO-Revision-Date: 2014-05-29 09:11+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-10 02:44+0000\n" +"Last-Translator: Sokhem Khoem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,7 +51,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:11pt;\">.</span></p></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:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">ត្រូវការជំនួយ? អាន </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">ឯកសារ</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" #: ../liveusb/launcher_ui.py:160 msgid "" @@ -60,7 +60,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></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:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">ចម្លង Tails ដែលកំពុងដំណើរការនៅលើយូអេសប៊ី ឬកាតអេសឌី។ ទិន្នន័យទាំងអស់នៅលើដ្រាយគោលដៅនឹងបាត់បង់។</span></p></body></html>" #: ../liveusb/launcher_ui.py:162 msgid "" @@ -69,7 +69,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></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:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">ចម្លង Tails ដែលកំពុងដំណើរលើឧបករណ៍ Tails ដែលបានដំឡើង។ រកឃើញភាគថាសផ្សេងៗនៅលើឧបករណ៍ផ្ទុកត្រូវបានបម្រុងទុក។</span></p></body></html>" #: ../liveusb/launcher_ui.py:164 msgid "" @@ -78,7 +78,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></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:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">ធ្វើបច្ចុប្បន្នភាពឧបករណ៍ Tails ដែលបានដំឡើងរួចហើយពីរូបភាពអាយអេសអូថ្មី។</span></p></body></html>" #: ../liveusb/dialog.py:163 msgid "Alt+B" @@ -505,7 +505,7 @@ msgstr "មិនគាំទ្រប្រព័ន្ធឯកសា #: ../liveusb/creator.py:877 #, python-format msgid "Updating properties of system partition %(system_partition)s" -msgstr "" +msgstr "ធ្វើបច្ចុប្បន្នភាពលក្ខណសម្បត្តិភាពថាសប្រព័ន្ធ %(system_partition)s" #: ../liveusb/launcher_ui.py:163 msgid "Upgrade from ISO"

1 0

[orbot/master] ensure torrc values are overwritten
by n8fr8＠torproject.org 10 Jun '14

10 Jun '14

commit 022436515d73f773d38149dc38c2aea0f07ab1d9 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jun 9 18:34:40 2014 -0400 ensure torrc values are overwritten --- .../android/service/TorResourceInstaller.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java index 2744a55..438e68d 100644 --- a/src/org/torproject/android/service/TorResourceInstaller.java +++ b/src/org/torproject/android/service/TorResourceInstaller.java @@ -115,6 +115,22 @@ public class TorResourceInstaller implements TorServiceConstants { return true; } + public boolean installTorrc () throws IOException, FileNotFoundException, TimeoutException + { + + InputStream is; + File outFile; + + Shell shell = Shell.startShell(new ArrayList<String>(),installFolder.getAbsolutePath()); + + is = context.getResources().openRawResource(R.raw.torrc); + outFile = new File(installFolder, TORRC_ASSET_KEY); + shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); + streamToFile(is,outFile, false, false); + + return true; + } + /* * Extract the Tor binary from the APK file using ZIP */

1 0

[orbot/master] bumping to 14.0.1
by n8fr8＠torproject.org 10 Jun '14

10 Jun '14

commit 7e76162b8850c3bee1eed0b562204bda6cce7218 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jun 9 18:48:54 2014 -0400 bumping to 14.0.1 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f05d19a..7c97a84 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="14.0.0" - android:versionCode="100" + android:versionName="14.0.1" + android:versionCode="101" android:installLocation="auto" >

1 0

[orbot/master] allow support for adding custom lines to torrc
by n8fr8＠torproject.org 10 Jun '14

10 Jun '14

commit af51a9853569da03c496ef859188512b47807d04 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jun 9 18:47:48 2014 -0400 allow support for adding custom lines to torrc --- res/values/strings.xml | 5 +++++ res/xml/preferences.xml | 8 ++++++++ src/org/torproject/android/service/TorResourceInstaller.java | 9 ++++++++- src/org/torproject/android/service/TorService.java | 5 ++++- src/org/torproject/android/service/TorServiceConstants.java | 2 +- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 42937d4..4456aff 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -261,4 +261,9 @@ <string name="pref_socks_summary">IP and Port that Tor offers its SOCKS proxy on (default: 9050)</string> <string name="pref_socks_dialog">SOCKS Config (ip:port)</string> + <string name="pref_torrc_title">Torrc Custom Config</string> + <string name="pref_torrc_summary">EXPERTS ONLY: enter direct torrc config lines</string> + <string name="pref_torrc_dialog">Custom Torrc</string> + + </resources> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index e4984e2..0277343 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -204,6 +204,14 @@ android:dialogTitle="@string/pref_socks_dialog" android:defaultValue="9050" /> + <EditTextPreference android:key="pref_custom_torrc" +android:title="@string/pref_torrc_title" +android:summary="@string/pref_torrc_summary" +android:dialogTitle="@string/pref_torrc_dialog" +android:defaultValue="" +/> + + <CheckBoxPreference android:key="pref_enable_logging" android:defaultValue="false" diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java index 438e68d..b8cdf26 100644 --- a/src/org/torproject/android/service/TorResourceInstaller.java +++ b/src/org/torproject/android/service/TorResourceInstaller.java @@ -11,6 +11,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.io.StringBufferInputStream; import java.util.ArrayList; import java.util.concurrent.TimeoutException; import java.util.zip.ZipEntry; @@ -115,7 +116,7 @@ public class TorResourceInstaller implements TorServiceConstants { return true; } - public boolean installTorrc () throws IOException, FileNotFoundException, TimeoutException + public boolean installTorrc (String extraLines) throws IOException, FileNotFoundException, TimeoutException { InputStream is; @@ -128,6 +129,12 @@ public class TorResourceInstaller implements TorServiceConstants { shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); streamToFile(is,outFile, false, false); + if (extraLines != null && extraLines.length() > 0) + { + StringBufferInputStream sbis = new StringBufferInputStream('\n' + extraLines + '\n'); + streamToFile(sbis,outFile,true,false); + } + return true; } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 0e44545..ce2d075 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -557,7 +557,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst stopTor(); TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); - boolean success = installer.installTorrc(); + + String extraLines = prefs.getString("pref_custom_torrc", null); + + boolean success = installer.installTorrc(extraLines); if (version == null || (!version.equals(BINARY_TOR_VERSION)) || (!fileTor.exists())) { diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index e50c416..74b2ef7 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -76,7 +76,7 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.4.22-openssl1.0.1h.2"; + public static final String BINARY_TOR_VERSION = "0.2.4.22-openssl1.0.1h"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; //obfsproxy

1 0

[orbot/master] multiple fixes for tor start including "auto" control port
by n8fr8＠torproject.org 10 Jun '14

10 Jun '14

commit 22938c9ed9613115f3ceddcd92e68c24d4463511 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jun 9 18:35:08 2014 -0400 multiple fixes for tor start including "auto" control port also try to kill hung tor process --- res/raw/torrc | 4 +- src/org/torproject/android/Orbot.java | 6 +- src/org/torproject/android/service/TorService.java | 146 +++++++++++++------- .../android/service/TorServiceConstants.java | 3 +- 4 files changed, 97 insertions(+), 62 deletions(-) diff --git a/res/raw/torrc b/res/raw/torrc index e68d169..aade84c 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -1,6 +1,6 @@ Log notice stdout -ControlListenAddress 127.0.0.1 -ControlPort 9051 +ControlPortWriteToFile /data/data/org.torproject.android/app_bin/control.txt +ControlPort auto CookieAuthentication 1 TransPort 9040 TransListenAddress 127.0.0.1 diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 2f80ea1..48deae5 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -652,15 +652,11 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic if (showWizard) { - - Editor pEdit = mPrefs.edit(); pEdit.putBoolean("show_wizard",false); pEdit.commit(); - - startWizard(); - + startWizard(); } } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index f1b80ed..0e44545 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -8,10 +8,12 @@ package org.torproject.android.service; +import java.io.BufferedReader; import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; @@ -491,7 +493,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst conn = null; } - + killProcess(fileTor); killProcess(filePolipo); killProcess(fileObfsclient); @@ -551,27 +553,27 @@ public class TorService extends Service implements TorServiceConstants, TorConst String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null); logNotice("checking binary version: " + version); + + stopTor(); + + TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); + boolean success = installer.installTorrc(); - if (version == null || (!version.equals(BINARY_TOR_VERSION))) + if (version == null || (!version.equals(BINARY_TOR_VERSION)) || (!fileTor.exists())) { - stopTor(); - logNotice("upgrading binaries to latest version: " + BINARY_TOR_VERSION); - TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); - boolean success = installer.installResources(); + success = installer.installResources(); if (success) prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).commit(); } else if (!fileTorRc.exists()) { - stopTor(); logNotice("upgrading binaries to latest version: " + BINARY_TOR_VERSION); - TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); - boolean success = installer.installResources(); + success = installer.installResources(); if (success) prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).commit(); @@ -763,7 +765,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst shell.add(cmdTor); - Thread.sleep(torRetryWaitTimeMS); //now try to connect @@ -785,11 +786,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice("Tor started; process id=" + mLastProcessId); processSettingsImpl(); + + startTorMinder (); + } shell.close(); - startTorMinder (); } private void runPolipoShellCmd () throws Exception @@ -869,63 +872,69 @@ public class TorService extends Service implements TorServiceConstants, TorConst } else { - while (conn == null && i++ < maxAttempts) { try { - logNotice( "Connecting to control port: " + TOR_CONTROL_PORT); - torConnSocket = new Socket(IP_LOCALHOST, TOR_CONTROL_PORT); - torConnSocket.setSoTimeout(CONTROL_SOCKET_TIMEOUT); + int controlPort = getControlPort(); + logNotice( "Connecting to control port: " + controlPort); - conn = TorControlConnection.getConnection(torConnSocket); - - if (ENABLE_DEBUG_LOG) - { - conn.setDebugging(System.out); - - } - - logNotice( "SUCCESS connected to Tor control port"); - - File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); - - if (fileCookie.exists()) - { - byte[] cookie = new byte[(int)fileCookie.length()]; - DataInputStream fis = new DataInputStream(new FileInputStream(fileCookie)); - fis.read(cookie); - fis.close(); - conn.authenticate(cookie); - - logNotice( "SUCCESS - authenticated to control port"); + if (controlPort != -1) + { + torConnSocket = new Socket(IP_LOCALHOST, controlPort); + torConnSocket.setSoTimeout(CONTROL_SOCKET_TIMEOUT); + + conn = TorControlConnection.getConnection(torConnSocket); - sendCallbackStatusMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete)); - - addEventHandler(); - - String torProcId = conn.getInfo("process/pid"); + if (ENABLE_DEBUG_LOG) + { + conn.setDebugging(System.out); + + } - return Integer.parseInt(torProcId); + logNotice( "SUCCESS connected to Tor control port"); + + File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); + + if (fileCookie.exists()) + { + byte[] cookie = new byte[(int)fileCookie.length()]; + DataInputStream fis = new DataInputStream(new FileInputStream(fileCookie)); + fis.read(cookie); + fis.close(); + conn.authenticate(cookie); + + logNotice( "SUCCESS - authenticated to control port"); + + sendCallbackStatusMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete)); + + addEventHandler(); + + String torProcId = conn.getInfo("process/pid"); + + return Integer.parseInt(torProcId); + + } + else + { + logNotice ("Tor authentication cookie does not exist yet"); + conn = null; + + } + } - } - else - { - logNotice ("Tor authentication cookie does not exist yet; trying again..."); - conn = null; - - } } catch (Exception ce) { conn = null; - logNotice( "Error connecting to Tor local control port"); - - //Log.d(TAG,"Attempt: Error connecting to control port: " + ce.getLocalizedMessage(),ce); + logException( "Error connecting to Tor local control port",ce); } - + try { + logNotice("waiting..."); + Thread.sleep(5000); } + catch (Exception e){} } } @@ -934,6 +943,35 @@ public class TorService extends Service implements TorServiceConstants, TorConst } + private int getControlPort () + { + try + { + File fileControl = new File(appBinHome,"control.txt"); + + logNotice("Reading control port config file: " + fileControl.getAbsolutePath()); + BufferedReader bufferedReader = new BufferedReader(new FileReader(fileControl)); + String line = bufferedReader.readLine(); + + //PORT=127.0.0.1:45051 + + if (line != null) + { + String[] lineParts = line.split(":"); + return Integer.parseInt(lineParts[1]); + } + + + } + catch (Exception e) + { + logException("unable to get control port",e); + } + + + return -1; + } + private void checkAddressAndCountry () throws IOException { @@ -1046,6 +1084,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst catch (Exception e) { + stopTor(); logException("Unable to start Tor: " + e.toString(),e); currentStatus = STATUS_OFF; showToolbarNotification(getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, false); @@ -2103,6 +2142,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e1) { logException("Error in Tor heartbeat checker",e1); + } } diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index da67936..e50c416 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -53,7 +53,6 @@ public interface TorServiceConstants { //what is says! public final static String IP_LOCALHOST = "127.0.0.1"; - public final static int TOR_CONTROL_PORT = 9051; public final static int UPDATE_TIMEOUT = 1000; public final static int TOR_TRANSPROXY_PORT = 9040; public final static int STANDARD_DNS_PORT = 53; @@ -77,7 +76,7 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.4.22-openssl1.0.1h"; + public static final String BINARY_TOR_VERSION = "0.2.4.22-openssl1.0.1h.2"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; //obfsproxy

1 0

[meek/master] Comment #12146 caveat of Firefox helper.
by dcf＠torproject.org 09 Jun '14

09 Jun '14

commit ebda2c3a53bde9f21af0f7296abfe16a1cc12516 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jun 9 09:55:06 2014 -0700 Comment #12146 caveat of Firefox helper. People could get burned if they use an HTTP proxy with an unpatched Firefox. ("Burned" in the same sense as if they made a plain Tor connection--the censor knows they're using Tor and are trying to circumvent.) I'm not putting this fact into user-visible documentation because it will affect few users, and be taken care of by a future Firefox release. Those using the Browser Bundle are already covered. Only those attempting to set up their own Firefox helper or BYOB setup will need to know it. --- firefox/components/main.js | 8 ++++++++ meek-client/meek-client.go | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/firefox/components/main.js b/firefox/components/main.js index 4de9532..a84b2d7 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -146,6 +146,14 @@ MeekHTTPHelper.buildProxyInfo = function(spec) { // "direct"; i.e., no proxy. This is the default. return MeekHTTPHelper.proxyProtocolService.newProxyInfo("direct", "", 0, flags, 0xffffffff, null); } else if (spec.type === "http") { + // "http" proxy. Versions of Firefox before 32, and Tor Browser before + // 3.6.2, leak the covert Host header in HTTP proxy CONNECT requests. + // Using an HTTP proxy cannot provide effective obfuscation without such + // a patched Firefox. + // https://trac.torproject.org/projects/tor/ticket/12146 + // https://gitweb.torproject.org/tor-browser.git/commitdiff/e08b91c78d919f66dd… + // https://bugzilla.mozilla.org/show_bug.cgi?id=1017769 + // https://hg.mozilla.org/mozilla-central/rev/a1f6458800d4 return MeekHTTPHelper.proxyProtocolService.newProxyInfo("http", spec.host, spec.port, flags, 0xffffffff, null); } else if (spec.type === "socks5") { // "socks5" is tor's name. "socks" is XPCOM's name. diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 441348d..ff1ab04 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -351,6 +351,15 @@ func checkProxyURL(u *url.URL) error { } else { // With the helper we can use HTTP and SOCKS (because it is the // browser that does the proxying, not us). + // For the HTTP proxy with the Firefox helper: versions of + // Firefox before 32 , and Tor Browser before 3.6.2, leak the + // covert Host header in HTTP proxy CONNECT requests. Using an + // HTTP proxy cannot provide effective obfuscation without such + // a patched Firefox. + // https://trac.torproject.org/projects/tor/ticket/12146 + // https://gitweb.torproject.org/tor-browser.git/commitdiff/e08b91c78d919f66dd… + // https://bugzilla.mozilla.org/show_bug.cgi?id=1017769 + // https://hg.mozilla.org/mozilla-central/rev/a1f6458800d4 switch options.ProxyURL.Scheme { case "http", "socks5", "socks4a": default:

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 09 Jun '14

09 Jun '14

commit 60f0e0cce876f22f331963b5ec3d416f70363d23 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 9 14:15:39 2014 +0000 Update translations for tor-launcher-network-settings --- el/network-settings.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/el/network-settings.dtd b/el/network-settings.dtd index c7e6443..fdfab94 100644 --- a/el/network-settings.dtd +++ b/el/network-settings.dtd @@ -12,7 +12,7 @@ <!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> <!ENTITY torSettings.configure "Ρύθμιση "> <!ENTITY torSettings.connectPrompt2 "Θα ήθελα να συνδεθεί άμεσα με το δίκτυο Tor."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Αυτό θα λειτουργήσει στις περισσότερες περιπτώσεις."> <!ENTITY torSettings.connect "Σύνδεση"> <!ENTITY torSettings.proxyQuestion "Μήπως αυτός ο υπολογιστής πρέπει να χρησιμοποιήση έναν διακομιστή μεσολάβησης για πρόσβαση στο Διαδίκτυο;"> @@ -56,9 +56,9 @@ <!ENTITY torsettings.bridgeHelpTitle "Γεφυρες αναμεταδοτων Βοηθεια"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp2Heading "Μέσω του Διαδικτύου"> +<!ENTITY torsettings.bridgeHelp2 "Χρησιμοποιήστε έναν φυλλομετρητή για να επισκεφτείτε το https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Μέσω της Αυτοματοποιημένης Απάντησης Email"> <!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> +<!ENTITY torsettings.bridgeHelp4Heading "Μέσω της Υποστήριξης"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request.">

1 0