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

[arm/master] Using stem's new newnym methods
by atagar＠torproject.org 27 Jan '14

27 Jan '14

commit 36507a4c239383971c7559171b68d1896f10ef0c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 26 19:24:26 2014 -0800 Using stem's new newnym methods Moved this capability to stem so no need to keep our couterparts. --- arm/header_panel.py | 8 ++++---- arm/util/tor_tools.py | 39 --------------------------------------- 2 files changed, 4 insertions(+), 43 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index b4c6a1d..8621fb3 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -21,6 +21,7 @@ import threading import arm.util.tracker +from stem import Signal from stem.control import State from stem.util import conf, log, str_tools @@ -146,7 +147,7 @@ class HeaderPanel(panel.Panel, threading.Thread): Requests a new identity and provides a visual queue. """ - tor_tools.get_conn().send_newnym() + tor_controller().signal(Signal.NEWNYM) # If we're wide then the newnym label in this panel will give an # indication that the signal was sent. Otherwise use a msg. @@ -159,7 +160,7 @@ class HeaderPanel(panel.Panel, threading.Thread): def handle_key(self, key): is_keystroke_consumed = True - if key in (ord('n'), ord('N')) and tor_tools.get_conn().is_newnym_available(): + if key in (ord('n'), ord('N')) and tor_controller().is_newnym_available(): self.send_newnym() elif key in (ord('r'), ord('R')) and not self._is_tor_connected: #oldSocket = tor_tools.get_conn().get_controller().get_socket() @@ -440,8 +441,7 @@ class HeaderPanel(panel.Panel, threading.Thread): # (Client only) Undisplayed / Line 2 Right (new identity option) if is_wide: - conn = tor_tools.get_conn() - newnym_wait = conn.get_newnym_wait() + newnym_wait = tor_controller().get_newnym_wait() msg = "press 'n' for a new identity" diff --git a/arm/util/tor_tools.py b/arm/util/tor_tools.py index a7945fd..0e7aaec 100644 --- a/arm/util/tor_tools.py +++ b/arm/util/tor_tools.py @@ -48,7 +48,6 @@ class Controller: self._address_lookup_cache = {} # lookup cache with fingerprint -> (ip address, or port) mappings self._consensus_lookup_cache = {} # lookup cache with network status entries self._descriptor_lookup_cache = {} # lookup cache with relay descriptors - self._last_newnym = 0 # time we last sent a NEWNYM signal def init(self, controller): """ @@ -84,10 +83,6 @@ class Controller: self._consensus_lookup_cache = {} self._descriptor_lookup_cache = {} - # time that we sent our last newnym signal - - self._last_newnym = 0 - self.conn_lock.release() def close(self): @@ -224,40 +219,6 @@ class Controller: self.conn_lock.release() - def send_newnym(self): - """ - Sends a newnym request to Tor. These are rate limited so if it occures - more than once within a ten second window then the second is delayed. - """ - - self.conn_lock.acquire() - - if self.is_alive(): - self._last_newnym = time.time() - self.controller.signal(stem.Signal.NEWNYM) - - self.conn_lock.release() - - def is_newnym_available(self): - """ - True if Tor will immediately respect a newnym request, false otherwise. - """ - - if self.is_alive(): - return self.get_newnym_wait() == 0 - else: - return False - - def get_newnym_wait(self): - """ - Provides the number of seconds until a newnym signal would be respected. - """ - - # newnym signals can occure at the rate of one every ten seconds - # TODO: this can't take other controllers into account :( - - return max(0, math.ceil(self._last_newnym + 10 - time.time())) - def get_circuits(self, default = []): """ This provides a list with tuples of the form:

1 0

[arm/master] Dropping tor_tools' get_my_file_descriptor_limit()
by atagar＠torproject.org 27 Jan '14

27 Jan '14

commit ed1a97da1ea6c7a633fc4b7001f0fdd543d10015 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 26 19:32:13 2014 -0800 Dropping tor_tools' get_my_file_descriptor_limit() In Tor version 0.2.3.x-final we added the ability to query available tor's file descriptor limit. This method was a holdover from before this was commonly available, taking a guess at the limit based on either 'ulimit -Hn' or tor's user. This tor capability has been out there long enough that we can drop this fallback functionality. --- arm/header_panel.py | 17 +++++++++-------- arm/util/tor_tools.py | 39 --------------------------------------- 2 files changed, 9 insertions(+), 47 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index 8621fb3..f287d81 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -75,7 +75,7 @@ class HeaderPanel(panel.Panel, threading.Thread): tor/ version, versionStatus, nickname, or_port, dir_port, control_port, socketPath, exit_policy, isAuthPassword (bool), isAuthCookie (bool), orListenAddr, *address, *fingerprint, *flags, pid, start_time, - *fd_used, fd_limit, isFdLimitEstimate + *fd_used, fd_limit sys/ hostname, os, version stat/ *%torCpu, *%armCpu, *rss, *%mem @@ -364,8 +364,7 @@ class HeaderPanel(panel.Panel, threading.Thread): elif fd_percent >= 60: fd_percent_format = ui_tools.get_color("yellow") - estimate_char = "?" if self.vals["tor/isFdLimitEstimate"] else "" - base_label = "file desc: %i / %i%s (" % (self.vals["tor/fd_used"], self.vals["tor/fd_limit"], estimate_char) + base_label = "file desc: %i / %i (" % (self.vals["tor/fd_used"], self.vals["tor/fd_limit"]) self.addstr(y, x + 59, base_label) self.addstr(y, x + 59 + len(base_label), fd_percentLabel, fd_percent_format) @@ -593,9 +592,12 @@ class HeaderPanel(panel.Panel, threading.Thread): # file descriptor limit for the process, if this can't be determined # then the limit is None - fd_limit, fd_is_estimate = tor_tools.get_conn().get_my_file_descriptor_limit() - self.vals["tor/fd_limit"] = fd_limit - self.vals["tor/isFdLimitEstimate"] = fd_is_estimate + fd_limit = controller.get_info('process/descriptor-limit', '-1') + + if fd_limit != '-1' and fd_limit.isdigit(): + self.vals["tor/fd_limit"] = int(fd_limit) + else: + self.vals["tor/fd_limit"] = None # system information @@ -642,8 +644,7 @@ class HeaderPanel(panel.Panel, threading.Thread): if self.vals["tor/fd_used"] and self.vals["tor/fd_limit"]: fd_percent = 100 * self.vals["tor/fd_used"] / self.vals["tor/fd_limit"] - estimated_label = " estimated" if self.vals["tor/isFdLimitEstimate"] else "" - msg = "Tor's%s file descriptor usage is at %i%%." % (estimated_label, fd_percent) + msg = "Tor's file descriptor usage is at %i%%." % fd_percent if fd_percent >= 90 and not self._is_fd_ninety_percent_warned: self._is_fd_sixty_percent_warned, self._is_fd_ninety_percent_warned = True, True diff --git a/arm/util/tor_tools.py b/arm/util/tor_tools.py index 0e7aaec..1d17905 100644 --- a/arm/util/tor_tools.py +++ b/arm/util/tor_tools.py @@ -484,45 +484,6 @@ class Controller: return result - def get_my_file_descriptor_limit(self): - """ - Provides the maximum number of file descriptors this process can have. - Only the Tor process itself reliably knows this value, and the option for - getting this was added in Tor 0.2.3.x-final. If that's unavailable then - we can only estimate the file descriptor limit based on other factors. - - The return result is a tuple of the form: - (fileDescLimit, isEstimate) - and if all methods fail then both values are None. - """ - - # provides -1 if the query fails - queried_limit = self.get_info("process/descriptor-limit", None) - - if queried_limit is not None and queried_limit != "-1": - return (int(queried_limit), False) - - tor_user = self.get_my_user() - - # This is guessing the open file limit. Unfortunately there's no way - # (other than "/usr/proc/bin/pfiles pid | grep rlimit" under Solaris) - # to get the file descriptor limit for an arbitrary process. - - if tor_user == "debian-tor": - # probably loaded via /etc/init.d/tor which changes descriptor limit - return (8192, True) - else: - # uses ulimit to estimate (-H is for hard limit, which is what tor uses) - ulimit_results = system.call("ulimit -Hn") - - if ulimit_results: - ulimit = ulimit_results[0].strip() - - if ulimit.isdigit(): - return (int(ulimit), True) - - return (None, None) - def get_start_time(self): """ Provides the unix time for when the tor process first started. If this

1 0

[arm/master] Moving get_my_file_descriptor_usage to header panel
by atagar＠torproject.org 27 Jan '14

27 Jan '14

commit 43b7f652ecd91b72c817f2f4fda98a3bf2b97dcd Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 26 19:42:30 2014 -0800 Moving get_my_file_descriptor_usage to header panel The sole user of tor_tools' get_my_file_descriptor_usage() is the header panel. This is functionality that doesn't belong in stem, so might as well move it to its caller. --- arm/header_panel.py | 21 +++++++++++++++++++-- arm/util/tor_tools.py | 32 +------------------------------- 2 files changed, 20 insertions(+), 33 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index f287d81..fbd3d92 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -23,7 +23,7 @@ import arm.util.tracker from stem import Signal from stem.control import State -from stem.util import conf, log, str_tools +from stem.util import conf, log, proc, str_tools import arm.starter import arm.popups @@ -635,7 +635,7 @@ class HeaderPanel(panel.Panel, threading.Thread): # current usage) then omit file descriptor functionality. if self.vals["tor/fd_limit"]: - fd_used = tor_tools.get_conn().get_my_file_descriptor_usage() + fd_used = get_file_descriptor_usage(controller.get_pid(None)) if fd_used and fd_used <= self.vals["tor/fd_limit"]: self.vals["tor/fd_used"] = fd_used @@ -678,3 +678,20 @@ class HeaderPanel(panel.Panel, threading.Thread): self._last_update = current_time self.vals_lock.release() + + +def get_file_descriptor_usage(pid): + """ + Provides the number of file descriptors currently being used by this + process. This returns None if this can't be determined. + """ + + # The file descriptor usage is the size of the '/proc/<pid>/fd' contents + # http://linuxshellaccount.blogspot.com/2008/06/finding-number-of-open-file-d… + # I'm not sure about other platforms (like BSD) so erroring out there. + + if pid and proc.is_available(): + try: + return len(os.listdir('/proc/%s/fd' % pid)) + except: + return None diff --git a/arm/util/tor_tools.py b/arm/util/tor_tools.py index 1d17905..87033c9 100644 --- a/arm/util/tor_tools.py +++ b/arm/util/tor_tools.py @@ -3,15 +3,12 @@ Helper for working with an active tor process. This both provides a wrapper for accessing stem and notifications of state changes to subscribers. """ -import math -import os import threading -import time import stem import stem.control -from stem.util import log, proc, system +from stem.util import log, system CONTROLLER = None # singleton Controller instance @@ -457,33 +454,6 @@ class Controller: return self.controller.get_user(None) - def get_my_file_descriptor_usage(self): - """ - Provides the number of file descriptors currently being used by this - process. This returns None if this can't be determined. - """ - - # The file descriptor usage is the size of the '/proc/<pid>/fd' contents - # http://linuxshellaccount.blogspot.com/2008/06/finding-number-of-open-file-d… - # I'm not sure about other platforms (like BSD) so erroring out there. - - self.conn_lock.acquire() - - result = None - - if self.is_alive() and proc.is_available(): - my_pid = self.controller.get_pid(None) - - if my_pid: - try: - result = len(os.listdir("/proc/%s/fd" % my_pid)) - except: - pass - - self.conn_lock.release() - - return result - def get_start_time(self): """ Provides the unix time for when the tor process first started. If this

1 0

[arm/master] Finish moving header off tor_tools
by atagar＠torproject.org 27 Jan '14

27 Jan '14

commit dbfd2691b28e768d34e1e2abe2c072fa37f5199e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 26 19:49:08 2014 -0800 Finish moving header off tor_tools Replacing our last couple tor_tools calls with Controller counterparts. --- arm/header_panel.py | 19 +++++++++++++++---- arm/util/tor_tools.py | 11 ----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index fbd3d92..6232da3 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -23,13 +23,13 @@ import arm.util.tracker from stem import Signal from stem.control import State -from stem.util import conf, log, proc, str_tools +from stem.util import conf, log, proc, str_tools, system import arm.starter import arm.popups import arm.controller -from util import panel, tor_tools, ui_tools, tor_controller +from util import panel, ui_tools, tor_controller # minimum width for which panel attempts to double up contents (two columns to # better use screen real estate) @@ -608,7 +608,11 @@ class HeaderPanel(panel.Panel, threading.Thread): self.vals["tor/pid"] = controller.get_pid("") - start_time = tor_tools.get_conn().get_start_time() + try: + start_time = system.get_start_time(controller.get_pid()) + except: + start_time = None + self.vals["tor/start_time"] = start_time if start_time else "" # reverts volatile parameters to defaults @@ -628,7 +632,14 @@ class HeaderPanel(panel.Panel, threading.Thread): self.vals["tor/address"] = controller.get_info("address", "") self.vals["tor/fingerprint"] = controller.get_info("fingerprint", self.vals["tor/fingerprint"]) - self.vals["tor/flags"] = tor_tools.get_conn().get_my_flags(self.vals["tor/flags"]) + + my_fingerprint = controller.get_info("fingerprint", None) + + if my_fingerprint: + my_status_entry = controller.get_network_status(my_fingerprint) + + if my_status_entry: + self.vals["tor/flags"] = my_status_entry.flags # Updates file descriptor usage and logs if the usage is high. If we don't # have a known limit or it's obviously faulty (being lower than our diff --git a/arm/util/tor_tools.py b/arm/util/tor_tools.py index 87033c9..4575616 100644 --- a/arm/util/tor_tools.py +++ b/arm/util/tor_tools.py @@ -454,17 +454,6 @@ class Controller: return self.controller.get_user(None) - def get_start_time(self): - """ - Provides the unix time for when the tor process first started. If this - can't be determined then this provides None. - """ - - try: - return system.get_start_time(self.controller.get_pid()) - except: - return None - def is_exiting_allowed(self, ip_address, port): """ Checks if the given destination can be exited to by this relay, returning

1 0

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

27 Jan '14

commit 0c8f30dfe2c51b05b666efaf0c70b94eb5cf0566 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 03:46:25 2014 +0000 Update translations for tails-misc --- km.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/km.po b/km.po index 90a5de1..3a1c61c 100644 --- a/km.po +++ b/km.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-10 12:23+0100\n" -"PO-Revision-Date: 2014-01-21 09:50+0000\n" +"PO-Revision-Date: 2014-01-27 03:30+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n"

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 623f994116f40973879c538eb6d4c9e52e7a3c9e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 03:46:18 2014 +0000 Update translations for mat-gui_completed --- km.po | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) diff --git a/km.po b/km.po new file mode 100644 index 0000000..6f91090 --- /dev/null +++ b/km.po @@ -0,0 +1,199 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# soksophea <sksophea(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-01-19 14:48+0000\n" +"PO-Revision-Date: 2014-01-27 03:41+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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: km\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: mat-gui:61 mat-gui:403 mat-gui:422 +msgid "Ready" +msgstr "រួចរាល់" + +#: mat-gui:128 +msgid "Choose files" +msgstr "ជ្រើសឯកសារ" + +#: mat-gui:135 +msgid "All files" +msgstr "ឯកសារទាំងអស់" + +#: mat-gui:142 +msgid "Supported files" +msgstr "ឯកសារដែលគាំទ្រ" + +#: mat-gui:157 +msgid "No metadata found" +msgstr "រកមិនឃើញទិន្នន័យមេតា" + +#: mat-gui:158 mat-gui:398 mat-gui:420 +msgid "Clean" +msgstr "សម្អាត" + +#: mat-gui:160 mat-gui:400 +msgid "Dirty" +msgstr "មិនល្អ" + +#: mat-gui:165 +#, python-format +msgid "%s's metadata" +msgstr "ទិន្នន័យមេតារបស់ %s" + +#: mat-gui:176 +msgid "Trash your meta, keep your data" +msgstr "លុបមេតា រក្សាទិន្នន័យរបស់អ្នក" + +#: mat-gui:181 +msgid "Website" +msgstr "តំបន់បណ្ដាញ" + +#: mat-gui:207 data/mat.ui:107 +msgid "Preferences" +msgstr "ចំណូលចិត្ត" + +#: mat-gui:220 +msgid "Reduce PDF quality" +msgstr "បន្ថយគុណភាព PDF" + +#: mat-gui:223 +msgid "Reduce the produced PDF size and quality" +msgstr "បន្ថយគុណភាព និងទំហំ PDF ដែលបានបង្កើត" + +#: mat-gui:226 +msgid "Add unsupported file to archives" +msgstr "បន្ថែមឯកសារដែលមិនគាំទ្រទៅកាន់ប័ណ្ណសារ" + +#: mat-gui:229 +msgid "Add non-supported (and so non-anonymised) file to output archive" +msgstr "បន្ថែមឯកសារដែលមិនគាំទ្រ (និងមិនមែនអនាមិក) ទៅកាន់ប័ណ្ណសារលទ្ធផល" + +#: mat-gui:268 +msgid "Unknown" +msgstr "មិនស្គាល់" + +#: mat-gui:310 +msgid "Not-supported" +msgstr "មិនគាំទ្រ" + +#: mat-gui:324 +msgid "Harmless fileformat" +msgstr "ទ្រង់ទ្រាយឯកសារដែលមិនគ្រោះថ្នាក់" + +#: mat-gui:326 +msgid "Fileformat not supported" +msgstr "ទ្រង់ទ្រាយឯកសារមិនគាំទ្រ" + +#: mat-gui:329 +msgid "These files can not be processed:" +msgstr "មិនអាចដំណើរការឯកសារទាំងនេះ៖" + +#: mat-gui:334 mat-gui:363 data/mat.ui:292 +msgid "Filename" +msgstr "ឈ្មោះឯកសារ" + +#: mat-gui:336 +msgid "Reason" +msgstr "មូលហេតុ" + +#: mat-gui:348 +msgid "Non-supported files in archive" +msgstr "ឯកសារដែលមិនគាំទ្រក្នុងប័ណ្ណសារ" + +#: mat-gui:349 data/mat.ui:227 +msgid "Scour" +msgstr "ល្អ" + +#: mat-gui:362 +msgid "Include" +msgstr "រួមបញ្ចូល" + +#: mat-gui:378 +#, python-format +msgid "MAT is not able to clean the following files, found in the %s archive" +msgstr "MAT មិនអាចសម្អាតឯកសារដូចខាងក្រោម ដែលបានរកឃើញនៅក្នុងប័ណ្ណសារ %s" + +#: mat-gui:394 +#, python-format +msgid "Checking %s" +msgstr "កំពុងពិនិត្យ %s" + +#: mat-gui:409 +#, python-format +msgid "Cleaning %s" +msgstr "កំពុងសម្អាត %s" + +#: data/mat.ui:63 +msgid "_File" +msgstr "ឯកសារ" + +#: data/mat.ui:99 +msgid "_Edit" +msgstr "កែសម្រួល" + +#: data/mat.ui:118 data/mat.ui:253 +msgid "Clear" +msgstr "សម្អាត" + +#: data/mat.ui:134 +msgid "_Process" +msgstr "ដំណើរការ" + +#: data/mat.ui:168 +msgid "_Help" +msgstr "ជំនួយ" + +#: data/mat.ui:214 +msgid "Add" +msgstr "បន្ថែម" + +#: data/mat.ui:240 +msgid "Check" +msgstr "ពិនិត្យ" + +#: data/mat.ui:309 +msgid "State" +msgstr "សភាព" + +#: data/mat.ui:347 data/mat.ui:499 +msgid "Metadata" +msgstr "ទិន្នន័យមេតា" + +#: data/mat.ui:376 +msgid "Name" +msgstr "ឈ្មោះ" + +#: data/mat.ui:390 +msgid "Content" +msgstr "មាតិកា" + +#: data/mat.ui:452 +msgid "Supported formats" +msgstr "ទ្រង់ទ្រាយដែលគាំទ្រ" + +#: data/mat.ui:486 +msgid "Support" +msgstr "គាំទ្រ" + +#: data/mat.ui:512 +msgid "Method" +msgstr "វិធីសាស្ត្រ" + +#: data/mat.ui:525 +msgid "Remaining" +msgstr "នៅសល់" + +#: data/mat.ui:560 +msgid "Fileformat" +msgstr "ទ្រង់ទ្រាយឯកសារ"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit f19f096594166e2d2772c4441228ccf1ced111fb Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 03:46:15 2014 +0000 Update translations for mat-gui --- km.po | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/km.po b/km.po index 3120ac4..6f91090 100644 --- a/km.po +++ b/km.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-01-27 03:15+0000\n" +"PO-Revision-Date: 2014-01-27 03:41+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" @@ -89,15 +89,15 @@ msgstr "មិនគាំទ្រ" #: mat-gui:324 msgid "Harmless fileformat" -msgstr "" +msgstr "ទ្រង់ទ្រាយឯកសារដែលមិនគ្រោះថ្នាក់" #: mat-gui:326 msgid "Fileformat not supported" -msgstr "" +msgstr "ទ្រង់ទ្រាយឯកសារមិនគាំទ្រ" #: mat-gui:329 msgid "These files can not be processed:" -msgstr "" +msgstr "មិនអាចដំណើរការឯកសារទាំងនេះ៖" #: mat-gui:334 mat-gui:363 data/mat.ui:292 msgid "Filename" @@ -105,24 +105,24 @@ msgstr "ឈ្មោះឯកសារ" #: mat-gui:336 msgid "Reason" -msgstr "" +msgstr "មូលហេតុ" #: mat-gui:348 msgid "Non-supported files in archive" -msgstr "" +msgstr "ឯកសារដែលមិនគាំទ្រក្នុងប័ណ្ណសារ" #: mat-gui:349 data/mat.ui:227 msgid "Scour" -msgstr "" +msgstr "ល្អ" #: mat-gui:362 msgid "Include" -msgstr "" +msgstr "រួមបញ្ចូល" #: mat-gui:378 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" -msgstr "" +msgstr "MAT មិនអាចសម្អាតឯកសារដូចខាងក្រោម ដែលបានរកឃើញនៅក្នុងប័ណ្ណសារ %s" #: mat-gui:394 #, python-format @@ -140,19 +140,19 @@ msgstr "ឯកសារ" #: data/mat.ui:99 msgid "_Edit" -msgstr "" +msgstr "កែសម្រួល" #: data/mat.ui:118 data/mat.ui:253 msgid "Clear" -msgstr "" +msgstr "សម្អាត" #: data/mat.ui:134 msgid "_Process" -msgstr "" +msgstr "ដំណើរការ" #: data/mat.ui:168 msgid "_Help" -msgstr "" +msgstr "ជំនួយ" #: data/mat.ui:214 msgid "Add" @@ -168,15 +168,15 @@ msgstr "សភាព" #: data/mat.ui:347 data/mat.ui:499 msgid "Metadata" -msgstr "" +msgstr "ទិន្នន័យមេតា" #: data/mat.ui:376 msgid "Name" -msgstr "Name" +msgstr "ឈ្មោះ" #: data/mat.ui:390 msgid "Content" -msgstr "" +msgstr "មាតិកា" #: data/mat.ui:452 msgid "Supported formats" @@ -184,16 +184,16 @@ msgstr "ទ្រង់ទ្រាយដែលគាំទ្រ" #: data/mat.ui:486 msgid "Support" -msgstr "" +msgstr "គាំទ្រ" #: data/mat.ui:512 msgid "Method" -msgstr "" +msgstr "វិធីសាស្ត្រ" #: data/mat.ui:525 msgid "Remaining" -msgstr "" +msgstr "នៅសល់" #: data/mat.ui:560 msgid "Fileformat" -msgstr "" +msgstr "ទ្រង់ទ្រាយឯកសារ"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 23b13676a582e8df883ebcb82ac236a3a5628eef Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 03:46:04 2014 +0000 Update translations for https_everywhere_completed --- km/https-everywhere.dtd | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/km/https-everywhere.dtd b/km/https-everywhere.dtd new file mode 100644 index 0000000..ee51d78 --- /dev/null +++ b/km/https-everywhere.dtd @@ -0,0 +1,47 @@ +<!ENTITY https-everywhere.about.title "អំពី HTTPS Everywhere"> +<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> +<!ENTITY https-everywhere.about.ext_description "អ៊ិនគ្រីបតំបន់បណ្ដាញ! ប្រើសុវត្ថិភាព HTTPS នៅលើបណ្ដាញជាច្រើន។"> +<!ENTITY https-everywhere.about.version "កំណែ"> +<!ENTITY https-everywhere.about.created_by "បានបង្កើតដោយ"> +<!ENTITY https-everywhere.about.librarians "Ruleset Librarians"> +<!ENTITY https-everywhere.about.thanks "អរគុណចំពោះ"> +<!ENTITY https-everywhere.about.contribute "ប្រសិនបើអ្នកចូលចិត្ត HTTPS Everywhere, អ្នកអាចពិចារណា"> +<!ENTITY https-everywhere.about.donate_tor "ឧបត្ថម្ភដល់ Tor"> +<!ENTITY https-everywhere.about.tor_lang_code "en"> +<!ENTITY https-everywhere.about.donate_eff "ឧបត្ថម្ភដល់ EFF"> + +<!ENTITY https-everywhere.menu.about "អំពី HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.observatory "ចំណូលចិត្ត SSL Observatory"> +<!ENTITY https-everywhere.menu.globalEnable "បើក HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.globalDisable "បិទ HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.showCounter "បង្ហាញ Counter"> + +<!ENTITY https-everywhere.prefs.title "ចំណូលចិត្ត HTTPS Everywhere"> +<!ENTITY https-everywhere.prefs.enable_all "បើកទាំងអស់"> +<!ENTITY https-everywhere.prefs.disable_all "បិទទាំងអស់"> +<!ENTITY https-everywhere.prefs.reset_defaults "កំណត់ទៅលំនាំដើមឡើងវិញ"> +<!ENTITY https-everywhere.prefs.search "ស្វែងរក"> +<!ENTITY https-everywhere.prefs.site "តំបន់បណ្ដាញ"> +<!ENTITY https-everywhere.prefs.notes "សម្គាល់"> +<!ENTITY https-everywhere.prefs.list_caption "បន្ទាត់ HTTPS redirection ណាមួយដែលគួរអនុវត្ត?"> +<!ENTITY https-everywhere.prefs.enabled "បានបើក"> +<!ENTITY https-everywhere.prefs.ruleset_howto "អ្នកអាចស្វែងរកពីរបៀបសរសេរ rulesets ផ្ទាល់ខ្លួនរបស់អ្នក (ដើម្បីបន្ថែមការគាំទ្រសម្រាប់តំបន់បណ្ដាញផ្សេងៗ)"> +<!ENTITY https-everywhere.prefs.here_link "ទីនេះ"> +<!ENTITY https-everywhere.prefs.toggle "បិទ/បើក"> +<!ENTITY https-everywhere.prefs.reset_default "កំណត់ឡើងវិញទៅលំនាំដើម"> +<!ENTITY https-everywhere.prefs.view_xml_source "មើលប្រភព XML"> + +<!ENTITY https-everywhere.source.downloading "ទាញយក"> +<!ENTITY https-everywhere.source.filename "ឈ្មោះឯកសារ"> +<!ENTITY https-everywhere.source.unable_to_download "មិនអាចទាញយកប្រភពបានទេ។"> + +<!ENTITY https-everywhere.popup.title "ការជួនដំណឹង HTTPS Everywhere 4.0development.11"> +<!ENTITY https-everywhere.popup.paragraph1 "អូ! អ្នកបានកំពុងប្រើកំណែ HTTPS Everywhere ថេរ, ប៉ុន្តែយើងអាចមានបញ្ហាចំពោះកំណែការអភិវឌ្ឍនដែលបានធ្វើឲ្យទាន់សម័យនៅក្នុងការចេញផ្សាយចុងក្រោយ។"> +<!ENTITY https-everywhere.popup.paragraph2 "តើអ្នកចង់ត្រឡប់ទៅក្រោយដើម្បីស្ថេរភាពឬ?"> +<!ENTITY https-everywhere.popup.paragraph3 "យើងចូលចិត្តវា ប្រសិនបើអ្នកបន្តប្រើការចេញផ្សាយការអភិវឌ្ឍនរបស់ពួកយើង ហើយជួយពួកយើងក្នុងការធ្វើឲ្យ HTTPS Everywhere ប្រសើរឡើយ! អ្នកអាចស្វែងរកកំហុសមួយចំនួននៅទីនេះ, ដែលអ្នកអាចរាយការណ៍ទៅ https-everywhere(a)eff.org. សូមទោសប្រសិនបើមានបញ្ហា, ហើយអរគុណអក្សរសម្រាប់ការប្រើប្រាស់ HTTPS Everywhere ។"> +<!ENTITY https-everywhere.popup.keep "រក្សាទុកខ្ញុំនៅលើកំណែការអភិវឌ្ឍន"> +<!ENTITY https-everywhere.popup.revert "ទាញយកកំណែថេរថ្មីបំផុត"> + +<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests"> +<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel"> +<!ENTITY https-everywhere.ruleset-tests.status_start_button "ចាប់ផ្ដើម">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 5a1b701b001dc4d16fec7877f1cc64612b8d2bb8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 03:46:00 2014 +0000 Update translations for https_everywhere --- km/https-everywhere.dtd | 4 ++-- km/https-everywhere.properties | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/km/https-everywhere.dtd b/km/https-everywhere.dtd index ce1456a..ee51d78 100644 --- a/km/https-everywhere.dtd +++ b/km/https-everywhere.dtd @@ -14,7 +14,7 @@ <!ENTITY https-everywhere.menu.observatory "ចំណូលចិត្ត SSL Observatory"> <!ENTITY https-everywhere.menu.globalEnable "បើក HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "បិទ HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.showCounter "Show Counter"> +<!ENTITY https-everywhere.menu.showCounter "បង្ហាញ Counter"> <!ENTITY https-everywhere.prefs.title "ចំណូលចិត្ត HTTPS Everywhere"> <!ENTITY https-everywhere.prefs.enable_all "បើកទាំងអស់"> @@ -23,7 +23,7 @@ <!ENTITY https-everywhere.prefs.search "ស្វែងរក"> <!ENTITY https-everywhere.prefs.site "តំបន់បណ្ដាញ"> <!ENTITY https-everywhere.prefs.notes "សម្គាល់"> -<!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?"> +<!ENTITY https-everywhere.prefs.list_caption "បន្ទាត់ HTTPS redirection ណាមួយដែលគួរអនុវត្ត?"> <!ENTITY https-everywhere.prefs.enabled "បានបើក"> <!ENTITY https-everywhere.prefs.ruleset_howto "អ្នកអាចស្វែងរកពីរបៀបសរសេរ rulesets ផ្ទាល់ខ្លួនរបស់អ្នក (ដើម្បីបន្ថែមការគាំទ្រសម្រាប់តំបន់បណ្ដាញផ្សេងៗ)"> <!ENTITY https-everywhere.prefs.here_link "ទីនេះ"> diff --git a/km/https-everywhere.properties b/km/https-everywhere.properties index c410b5a..3c46b88 100644 --- a/km/https-everywhere.properties +++ b/km/https-everywhere.properties @@ -1,8 +1,8 @@ https-everywhere.menu.globalEnable = បើក HTTPS Everywhere https-everywhere.menu.globalDisable = បិទ HTTPS Everywhere -# https-everywhere.menu.enableDisable = Enable / Disable Rules -# https-everywhere.menu.noRules = (No Rules for This Page) -# https-everywhere.menu.unknownRules = (Rules for This Page Unknown) -# https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar. -# https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values. +https-everywhere.menu.enableDisable = បើក / បិទ បន្ទាត់ +https-everywhere.menu.noRules = (គ្មានបន្ទាត់សម្រាប់ទំព័រនេះទេ) +https-everywhere.menu.unknownRules = (មិនស្គាល់បន្ទាត់សម្រាប់ទំព័រនេះ) +https-everywhere.toolbar.hint = HTTPS Everywhere គឺសកម្មឥឡូវនេះ។ អ្នកអាចបិទ/បើក វាលើតាមផ្នែក ដោយចុចរូបតំណាងរបារអាសយដ្ឋាន។ +https-everywhere.migration.notification0 = ដើម្បីប្រតិបត្តិការកែចាំបាច់, ធ្វើបច្ចុប្បន្នភាពការកំណត់ចំណូលចិត្ត HTTPS Everywhere rule របស់អ្នកឡើងវិញចំពោះតម្លៃលំនាំដើមរបស់វា។ # https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 8e9904fc78d3ed2c60d0e07b5ae2573d4fb0a53c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 03:45:18 2014 +0000 Update translations for vidalia_alpha --- km/vidalia_km.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/km/vidalia_km.po b/km/vidalia_km.po index d3adcd5..3779bad 100644 --- a/km/vidalia_km.po +++ b/km/vidalia_km.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2014-01-23 09:40+0000\n" +"PO-Revision-Date: 2014-01-27 03:41+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" @@ -400,7 +400,7 @@ msgstr "" msgctxt "Circuit" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "CircuitItem" msgid "<Path Empty>" @@ -1633,7 +1633,7 @@ msgstr "" msgctxt "LogEvent" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "LogTreeItem" msgid "Debug" @@ -1657,7 +1657,7 @@ msgstr "" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "MainWindow" msgid "Start Tor" @@ -2176,7 +2176,7 @@ msgstr "" msgctxt "MessageLog" msgid "Clear" -msgstr "" +msgstr "សម្អាត" msgctxt "MessageLog" msgid "Clear all messages from the Message Log (Ctrl+E)" @@ -2483,7 +2483,7 @@ msgstr "" msgctxt "NetViewer" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "NetViewer" msgid "Full Screen" @@ -2829,7 +2829,7 @@ msgstr "" msgctxt "RouterInfoDialog" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "RouterInfoDialog" msgid "Relay Details" @@ -3556,7 +3556,7 @@ msgstr "" msgctxt "Stream" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "TorControl" msgid ""

1 0