tor-commits September 2013

tor-commits@lists.torproject.org

17 participants
1101 discussions

[oonib/master] Remove dependency from Storm
by art＠torproject.org 11 Sep '13

11 Sep '13

commit fd52ee29a712f23b2e6c82922a27f848c0ffd98b Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Jun 8 11:48:32 2013 +0200 Remove dependency from Storm We are currently not using the db so there is no need for this. --- oonib/__init__.py | 17 ++----- oonib/db/__init__.py | 30 ------------ oonib/db/tables.py | 123 ----------------------------------------------- oonib/models.py | 129 -------------------------------------------------- oonib/oonibackend.py | 3 -- oonib/report/api.py | 55 +-------------------- requirements.txt | 2 - 7 files changed, 4 insertions(+), 355 deletions(-) diff --git a/oonib/__init__.py b/oonib/__init__.py index 30e446a..c374f53 100644 --- a/oonib/__init__.py +++ b/oonib/__init__.py @@ -6,18 +6,14 @@ In here we shall keep track of all variables and objects that should be instantiated only once and be common to pieces of GLBackend code. """ -__all__ = ['database', 'db_threadpool', 'Storage', 'randomStr'] -from twisted.python.threadpool import ThreadPool +__version__ = '0.9.1' + +__all__ = ['Storage', 'randomStr'] -from storm.uri import URI -from storm.twisted.transact import Transactor -from storm.databases.sqlite import SQLite import string import random -__version__ = '0.9.1' - class Storage(dict): """ A Storage object is like a dictionary except `obj.foo` can be used @@ -69,10 +65,3 @@ def randomStr(length, num=True): if num: chars += string.digits return ''.join(random.choice(chars) for x in range(length)) - -from oonib import config - -database = SQLite(URI(config.main.database_uri)) -db_threadpool = ThreadPool(0, config.main.db_threadpool_size) -db_threadpool.start() -transactor = Transactor(db_threadpool) diff --git a/oonib/db/__init__.py b/oonib/db/__init__.py deleted file mode 100644 index 2839747..0000000 --- a/oonib/db/__init__.py +++ /dev/null @@ -1,30 +0,0 @@ -__all__ = ['createTables', 'database', 'transactor'] - -from twisted.python.threadpool import ThreadPool -from twisted.internet.defer import inlineCallbacks, returnValue, Deferred - -from storm.locals import Store -from storm.uri import URI -from storm.databases.sqlite import SQLite - -from oonib import database, transactor -from oonib import log - -@inlineCallbacks -def createTables(): - """ - XXX this is to be refactored and only exists for experimentation. - """ - from oonib.db import models - for model_name in models.__all__: - try: - model = getattr(m, model_name) - except Exception, e: - log.err("Error in db initting") - log.err(e) - try: - log.debug("Creating %s" % model) - yield tables.runCreateTable(model, transactor, database) - except Exception, e: - log.debug(str(e)) - diff --git a/oonib/db/tables.py b/oonib/db/tables.py deleted file mode 100644 index 908a295..0000000 --- a/oonib/db/tables.py +++ /dev/null @@ -1,123 +0,0 @@ -# -*- encoding: utf-8 -*- -# -# :authors: Arturo Filastò -# :licence: see LICENSE - -from twisted.internet.defer import inlineCallbacks - -from storm.locals import Store -from storm.properties import PropertyColumn -from storm.exceptions import StormError - -from storm.variables import BoolVariable, DateTimeVariable, DateVariable -from storm.variables import DecimalVariable, EnumVariable -from storm.variables import FloatVariable, IntVariable, RawStrVariable -from storm.variables import UnicodeVariable, JSONVariable, PickleVariable - -def variableToSQLite(var_type): - """ - We take as input a storm.variable and we output the SQLite string it - represents. - """ - sqlite_type = "VARCHAR" - if isinstance(var_type, BoolVariable): - sqlite_type = "INTEGER" - elif isinstance(var_type, DateTimeVariable): - pass - sqlite_type = "" - elif isinstance(var_type, DateVariable): - pass - elif isinstance(var_type, DecimalVariable): - pass - elif isinstance(var_type, EnumVariable): - sqlite_type = "BLOB" - elif isinstance(var_type, FloatVariable): - sqlite_type = "REAL" - elif isinstance(var_type, IntVariable): - sqlite_type = "INTEGER" - elif isinstance(var_type, RawStrVariable): - sqlite_type = "BLOB" - elif isinstance(var_type, UnicodeVariable): - pass - elif isinstance(var_type, JSONVariable): - sqlite_type = "BLOB" - elif isinstance(var_type, PickleVariable): - sqlite_type = "BLOB" - return "%s" % sqlite_type - -def varsToParametersSQLite(variables, primary_keys): - """ - Takes as input a list of variables (convered to SQLite syntax and in the - form of strings) and primary_keys. - Outputs these variables converted into paramter syntax for SQLites. - - ex. - variables: ["var1 INTEGER", "var2 BOOL", "var3 INTEGER"] - primary_keys: ["var1"] - - output: "(var1 INTEGER, var2 BOOL, var3 INTEGER PRIMARY KEY (var1))" - """ - params = "(" - for var in variables[:-1]: - params += "%s %s, " % var - if len(primary_keys) > 0: - params += "%s %s, " % variables[-1] - params += "PRIMARY KEY (" - for key in primary_keys[:-1]: - params += "%s, " % key - params += "%s))" % primary_keys[-1] - else: - params += "%s %s)" % variables[-1] - return params - -def generateCreateQuery(model): - """ - This takes as input a Storm model and outputs the creation query for it. - """ - query = "CREATE TABLE "+ model.__storm_table__ + " " - - variables = [] - primary_keys = [] - - for attr in dir(model): - a = getattr(model, attr) - if isinstance(a, PropertyColumn): - var_stype = a.variable_factory() - var_type = variableToSQLite(var_stype) - name = a.name - variables.append((name, var_type)) - if a.primary: - primary_keys.append(name) - - query += varsToParametersSQLite(variables, primary_keys) - return query - -def createTable(model, transactor, database): - """ - Create the table for the specified model. - Specification of a transactor and database is useful in unittesting. - """ - if not transactor: - from oonib.db import transactor - if not database: - from oonib.db import database - store = Store(database) - create_query = generateCreateQuery(model) - try: - store.execute(create_query) - # XXX trap the specific error that is raised when the table exists - except StormError, e: - print "Failed to create table!" - print e - store.close() - store.commit() - store.close() - -@inlineCallbacks -def runCreateTable(model, transactor=None, database=None): - """ - Runs the table creation query wrapped in a transaction. - Transactions run in a separate thread. - """ - yield transactor.run(createTable, model, transactor, database) - diff --git a/oonib/models.py b/oonib/models.py deleted file mode 100644 index 60c0472..0000000 --- a/oonib/models.py +++ /dev/null @@ -1,129 +0,0 @@ -__all__ = ['Report', 'TestHelperTMP'] -from storm.twisted.transact import transact -from storm.locals import * - -from oonib import randomStr -from oonib import transactor - -def generateReportID(): - """ - Generates a report ID for usage in the database backed oonib collector. - - XXX note how this function is different from the one in report/api.py - """ - report_id = randomStr(100) - return report_id - -class OModel(object): - - transactor = transactor - - def getStore(self): - return Store(database) - - @transact - def create(self, query): - store = Store(database) - store.execute(query) - store.commit() - - @transact - def save(self): - store = getStore() - store.add(self) - store.commit() - -class Report(OModel): - """ - This represents an OONI Report as stored in the database. - - report_id: this is generated by the backend and is used by the client to - reference a previous report and append to it. It should be - treated as a shared secret between the probe and backend. - - software_name: this indicates the name of the software performing the test - (this will default to ooniprobe) - - software_version: this is the version number of the software running the - test. - - test_name: the name of the test on which the report is being created. - - test_version: indicates the version of the test - - progress: what is the current progress of the report. This allows clients - to report event partial reports up to a certain percentage of - progress. Once the report is complete progress will be 100. - - content: what is the content of the report. If the current progress is less - than 100 we should append to the YAML data structure that is - currently stored in such field. - - XXX this is currently not used. - """ - __storm_table__ = 'reports' - - createQuery = "CREATE TABLE " + __storm_table__ +\ - "(id INTEGER PRIMARY KEY, report_id VARCHAR, software_name VARCHAR,"\ - "software_version VARCHAR, test_name VARCHAR, test_version VARCHAR,"\ - "progress VARCHAR, content VARCHAR)" - - - id = Int(primary=True) - - report_id = Unicode() - - software_name = Unicode() - software_version = Unicode() - test_name = Unicode() - test_version = Unicode() - progress = Int() - - content = Unicode() - - @transact - def new(report): - store = self.getStore() - - print "Creating new report %s" % report - - report_id = generateReportID() - new_report = models.Report() - new_report.report_id = unicode(report_id) - - new_report.software_name = report['software_name'] - new_report.software_version = report['software_version'] - new_report.test_name = report['test_name'] - new_report.test_version = report['test_version'] - new_report.progress = report['progress'] - - if 'content' in report: - new_report.content = report['content'] - - print "Report: %s" % report - - store.add(new_report) - try: - store.commit() - except: - store.close() - - defer.returnValue({'backend_version': backend_version, 'report_id': - report_id}) - - -class TestHelperTMP(OModel): - __storm_table__ = 'testhelpertmp' - - createQuery = "CREATE TABLE " + __storm_table__ +\ - "(id INTEGER PRIMARY KEY, report_id VARCHAR, test_helper VARCHAR,"\ - " client_ip VARCHAR, creation_time VARCHAR)" - - id = Int(primary=True) - - report_id = Unicode() - - test_helper = Unicode() - client_ip = Unicode() - - creation_time = Date() diff --git a/oonib/oonibackend.py b/oonib/oonibackend.py index 0eef588..afd961f 100644 --- a/oonib/oonibackend.py +++ b/oonib/oonibackend.py @@ -20,7 +20,6 @@ from oonib.testhelpers import http_helpers, tcp_helpers from oonib import log -from oonib import db_threadpool from oonib import config if config.main.uid and config.main.gid: @@ -73,5 +72,3 @@ if config.helpers.http_return_request.port: int(config.helpers.http_return_request.port), http_helpers.HTTPReturnJSONHeadersHelper()) http_return_request_helper.setServiceParent(serviceCollection) - -reactor.addSystemEventTrigger('after', 'shutdown', db_threadpool.stop) diff --git a/oonib/report/api.py b/oonib/report/api.py index d01f47c..7747a1e 100644 --- a/oonib/report/api.py +++ b/oonib/report/api.py @@ -20,7 +20,7 @@ from cyclone import web from oonib import otime from oonib import randomStr -from oonib import models, config +from oonib import config from oonib.report import file_collector def parseUpdateReportRequest(request): @@ -45,59 +45,6 @@ def parseUpdateReportRequest(request): return parsed_request - -class NewReportHandlerDB(web.RequestHandler): - """ - Responsible for creating and updating reports via database. - XXX this is not yet fully implemented. - """ - - @web.asynchronous - @defer.inlineCallbacks - def post(self): - """ - Creates a new report with the input to the database. - XXX this is not yet implemented. - - * Request - - {'software_name': 'XXX', - 'software_version': 'XXX', - 'test_name': 'XXX', - 'test_version': 'XXX', - 'progress': 'XXX', - 'content': 'XXX' - } - - Optional: - 'test_helper': 'XXX' - 'client_ip': 'XXX' - - * Response - - {'backend_version': 'XXX', 'report_id': 'XXX'} - - """ - report_data = json.loads(self.request.body) - new_report = models.Report() - log.debug("Got this request %s" % report_data) - result = yield new_report.new(report_data) - self.write(result) - self.finish() - - def put(self): - """ - Update an already existing report with the database. - - XXX this is not yet implemented. - - {'report_id': 'XXX', - 'content': 'XXX' - } - """ - pass - - reportingBackendAPI = [ (r"/report/([a-zA-Z0-9_\-]+)/close", file_collector.CloseReportHandlerFile), (r"/report", file_collector.NewReportHandlerFile), diff --git a/requirements.txt b/requirements.txt index b0d7f75..08fd114 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,8 +32,6 @@ pygeoip>=0.2.6 ## https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/scapy-02-25-20… transaction>=1.4.1 -#https://pypi.python.org/packages/source/t/transaction/transaction-1.4.1.zip#md5=8db2680bc0f999219861a67b8f335a88#egg=transaction -storm>=0.19 #https://pypi.python.org/packages/source/s/storm/storm-0.19.tar.gz#md5=61d1ee4cd2a08639ab917e43fa2c9265#egg=storm txtorcon>=0.7 pyOpenSSL>=0.13

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 11 Sep '13

11 Sep '13

commit 55846e16f96056799bdda3b7de6439a279015a7b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 11 06:16:04 2013 +0000 Update translations for torbirdy_completed --- he/torbirdy.dtd | 28 ++++++++++++++++------------ he/torbirdy.properties | 2 +- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/he/torbirdy.dtd b/he/torbirdy.dtd index 470a48d..c1727b4 100644 --- a/he/torbirdy.dtd +++ b/he/torbirdy.dtd @@ -4,45 +4,49 @@ <!ENTITY torbirdy.accountprefs.minutes.label "בדוק אם התקבלו הודעות חדשות בכל"> <!ENTITY torbirdy.accountprefs.minutes.key "y"> <!ENTITY torbirdy.accountprefs.minutes.trail.label "דקות"> -<!ENTITY torbirdy.accountprefs.cancel.button "בטל"> +<!ENTITY torbirdy.accountprefs.cancel.button "ביטול"> <!ENTITY torbirdy.accountprefs.save.button "שמור"> <!ENTITY torbirdy.accountprefs.save.key "S"> <!ENTITY torbirdy.prefs.title "הגדדרות עבור TorBirdy"> <!ENTITY torbirdy.prefs.save.button "שמור"> <!ENTITY torbirdy.prefs.save.key "s"> -<!ENTITY torbirdy.prefs.cancel.button "בטל"> -<!ENTITY torbirdy.prefs.extra2.button "בדוק את ההגדרות"> +<!ENTITY torbirdy.prefs.cancel.button "ביטול"> +<!ENTITY torbirdy.prefs.extra1.button "חזרה לברירת מחדל"> +<!ENTITY torbirdy.prefs.extra1.key "d"> +<!ENTITY torbirdy.prefs.extra2.button "בחן הגדרות Proxy"> <!ENTITY torbirdy.prefs.extra2.key "g"> <!ENTITY torbirdy.prefs.proxy.label "הגדרות שרת פרוקסי"> <!ENTITY torbirdy.prefs.privacy.label "הגדרות פרטיות"> <!ENTITY torbirdy.prefs.enigmail.label "הגדרות אניגמייל"> <!ENTITY torbirdy.prefs.security.label "הגדרות אבטחה"> -<!ENTITY torbirdy.prefs.recommended.text "השתמש בהגדרות המומלצות עבור TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.text "השתמש בהגדרות המומלצות עבור TorBirdy ‏(Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "בחר שרות עבור אלמוניות"> <!ENTITY torbirdy.prefs.anonservice.key "a"> <!ENTITY torbirdy.prefs.customsettings.text "השתמש בהגדרות מותאמות אישית עבור שרת הפרוקסי"> <!ENTITY torbirdy.prefs.customsettings.key "c"> -<!ENTITY torbirdy.prefs.socks_host.label "כתובת שרת פרוקסי מסוג SOCKS:"> +<!ENTITY torbirdy.prefs.socks_host.label "כתובת שרת פרוקסי מסוג SOCKS: "> <!ENTITY torbirdy.prefs.socks_host.key "h"> <!ENTITY torbirdy.prefs.socks_port.label "פורט:"> <!ENTITY torbirdy.prefs.socks_port.key "p"> -<!ENTITY torbirdy.prefs.torification.label "שקוף Torification"> +<!ENTITY torbirdy.prefs.torification.label "שקוף Torification (אזהרה: נדרש transproxy מותאם או נתב Tor)"> <!ENTITY torbirdy.prefs.torification.key "t"> <!ENTITY torbirdy.prefs.global "גלובאלי"> <!ENTITY torbirdy.prefs.imap.label "אפשר תמיכה בדחיפת דואר על ידי השרת לחשבונות מסוג IMAP [ברירת מחדל: מנוטרל]"> -<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.imap.key "p"> <!ENTITY torbirdy.prefs.startup_folder.label "בעת הפעלה, בחר בתיקיית הדואר שנפתחה אחרונה [ברירת מחדל: מנוטרל]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "אל תקבע את איזור הזמן של Thunderbird לUTC [ברירת מחדל: קבע לUTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "בעת שליחת דואר מוצפן, אל תצרף את זהות המקבל. [ברירת המחדל: מופעל]"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "אל תשים את מזהי מפתח המקבל בתוך הודעות מוצפנות [ברירת מחדל: השם]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "וודא לפני שליחה כאשר אניגמייל מופעל [ברירת מחדל: אל תוודא]"> -<!ENTITY torbirdy.prefs.confirmemail.key "m"> +<!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "הפעל את אשף הגדרות הדואר של ת'אנדרבירד [ברירת מחדל: כבוי]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> +<!ENTITY torbirdy.prefs.automatic.label "בדוק עבור הודעות חדשות אוטומטית עבור כל החשבונות [ברירת מחדל: מנוטרלת]"> +<!ENTITY torbirdy.prefs.automatic.key "f"> <!ENTITY torbirdy.prefs.renegotiation.label "הרשה חיבורית לשרתים שאינם תומכים בSSL/TLS עם חידוש משא ומתן מאובטח [ברירת מחדל: לא להרשות]"> <!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "חשבון ספציפי"> @@ -52,8 +56,8 @@ <!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> <!ENTITY torbirdy.panel.usetor.label "תשתמש ב Tor Onion Router"> -<!ENTITY torbirdy.panel.usejondo.label "תשתמש ב JonDo (Premium)"> -<!ENTITY torbirdy.panel.usewhonix.label "השתמש בwhonix"> +<!ENTITY torbirdy.panel.usejondo.label "תשתמש ב JonDo ‏(Premium)"> +<!ENTITY torbirdy.panel.usewhonix.label "השתמש ב Whonix"> <!ENTITY torbirdy.panel.preferences.label "פתח עדיפויות TorBirdy"> <!ENTITY torbirdy.firstrun.title "הפעלה ראשונה של TorBirdy"> diff --git a/he/torbirdy.properties b/he/torbirdy.properties index 32c94f0..dea3b57 100644 --- a/he/torbirdy.properties +++ b/he/torbirdy.properties @@ -13,7 +13,7 @@ torbirdy.email.advanced=לתשומת לבך, לא מומלץ לשנות את ה torbirdy.email.advanced.nextwarning=הצג אזהרה זו בפעם הבאה torbirdy.email.advanced.title=הגדרות מתקדמות עבור TorBirdy -torbirdy.restart=על מנת שהעדפות איזור הזמן יבואו לידי ביטוי, אנא הפעל מחדש את Thunderbird +torbirdy.restart=עליך לאתחל את Thunderbird על מנת שהעדפת אזור הזמן תיכנס לתוקף. torbirdy.firstrun=טורבירדי מופעל כעת. \\n\\n על מנת להגן על האנונימיות שלך, טורבירדי טורבירדי תאכוף את ההגדרות שקבעה, על מנת שלא ישונו על ידיך או על ידי תוסף אחר. ישנן הגדרות שבאפשרותך לשנות והן מופיעות בעהדפות של טורבירדי. במידה וטורבירדי תוסר או תנוטרל, ההגדרות הנ"ל ישונו חזרה לערכי ברירת המחדל שלהם (לפני התקנת טורבירדי). \\n\\n אם הינך משתמש חדש, מומלץ שתקרא באתר של טורבירדי ותבין מה מטרת התוסף עבור המשתמשים. torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 11 Sep '13

11 Sep '13

commit b1569ff00ce494dd000eec7d7ddec054924dd4b2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 11 06:15:59 2013 +0000 Update translations for torbirdy --- he/torbirdy.dtd | 6 +++--- he/torbirdy.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/he/torbirdy.dtd b/he/torbirdy.dtd index 583140d..c1727b4 100644 --- a/he/torbirdy.dtd +++ b/he/torbirdy.dtd @@ -39,14 +39,14 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "אל תקבע את איזור הזמן של Thunderbird לUTC [ברירת מחדל: קבע לUTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "אל תשים את מזהי מפתח המקבל בתוך הודעות מוצפנות [ברירת מחדל: השם]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "וודא לפני שליחה כאשר אניגמייל מופעל [ברירת מחדל: אל תוודא]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "הפעל את אשף הגדרות הדואר של ת'אנדרבירד [ברירת מחדל: כבוי]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> -<!ENTITY torbirdy.prefs.automatic.label ""> -<!ENTITY torbirdy.prefs.automatic.key ""> +<!ENTITY torbirdy.prefs.automatic.label "בדוק עבור הודעות חדשות אוטומטית עבור כל החשבונות [ברירת מחדל: מנוטרלת]"> +<!ENTITY torbirdy.prefs.automatic.key "f"> <!ENTITY torbirdy.prefs.renegotiation.label "הרשה חיבורית לשרתים שאינם תומכים בSSL/TLS עם חידוש משא ומתן מאובטח [ברירת מחדל: לא להרשות]"> <!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "חשבון ספציפי"> diff --git a/he/torbirdy.properties b/he/torbirdy.properties index 9890a8d..dea3b57 100644 --- a/he/torbirdy.properties +++ b/he/torbirdy.properties @@ -13,7 +13,7 @@ torbirdy.email.advanced=לתשומת לבך, לא מומלץ לשנות את ה torbirdy.email.advanced.nextwarning=הצג אזהרה זו בפעם הבאה torbirdy.email.advanced.title=הגדרות מתקדמות עבור TorBirdy -# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect. +torbirdy.restart=עליך לאתחל את Thunderbird על מנת שהעדפת אזור הזמן תיכנס לתוקף. torbirdy.firstrun=טורבירדי מופעל כעת. \\n\\n על מנת להגן על האנונימיות שלך, טורבירדי טורבירדי תאכוף את ההגדרות שקבעה, על מנת שלא ישונו על ידיך או על ידי תוסף אחר. ישנן הגדרות שבאפשרותך לשנות והן מופיעות בעהדפות של טורבירדי. במידה וטורבירדי תוסר או תנוטרל, ההגדרות הנ"ל ישונו חזרה לערכי ברירת המחדל שלהם (לפני התקנת טורבירדי). \\n\\n אם הינך משתמש חדש, מומלץ שתקרא באתר של טורבירדי ותבין מה מטרת התוסף עבור המשתמשים. torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 11 Sep '13

11 Sep '13

commit 7c1f2f7be32d034eb6cdb5d0e36211c946892a6c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 11 04:16:10 2013 +0000 Update translations for torbirdy --- he/torbirdy.dtd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/he/torbirdy.dtd b/he/torbirdy.dtd index 2f9c0b6..583140d 100644 --- a/he/torbirdy.dtd +++ b/he/torbirdy.dtd @@ -4,33 +4,33 @@ <!ENTITY torbirdy.accountprefs.minutes.label "בדוק אם התקבלו הודעות חדשות בכל"> <!ENTITY torbirdy.accountprefs.minutes.key "y"> <!ENTITY torbirdy.accountprefs.minutes.trail.label "דקות"> -<!ENTITY torbirdy.accountprefs.cancel.button "בטל"> +<!ENTITY torbirdy.accountprefs.cancel.button "ביטול"> <!ENTITY torbirdy.accountprefs.save.button "שמור"> <!ENTITY torbirdy.accountprefs.save.key "S"> <!ENTITY torbirdy.prefs.title "הגדדרות עבור TorBirdy"> <!ENTITY torbirdy.prefs.save.button "שמור"> <!ENTITY torbirdy.prefs.save.key "s"> -<!ENTITY torbirdy.prefs.cancel.button "בטל"> +<!ENTITY torbirdy.prefs.cancel.button "ביטול"> <!ENTITY torbirdy.prefs.extra1.button "חזרה לברירת מחדל"> <!ENTITY torbirdy.prefs.extra1.key "d"> -<!ENTITY torbirdy.prefs.extra2.button ""> +<!ENTITY torbirdy.prefs.extra2.button "בחן הגדרות Proxy"> <!ENTITY torbirdy.prefs.extra2.key "g"> <!ENTITY torbirdy.prefs.proxy.label "הגדרות שרת פרוקסי"> <!ENTITY torbirdy.prefs.privacy.label "הגדרות פרטיות"> <!ENTITY torbirdy.prefs.enigmail.label "הגדרות אניגמייל"> <!ENTITY torbirdy.prefs.security.label "הגדרות אבטחה"> -<!ENTITY torbirdy.prefs.recommended.text "השתמש בהגדרות המומלצות עבור TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.text "השתמש בהגדרות המומלצות עבור TorBirdy ‏(Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "בחר שרות עבור אלמוניות"> <!ENTITY torbirdy.prefs.anonservice.key "a"> <!ENTITY torbirdy.prefs.customsettings.text "השתמש בהגדרות מותאמות אישית עבור שרת הפרוקסי"> <!ENTITY torbirdy.prefs.customsettings.key "c"> -<!ENTITY torbirdy.prefs.socks_host.label "כתובת שרת פרוקסי מסוג SOCKS:"> +<!ENTITY torbirdy.prefs.socks_host.label "כתובת שרת פרוקסי מסוג SOCKS: "> <!ENTITY torbirdy.prefs.socks_host.key "h"> <!ENTITY torbirdy.prefs.socks_port.label "פורט:"> <!ENTITY torbirdy.prefs.socks_port.key "p"> -<!ENTITY torbirdy.prefs.torification.label "שקוף Torification"> +<!ENTITY torbirdy.prefs.torification.label "שקוף Torification (אזהרה: נדרש transproxy מותאם או נתב Tor)"> <!ENTITY torbirdy.prefs.torification.key "t"> <!ENTITY torbirdy.prefs.global "גלובאלי"> <!ENTITY torbirdy.prefs.imap.label "אפשר תמיכה בדחיפת דואר על ידי השרת לחשבונות מסוג IMAP [ברירת מחדל: מנוטרל]"> @@ -56,8 +56,8 @@ <!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> <!ENTITY torbirdy.panel.usetor.label "תשתמש ב Tor Onion Router"> -<!ENTITY torbirdy.panel.usejondo.label "תשתמש ב JonDo (Premium)"> -<!ENTITY torbirdy.panel.usewhonix.label "השתמש בwhonix"> +<!ENTITY torbirdy.panel.usejondo.label "תשתמש ב JonDo ‏(Premium)"> +<!ENTITY torbirdy.panel.usewhonix.label "השתמש ב Whonix"> <!ENTITY torbirdy.panel.preferences.label "פתח עדיפויות TorBirdy"> <!ENTITY torbirdy.firstrun.title "הפעלה ראשונה של TorBirdy">

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 11 Sep '13

11 Sep '13

commit 318f213e52b609f98c422186d0732d6e5dc4e272 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 11 04:15:27 2013 +0000 Update translations for vidalia_alpha_completed --- he/vidalia_he.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/vidalia_he.po b/he/vidalia_he.po index 9a9ebee..dbeb541 100644 --- a/he/vidalia_he.po +++ b/he/vidalia_he.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-08-20 08:30+0000\n" +"PO-Revision-Date: 2013-09-11 04:00+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 11 Sep '13

11 Sep '13

commit a6872566a1035ae18b6d9db336664e853eb34aaa Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 11 04:15:24 2013 +0000 Update translations for vidalia_alpha --- he/vidalia_he.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/vidalia_he.po b/he/vidalia_he.po index 9a9ebee..dbeb541 100644 --- a/he/vidalia_he.po +++ b/he/vidalia_he.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-08-20 08:30+0000\n" +"PO-Revision-Date: 2013-09-11 04:00+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 11 Sep '13

11 Sep '13

commit fed0ca8aec81d1446f4c20d19e252a6bed49509b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 11 04:15:21 2013 +0000 Update translations for vidalia_completed --- he/qt_he.po | 2 +- he/vidalia_he.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/he/qt_he.po b/he/qt_he.po index c243a72..9c1f09c 100644 --- a/he/qt_he.po +++ b/he/qt_he.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-08-21 08:50+0000\n" +"PO-Revision-Date: 2013-09-11 04:00+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" "MIME-Version: 1.0\n" diff --git a/he/vidalia_he.po b/he/vidalia_he.po index 6644dd7..fbce67b 100644 --- a/he/vidalia_he.po +++ b/he/vidalia_he.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2013-08-20 08:30+0000\n" +"PO-Revision-Date: 2013-09-11 04:00+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 11 Sep '13

11 Sep '13

commit de1f076563bce86a8e51e01539d6c9fd577d7f9e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 11 04:15:14 2013 +0000 Update translations for vidalia --- he/qt_he.po | 2 +- he/vidalia_he.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/he/qt_he.po b/he/qt_he.po index c243a72..9c1f09c 100644 --- a/he/qt_he.po +++ b/he/qt_he.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-08-21 08:50+0000\n" +"PO-Revision-Date: 2013-09-11 04:00+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" "MIME-Version: 1.0\n" diff --git a/he/vidalia_he.po b/he/vidalia_he.po index 6644dd7..fbce67b 100644 --- a/he/vidalia_he.po +++ b/he/vidalia_he.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2013-08-20 08:30+0000\n" +"PO-Revision-Date: 2013-09-11 04:00+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 10 Sep '13

10 Sep '13

commit 58f464142ea39fe741f74375ca1180978ccc5498 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 10 20:16:12 2013 +0000 Update translations for torbirdy_completed --- hr_HR/torbirdy.dtd | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/hr_HR/torbirdy.dtd b/hr_HR/torbirdy.dtd new file mode 100644 index 0000000..f7aab6b --- /dev/null +++ b/hr_HR/torbirdy.dtd @@ -0,0 +1,63 @@ +<!ENTITY torbirdy.accountprefs.title "Konfiguracija računa"> +<!ENTITY torbirdy.accountprefs.startup.label "Provjerite za nove poruke pri startup-u"> +<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.minutes.label "Provjerite za nove poruke svakih"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "minuta"> +<!ENTITY torbirdy.accountprefs.cancel.button "Otkaži"> +<!ENTITY torbirdy.accountprefs.save.button "Spremi"> +<!ENTITY torbirdy.accountprefs.save.key "S"> + +<!ENTITY torbirdy.prefs.title "TorBirdy Preferencije"> +<!ENTITY torbirdy.prefs.save.button "Spremi"> +<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.cancel.button "Odustani"> +<!ENTITY torbirdy.prefs.extra1.button "Vrati uobičajeno"> +<!ENTITY torbirdy.prefs.extra1.key "d"> +<!ENTITY torbirdy.prefs.extra2.button "Isprobaj Proxy postavke"> +<!ENTITY torbirdy.prefs.extra2.key "n"> +<!ENTITY torbirdy.prefs.proxy.label "Postavke Proxya"> +<!ENTITY torbirdy.prefs.privacy.label "Podešavanja privatnosti"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail postavke"> +<!ENTITY torbirdy.prefs.security.label "Postavke sigurnosti"> +<!ENTITY torbirdy.prefs.recommended.text "Koristite preporučene proxy postavke za TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.key "r"> +<!ENTITY torbirdy.prefs.anonservice.text "Odaberite jedan od anonimizacija usluga"> +<!ENTITY torbirdy.prefs.anonservice.key "a"> +<!ENTITY torbirdy.prefs.customsettings.text "Koristi standardne proksi postavke"> +<!ENTITY torbirdy.prefs.customsettings.key "c"> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host:"> +<!ENTITY torbirdy.prefs.socks_host.key "h"> +<!ENTITY torbirdy.prefs.socks_port.label "Port:"> +<!ENTITY torbirdy.prefs.socks_port.key "p"> +<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (upozorenje: zahtijeva custom transproxy ili Tor ruter)"> +<!ENTITY torbirdy.prefs.torification.key "t"> +<!ENTITY torbirdy.prefs.global "Globalno"> +<!ENTITY torbirdy.prefs.imap.label "Omogući push e-mail podrške za IMAP račune [default: isključen]"> +<!ENTITY torbirdy.prefs.imap.key "p"> +<!ENTITY torbirdy.prefs.startup_folder.label "Odaberite posljednji pristupljen e-mail folder na startup [default: isključen, odaberite Local Folders]"> +<!ENTITY torbirdy.prefs.startup_folder.key "I"> +<!ENTITY torbirdy.prefs.timezone.label "Nemojte postavljati Thunderbird u vremensku zonu UTC [default: postavljen na UTC]"> +<!ENTITY torbirdy.prefs.timezone.key "z"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Ne stavljajte ključene ID primaoca u kodiranu poruka [default: put]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> +<!ENTITY torbirdy.prefs.confirmemail.label "Potvrdite prije slanja poruke dali je Enigmail omogućen [default: ne potvrđuj]"> +<!ENTITY torbirdy.prefs.confirmemail.key "c"> +<!ENTITY torbirdy.prefs.emailwizard.label "Omogućite automatski e-mail od Thunderbird čarobnjaka [default: isključen]"> +<!ENTITY torbirdy.prefs.emailwizard.key "w"> +<!ENTITY torbirdy.prefs.automatic.label "Provjerite za nove poruke se automatski za sve račune [default: isključen]"> +<!ENTITY torbirdy.prefs.automatic.key "f"> +<!ENTITY torbirdy.prefs.renegotiation.label "Dopustite veze sa serverima koji ne podržavaju SSL / TLS sa sigurnim reprograma [default: ne dozvoljavaju]"> +<!ENTITY torbirdy.prefs.renegotiation.key "r"> +<!ENTITY torbirdy.prefs.account_specific "Određeno za račun"> +<!ENTITY torbirdy.prefs.select_account.key "C"> +<!ENTITY torbirdy.prefs.select_account.label "Odaberi račun"> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver (a), da se koristi:"> +<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> + +<!ENTITY torbirdy.panel.usetor.label "Koristite Tor Onion Ruter"> +<!ENTITY torbirdy.panel.usejondo.label "Koristite JonDo (Premium) "> +<!ENTITY torbirdy.panel.usewhonix.label "Koristite Whonix"> +<!ENTITY torbirdy.panel.preferences.label "Otvorite TorBirdy preferencije"> + +<!ENTITY torbirdy.firstrun.title "TorBirdy prvo koristenje">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 10 Sep '13

10 Sep '13

commit 2e78b322b954995257515c9f4db93895528bb208 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 10 20:16:06 2013 +0000 Update translations for torbirdy --- hr_HR/torbirdy.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hr_HR/torbirdy.dtd b/hr_HR/torbirdy.dtd index f8027bd..f7aab6b 100644 --- a/hr_HR/torbirdy.dtd +++ b/hr_HR/torbirdy.dtd @@ -13,8 +13,8 @@ <!ENTITY torbirdy.prefs.save.key "s"> <!ENTITY torbirdy.prefs.cancel.button "Odustani"> <!ENTITY torbirdy.prefs.extra1.button "Vrati uobičajeno"> -<!ENTITY torbirdy.prefs.extra1.key ""> -<!ENTITY torbirdy.prefs.extra2.button ""> +<!ENTITY torbirdy.prefs.extra1.key "d"> +<!ENTITY torbirdy.prefs.extra2.button "Isprobaj Proxy postavke"> <!ENTITY torbirdy.prefs.extra2.key "n"> <!ENTITY torbirdy.prefs.proxy.label "Postavke Proxya"> <!ENTITY torbirdy.prefs.privacy.label "Podešavanja privatnosti"> @@ -22,12 +22,12 @@ <!ENTITY torbirdy.prefs.security.label "Postavke sigurnosti"> <!ENTITY torbirdy.prefs.recommended.text "Koristite preporučene proxy postavke za TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> -<!ENTITY torbirdy.prefs.anonservice.text ""> +<!ENTITY torbirdy.prefs.anonservice.text "Odaberite jedan od anonimizacija usluga"> <!ENTITY torbirdy.prefs.anonservice.key "a"> -<!ENTITY torbirdy.prefs.customsettings.text ""> -<!ENTITY torbirdy.prefs.customsettings.key ""> -<!ENTITY torbirdy.prefs.socks_host.label ""> -<!ENTITY torbirdy.prefs.socks_host.key ""> +<!ENTITY torbirdy.prefs.customsettings.text "Koristi standardne proksi postavke"> +<!ENTITY torbirdy.prefs.customsettings.key "c"> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host:"> +<!ENTITY torbirdy.prefs.socks_host.key "h"> <!ENTITY torbirdy.prefs.socks_port.label "Port:"> <!ENTITY torbirdy.prefs.socks_port.key "p"> <!ENTITY torbirdy.prefs.torification.label "Transparent Torification (upozorenje: zahtijeva custom transproxy ili Tor ruter)"> @@ -42,10 +42,10 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Ne stavljajte ključene ID primaoca u kodiranu poruka [default: put]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Potvrdite prije slanja poruke dali je Enigmail omogućen [default: ne potvrđuj]"> -<!ENTITY torbirdy.prefs.confirmemail.key ""> +<!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "Omogućite automatski e-mail od Thunderbird čarobnjaka [default: isključen]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> -<!ENTITY torbirdy.prefs.automatic.label ""> +<!ENTITY torbirdy.prefs.automatic.label "Provjerite za nove poruke se automatski za sve račune [default: isključen]"> <!ENTITY torbirdy.prefs.automatic.key "f"> <!ENTITY torbirdy.prefs.renegotiation.label "Dopustite veze sa serverima koji ne podržavaju SSL / TLS sa sigurnim reprograma [default: ne dozvoljavaju]"> <!ENTITY torbirdy.prefs.renegotiation.key "r"> @@ -53,7 +53,7 @@ <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Odaberi račun"> <!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver (a), da se koristi:"> -<!ENTITY torbirdy.prefs.enigmail.keyserver.key ""> +<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> <!ENTITY torbirdy.panel.usetor.label "Koristite Tor Onion Ruter"> <!ENTITY torbirdy.panel.usejondo.label "Koristite JonDo (Premium) ">

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2013