July 2013 - tor-commits - lists.torproject.org

[tor/master] tmp
by nickm＠torproject.org 19 Jul '13

19 Jul '13

commit 5977435629d6f075e63fdc6ea8f1587be69b6b76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 18 23:08:36 2013 -0400 tmp --- src/or/config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/config.c b/src/or/config.c index d5c5689..e4901f2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4691,6 +4691,7 @@ options_init_from_torrc(int argc, char **argv) } if (command == CMD_HASH_PASSWORD) { + cf_defaults = tor_strdup(""); cf = tor_strdup(""); } else { cf_defaults = load_torrc_from_disk(argc, argv, 1);

1 0

[tor/master] Fix for bug 9295: Don't crash when running --hash-password.
by nickm＠torproject.org 19 Jul '13

19 Jul '13

commit e9c24843119b74431f3ebd338dea58537b60795c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 18 23:15:46 2013 -0400 Fix for bug 9295: Don't crash when running --hash-password. Fix on 0.2.4.15-rc; I'm doing this branch against 0.2.3, since we're considering #9122 for an 0.2.3 backport, and if we do, we should merge this too. --- changes/bug9295 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug9295 b/changes/bug9295 new file mode 100644 index 0000000..2c11361 --- /dev/null +++ b/changes/bug9295 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Avoid a crash when using --hash-password. Fixes bug 9295; bugfix on + 0.2.4.15-rc. Found by stem integration tests. +

1 0

[tor/master] Merge remote-tracking branch 'public/bug9295_023' into maint-0.2.4
by nickm＠torproject.org 19 Jul '13

19 Jul '13

commit 17a960734aa7db59580e647bf67f6ecf587b54c9 Merge: c36bdbd e9c2484 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 18 23:17:05 2013 -0400 Merge remote-tracking branch 'public/bug9295_023' into maint-0.2.4 changes/bug9295 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 19 Jul '13

19 Jul '13

commit e1d3b444952d861e4fbe01b5a9b0bd2985892f41 Merge: f45e1fb 17a9607 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 18 23:17:57 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9295 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/maint-0.2.4] tmp
by nickm＠torproject.org 19 Jul '13

19 Jul '13

commit 5977435629d6f075e63fdc6ea8f1587be69b6b76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 18 23:08:36 2013 -0400 tmp --- src/or/config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/config.c b/src/or/config.c index d5c5689..e4901f2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4691,6 +4691,7 @@ options_init_from_torrc(int argc, char **argv) } if (command == CMD_HASH_PASSWORD) { + cf_defaults = tor_strdup(""); cf = tor_strdup(""); } else { cf_defaults = load_torrc_from_disk(argc, argv, 1);

1 0

[tor/maint-0.2.4] Fix for bug 9295: Don't crash when running --hash-password.
by nickm＠torproject.org 19 Jul '13

19 Jul '13

commit e9c24843119b74431f3ebd338dea58537b60795c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 18 23:15:46 2013 -0400 Fix for bug 9295: Don't crash when running --hash-password. Fix on 0.2.4.15-rc; I'm doing this branch against 0.2.3, since we're considering #9122 for an 0.2.3 backport, and if we do, we should merge this too. --- changes/bug9295 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug9295 b/changes/bug9295 new file mode 100644 index 0000000..2c11361 --- /dev/null +++ b/changes/bug9295 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Avoid a crash when using --hash-password. Fixes bug 9295; bugfix on + 0.2.4.15-rc. Found by stem integration tests. +

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug9295_023' into maint-0.2.4
by nickm＠torproject.org 19 Jul '13

19 Jul '13

commit 17a960734aa7db59580e647bf67f6ecf587b54c9 Merge: c36bdbd e9c2484 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 18 23:17:05 2013 -0400 Merge remote-tracking branch 'public/bug9295_023' into maint-0.2.4 changes/bug9295 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+)

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 18 Jul '13

18 Jul '13

commit d4477f9cc1644f62fc434a139d40db11c97dbd2f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 18 22:46:57 2013 +0000 Update translations for mat-gui_completed --- de.po | 239 ++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 118 insertions(+), 121 deletions(-) diff --git a/de.po b/de.po index 5632295..4690008 100644 --- a/de.po +++ b/de.po @@ -4,12 +4,13 @@ # # Translators: # K.N., 2012 +# Sacro <Scion(a)T-Online.de>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-01-05 20:03+0100\n" -"PO-Revision-Date: 2013-06-24 22:52+0000\n" +"POT-Creation-Date: 2013-07-01 19:26+0200\n" +"PO-Revision-Date: 2013-07-18 22:30+0000\n" "Last-Translator: Sacro <Scion(a)T-Online.de>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -18,161 +19,157 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mat-gui:95 mat-gui:563 mat-gui:579 +#: mat-gui:65 mat-gui:375 mat-gui:387 msgid "Ready" msgstr "Fertig" -#: mat-gui:107 -msgid "Add" -msgstr "Hinzufügen" +#: mat-gui:134 +msgid "Choose files" +msgstr "Dateien auswählen" -#: mat-gui:109 mat-gui:183 -msgid "Add files" -msgstr "Dateien hinzufügen" +#: mat-gui:141 +msgid "All files" +msgstr "Alle Dateien" -#: mat-gui:113 mat-gui:203 mat-gui:308 mat-gui:311 mat-gui:555 mat-gui:557 -#: mat-gui:573 mat-gui:575 -msgid "Clean" -msgstr "Säubern" +#: mat-gui:148 +msgid "Supported files" +msgstr "Unterstützte Dateien" -#: mat-gui:115 -msgid "Clean selected files" -msgstr "Ausgewählte Dateien säubern" +#: mat-gui:164 +msgid "No metadata found" +msgstr "Keine Metadaten gefunden" -#: mat-gui:119 mat-gui:214 -msgid "Check" -msgstr "Prüfen" - -#: mat-gui:121 -msgid "Check selected files for harmful meta" -msgstr "Ausgewählte Dateien auf unerwünschte Metadaten prüfen" +#: mat-gui:165 mat-gui:370 mat-gui:385 data/mat.ui:227 +msgid "Clean" +msgstr "Säubern" -#: mat-gui:125 mat-gui:185 -msgid "Quit" -msgstr "Beenden" +#: mat-gui:167 mat-gui:372 +msgid "Dirty" +msgstr "Verschmutzt" -#: mat-gui:137 -msgid "Path" -msgstr "Verzeichnis" +#: mat-gui:172 +#, python-format +msgid "%s's metadata" +msgstr "%s's Metadaten" -#: mat-gui:137 mat-gui:363 -msgid "Filename" -msgstr "Dateiname" +#: mat-gui:183 +msgid "Trash your meta, keep your data" +msgstr "Lösche deine Meta, behalte deinen Daten" -#: mat-gui:137 mat-gui:365 -msgid "Mimetype" -msgstr "Mimetyp" +#: mat-gui:188 +msgid "Website" +msgstr "Webseite" -#: mat-gui:137 -msgid "State" -msgstr "Status" +#: mat-gui:214 data/mat.ui:107 +msgid "Preferences" +msgstr "Einstellungen" -#: mat-gui:138 -msgid "Cleaned file" -msgstr "Gesäuberte Datei" +#: mat-gui:228 +msgid "Reduce PDF quality" +msgstr "Verringere PDF Qualität" -#: mat-gui:182 -msgid "Files" -msgstr "Dateien" +#: mat-gui:231 +msgid "Reduce the produced PDF size and quality" +msgstr "Verringere die Größe und Qualität der erstellten PDF" -#: mat-gui:188 -msgid "Edit" -msgstr "Bearbeiten" +#: mat-gui:234 +msgid "Add unsupported file to archives" +msgstr "Nicht unterstützte Dateien im Archiv hinzufügen" -#: mat-gui:189 -msgid "Clear the filelist" -msgstr "Gesamte Liste säubern" +#: mat-gui:238 +msgid "Add non-supported (and so non-anonymised) file to output archive" +msgstr "Nicht unterstützte (und somit nicht gesäuberte) Dateien dem Ausgabe Archiv hinzufügen" -#: mat-gui:192 mat-gui:447 -msgid "Preferences" -msgstr "Einstellungen" +#: mat-gui:283 +msgid "Unknown" +msgstr "Unbekannt" -#: mat-gui:195 -msgid "Process" -msgstr "Prozess" +#: mat-gui:330 +msgid "Not-supported" +msgstr "Nicht unterstützt" -#: mat-gui:218 -msgid "Help" -msgstr "Hilfe" +#: mat-gui:347 +msgid "Unknown mimetype" +msgstr "Unbekannter mimetyp" -#: mat-gui:219 mat-gui:395 -msgid "Supported formats" -msgstr "Unterstützte Formate" +#: mat-gui:354 data/mat.ui:291 +msgid "Filename" +msgstr "Dateiname" -#: mat-gui:220 -msgid "About" -msgstr "Über" +#: mat-gui:356 +msgid "Mimetype" +msgstr "Mimetyp" -#: mat-gui:241 -msgid "Choose files" -msgstr "Dateien auswählen" +#: mat-gui:366 +#, python-format +msgid "Checking %s" +msgstr "Prüfe %s" -#: mat-gui:248 -msgid "All files" -msgstr "Alle Dateien" +#: mat-gui:381 +#, python-format +msgid "Cleaning %s" +msgstr "Bereinige %s" -#: mat-gui:255 -msgid "Supported files" -msgstr "Unterstützte Dateien" +#: data/mat.ui:63 +msgid "_File" +msgstr "_Datei" -#: mat-gui:297 -msgid "unknow" -msgstr "unbekannt" +#: data/mat.ui:99 +msgid "_Edit" +msgstr "_Bearbeiten" -#: mat-gui:313 mat-gui:559 -msgid "Dirty" -msgstr "Verschmutzt" +#: data/mat.ui:118 data/mat.ui:253 +msgid "Clear" +msgstr "Löschen" -#: mat-gui:343 -msgid "Not-supported" -msgstr "Nicht unterstützt" +#: data/mat.ui:134 +msgid "_Process" +msgstr "_Abarbeiten" -#: mat-gui:381 -msgid "This software was coded during the GSoC 2011" -msgstr "Diese Software wurde während des GSoC 2011 erstellt." +#: data/mat.ui:168 +msgid "_Help" +msgstr "_Hilfe" -#: mat-gui:386 -msgid "Website" -msgstr "Webseite" +#: data/mat.ui:214 +msgid "Add" +msgstr "Hinzufügen" -#: mat-gui:461 -msgid "Force Clean" -msgstr "Säubern erzwingen" +#: data/mat.ui:240 +msgid "Check" +msgstr "Prüfen" -#: mat-gui:464 -msgid "Do not check if already clean before cleaning" -msgstr "Dateien vor dem Säubern nicht Prüfen" +#: data/mat.ui:308 +msgid "State" +msgstr "Status" -#: mat-gui:468 -msgid "Backup" -msgstr "Backup" +#: data/mat.ui:346 data/mat.ui:495 +msgid "Metadata" +msgstr "Metadaten" -#: mat-gui:471 -msgid "Keep a backup copy" -msgstr "Sicherungskopie behalten" +#: data/mat.ui:400 +msgid "Name" +msgstr "Name" -#: mat-gui:474 -msgid "Reduce PDF quality" -msgstr "Verringere PDF Qualität" +#: data/mat.ui:414 +msgid "Content" +msgstr "Inhalt" -#: mat-gui:477 -msgid "Reduce the produced PDF size and quality" -msgstr "Verringere die Größe und Qualität der erstellten PDF" +#: data/mat.ui:448 +msgid "Supported formats" +msgstr "Unterstützte Formate" -#: mat-gui:480 -msgid "Add unsupported file to archives" -msgstr "Nicht unterstützte Dateien im Archiv hinzufügen" +#: data/mat.ui:482 +msgid "Support" +msgstr "Support" -#: mat-gui:484 -msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Nicht unterstützte (und somit nicht gesäuberte) Dateien dem Ausgabe Archiv hinzufügen" +#: data/mat.ui:508 +msgid "Method" +msgstr "Methode" -#: mat-gui:554 -#, python-format -msgid "Checking %s..." -msgstr "Prüfe %s..." +#: data/mat.ui:521 +msgid "Remaining" +msgstr "Verbleibend" -#: mat-gui:572 -#, python-format -msgid "Cleaning %s..." -msgstr "Säubere %s..." +#: data/mat.ui:556 +msgid "Fileformat" +msgstr "Dateiformat"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 18 Jul '13

18 Jul '13

commit e7d01a864bfc97d923377ab79733f6b2922a56fe Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 18 22:46:54 2013 +0000 Update translations for mat-gui --- de.po | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/de.po b/de.po index 46302cf..4690008 100644 --- a/de.po +++ b/de.po @@ -4,13 +4,14 @@ # # Translators: # K.N., 2012 +# Sacro <Scion(a)T-Online.de>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-07-01 19:26+0200\n" -"PO-Revision-Date: 2013-07-18 09:51+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-07-18 22:30+0000\n" +"Last-Translator: Sacro <Scion(a)T-Online.de>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,7 +37,7 @@ msgstr "Unterstützte Dateien" #: mat-gui:164 msgid "No metadata found" -msgstr "" +msgstr "Keine Metadaten gefunden" #: mat-gui:165 mat-gui:370 mat-gui:385 data/mat.ui:227 msgid "Clean" @@ -49,11 +50,11 @@ msgstr "Verschmutzt" #: mat-gui:172 #, python-format msgid "%s's metadata" -msgstr "" +msgstr "%s's Metadaten" #: mat-gui:183 msgid "Trash your meta, keep your data" -msgstr "" +msgstr "Lösche deine Meta, behalte deinen Daten" #: mat-gui:188 msgid "Website" @@ -89,7 +90,7 @@ msgstr "Nicht unterstützt" #: mat-gui:347 msgid "Unknown mimetype" -msgstr "" +msgstr "Unbekannter mimetyp" #: mat-gui:354 data/mat.ui:291 msgid "Filename" @@ -102,20 +103,20 @@ msgstr "Mimetyp" #: mat-gui:366 #, python-format msgid "Checking %s" -msgstr "" +msgstr "Prüfe %s" #: mat-gui:381 #, python-format msgid "Cleaning %s" -msgstr "" +msgstr "Bereinige %s" #: data/mat.ui:63 msgid "_File" -msgstr "" +msgstr "_Datei" #: data/mat.ui:99 msgid "_Edit" -msgstr "" +msgstr "_Bearbeiten" #: data/mat.ui:118 data/mat.ui:253 msgid "Clear" @@ -123,11 +124,11 @@ msgstr "Löschen" #: data/mat.ui:134 msgid "_Process" -msgstr "" +msgstr "_Abarbeiten" #: data/mat.ui:168 msgid "_Help" -msgstr "" +msgstr "_Hilfe" #: data/mat.ui:214 msgid "Add" @@ -143,7 +144,7 @@ msgstr "Status" #: data/mat.ui:346 data/mat.ui:495 msgid "Metadata" -msgstr "" +msgstr "Metadaten" #: data/mat.ui:400 msgid "Name" @@ -151,7 +152,7 @@ msgstr "Name" #: data/mat.ui:414 msgid "Content" -msgstr "" +msgstr "Inhalt" #: data/mat.ui:448 msgid "Supported formats" @@ -159,16 +160,16 @@ msgstr "Unterstützte Formate" #: data/mat.ui:482 msgid "Support" -msgstr "" +msgstr "Support" #: data/mat.ui:508 msgid "Method" -msgstr "" +msgstr "Methode" #: data/mat.ui:521 msgid "Remaining" -msgstr "" +msgstr "Verbleibend" #: data/mat.ui:556 msgid "Fileformat" -msgstr "" +msgstr "Dateiformat"

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 18 Jul '13

18 Jul '13

commit f5dd929149226afb594ef69e4ec3194a3ae05257 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 18 22:45:21 2013 +0000 Update translations for orbot_completed --- values-de/strings.xml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/values-de/strings.xml b/values-de/strings.xml index f4d40dc..1b9581c 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -129,18 +129,22 @@ <string name="pref_entrance_node">Eingangs-Knoten</string> <string name="pref_entrance_node_summary">Fingerprints, Spitznamen, Länder und Adressen für den ersten Punkt</string> <string name="pref_entrance_node_dialog">Eingangs-Knoten angeben</string> -  - <string name="pref_proxy_title">Ausgehender Netzwerk-Proxy</string> + <string name="pref_proxy_title">Ausgehender Netzwerk-Proxy (Optional)</string> <string name="pref_proxy_type_title">Proxy-Typ</string> <string name="pref_proxy_type_summary">Protokoll zur Verwendung des Proxy Servers: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Proxy-Typ angeben</string> <string name="pref_proxy_host_title">Proxy-Server</string> - <string name="pref_proxy_host_summary">Hostname des Proxys-Servers</string> + <string name="pref_proxy_host_summary">Proxy-Server Hostname</string> <string name="pref_proxy_host_dialog">Proxy-Server angeben</string> <string name="pref_proxy_port_title">Proxy-Port</string> - <string name="pref_proxy_port_summary">Port des Proxy-Servers</string> + <string name="pref_proxy_port_summary">Proxy-Server Port</string> <string name="pref_proxy_port_dialog">Proxy-Port angeben</string> + <string name="pref_proxy_username_title">Ausgehender Proxy Username</string> + <string name="pref_proxy_username_summary">Proxy Username (Optional)</string> + <string name="pref_proxy_username_dialog">Proxy Username eingeben</string> + <string name="pref_proxy_password_title">Ausgehendes Proxy-Passwort</string> + <string name="pref_proxy_password_summary">Proxy-Passwort (Optional)</string> + <string name="pref_proxy_password_dialog">Proxy-Passwort eingeben</string> <string name="status">Status</string> <string name="setting_up_full_transparent_proxying_">Einstellen des voll transparenten Proxys...</string> <string name="setting_up_app_based_transparent_proxying_">Einstellen des Anwendungs-basierten transparenten Proxys...</string> @@ -221,4 +225,5 @@ <string name="wizard_locale_msg">Grundeinstellung beibehalten oder Sprache ändern</string> <string name="powered_by">ermöglicht durch das Tor Projekt</string> <string name="btn_save_settings">Einstellungen speichern</string> + <string name="no_internet_connection_tor">Keine Internetverbindung; Tor ist auf Standby...</string> </resources>

1 0