- tor-commits - lists.torproject.org

[tor/release-0.2.2] fold in recent changelog entries
by arma＠torproject.org 17 Apr '11

17 Apr '11

commit 4747c84241318f6bff8570a81a2f234560595b4e Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Apr 17 14:59:29 2011 -0400 fold in recent changelog entries --- ChangeLog | 5 +++++ changes/osx_forgotten_compilefix | 4 ---- changes/win_tmp_dir | 4 ---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce68ccb..ca782b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,8 @@ Changes in version 0.2.2.25-alpha - 2011-04-?? - When a client finds that an origin circuit has run out of 16-bit stream IDs, we now mark it as unusable for new streams. Previously, we would try to close the entire circuit. Bugfix on Tor 0.0.6. + - Added a forgotten cast that caused a compile warning on OS X + 10.6. Bugfix on 0.2.2.24-alpha. o Minor features: - Send END_STREAM_REASON_NOROUTE in response to EHOSTUNREACH errors. @@ -32,6 +34,9 @@ Changes in version 0.2.2.25-alpha - 2011-04-?? in three places, and we never adjusted the known/unknown skew values. This is still something we might want to do someday, but if we do, we'll want to do it differently. + - Use GetTempDir to find the proper temporary directory location on + Windows when generating temporary files for the unit tests. Patch + by Gisle Vanem. Changes in version 0.2.2.24-alpha - 2011-04-08 diff --git a/changes/osx_forgotten_compilefix b/changes/osx_forgotten_compilefix deleted file mode 100644 index 754e09c..0000000 --- a/changes/osx_forgotten_compilefix +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Added a forgotten cast that caused a compile warning on OS X 10.6. Bugfix - on 0.2.2.24-alpha. - diff --git a/changes/win_tmp_dir b/changes/win_tmp_dir deleted file mode 100644 index 13f6e7f..0000000 --- a/changes/win_tmp_dir +++ /dev/null @@ -1,4 +0,0 @@ - o Unit tests: - - Use GetTempDir to find the proper temporary directory location on - Windows when generating temporary files for the unit tests. Patch - by Gisle Vanem.

1 0

r24650: {website} updated navigation.wmi from Sacro (website/trunk/include/de)
by Runa Sandvik 17 Apr '11

17 Apr '11

Author: runa Date: 2011-04-17 17:25:12 +0000 (Sun, 17 Apr 2011) New Revision: 24650 Modified: website/trunk/include/de/navigation.wmi Log: updated navigation.wmi from Sacro Modified: website/trunk/include/de/navigation.wmi =================================================================== --- website/trunk/include/de/navigation.wmi 2011-04-17 16:16:31 UTC (rev 24649) +++ website/trunk/include/de/navigation.wmi 2011-04-17 17:25:12 UTC (rev 24650) @@ -1,4 +1,4 @@ -#!/usr/bin/wml +#!/usr/bin/wml ## translation metadata # Revision: $Revision$ @@ -8,7 +8,7 @@ # path link text my @navigation = ( 'index' , 'Startseite', - 'about/overview' , '�ber Tor', + 'about/overview' , 'Über Tor', 'docs/documentation' , 'Dokumentation', 'projects/projects' , 'Projekte', 'press/press' , 'Presse', @@ -18,8 +18,9 @@ my @calltoaction = ( 'download/download' , 'Download', 'donate/donate' , 'Spenden', - 'getinvolved/volunteer' , 'Sich Engagieren', + 'getinvolved/volunteer' , 'Engagiere Dich', ); :> +

1 0

r24649: {projects} committing strings updates for 1.0.5... (in projects/android/trunk/Orbot/res: values values-ar values-ca values-de values-es values-fa values-mk values-nb values-nl values-pl values-pt values-ru values-sv values-zh xml)
by Nathan Freitas 17 Apr '11

17 Apr '11

Author: n8fr8 Date: 2011-04-17 16:16:31 +0000 (Sun, 17 Apr 2011) New Revision: 24649 Modified: projects/android/trunk/Orbot/res/values-ar/strings.xml projects/android/trunk/Orbot/res/values-ca/strings.xml projects/android/trunk/Orbot/res/values-de/strings.xml projects/android/trunk/Orbot/res/values-es/strings.xml projects/android/trunk/Orbot/res/values-fa/strings.xml projects/android/trunk/Orbot/res/values-mk/strings.xml projects/android/trunk/Orbot/res/values-nb/strings.xml projects/android/trunk/Orbot/res/values-nl/strings.xml projects/android/trunk/Orbot/res/values-pl/strings.xml projects/android/trunk/Orbot/res/values-pt/strings.xml projects/android/trunk/Orbot/res/values-ru/strings.xml projects/android/trunk/Orbot/res/values-sv/strings.xml projects/android/trunk/Orbot/res/values-zh/strings.xml projects/android/trunk/Orbot/res/values/strings.xml projects/android/trunk/Orbot/res/xml/preferences.xml Log: committing strings updates for 1.0.5... Modified: projects/android/trunk/Orbot/res/values/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values/strings.xml 2011-04-17 16:15:56 UTC (rev 24648) +++ projects/android/trunk/Orbot/res/values/strings.xml 2011-04-17 16:16:31 UTC (rev 24649) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.4</string> + <string name="app_version">1.0.5-dev</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> @@ -30,7 +30,10 @@ <string name="menu_start">Start</string> <string name="menu_stop">Stop</string> +<string name="menu_about">About</string> +<string name="menu_wizard">Wizard</string> + <string name="button_help">Help</string> <string name="button_close">Close</string> <string name="button_about">About</string> @@ -41,7 +44,7 @@ <string name="menu_verify">Check</string> <string name="menu_exit">Exit</string> <string name="powered_by">powered by the Tor Project</string> -<string name="press_to_start">- press to start -</string> +<string name="press_to_start">- long press to start -</string> <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string> <string name="pref_trans_proxy_title">Transparent Proxying</string> @@ -57,6 +60,9 @@ <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> +<string name="pref_has_root">Request Root Access</string> +<string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="status_install_success">Tor binaries successfully installed!</string> <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-ar/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-ar/strings.xml 2011-04-17 16:15:56 UTC (rev 24648) +++ projects/android/trunk/Orbot/res/values-ar/strings.xml 2011-04-17 16:16:31 UTC (rev 24649) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">اوربوت (Orbot)</string> - <string name="app_version">1.0.4</string> + <string name="app_version">1.0.5-dev</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> @@ -29,6 +29,8 @@ <string name="menu_apps">تطبيقات</string> <string name="menu_start">بدء</string> <string name="menu_stop">إيقاف</string> +<string name="menu_about">About</string> +<string name="menu_wizard">Wizard</string> <string name="button_help">مساعدة</string> @@ -57,6 +59,9 @@ <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> +<string name="pref_has_root">Request Root Access</string> +<string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="status_install_success">تم تثبيت ثنائيات تور بنجاح!</string> <string name="status_install_fail">غير قادر على تثبيت ملفات ثنائيات تور. يرجى التحقق من السجل وإعلامنا على البريد الإلكتروني tor-assistants(a)torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-ca/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-ca/strings.xml 2011-04-17 16:15:56 UTC (rev 24648) +++ projects/android/trunk/Orbot/res/values-ca/strings.xml 2011-04-17 16:16:31 UTC (rev 24649) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.4</string> + <string name="app_version">1.0.5-dev</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> @@ -29,6 +29,8 @@ <string name="menu_apps">Aplicacions</string> <string name="menu_start">Inici</string> <string name="menu_stop">Atura</string> +<string name="menu_about">About</string> +<string name="menu_wizard">Wizard</string> <string name="button_help">Ajut</string> @@ -57,6 +59,9 @@ <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> +<string name="pref_has_root">Request Root Access</string> +<string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="status_install_success">Binaris de Tor instal·lats correctament!</string> <string name="status_install_fail">Els fitxers binaris de Tor no s\'han pogut instalar. Per favor, comprova el registre i notifica-ho a tor-assistants(a)torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-de/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-de/strings.xml 2011-04-17 16:15:56 UTC (rev 24648) +++ projects/android/trunk/Orbot/res/values-de/strings.xml 2011-04-17 16:16:31 UTC (rev 24649) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.4</string> + <string name="app_version">1.0.5-dev</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> @@ -29,6 +29,8 @@ <string name="menu_apps">Apps</string> <string name="menu_start">Start</string> <string name="menu_stop">Stop</string> +<string name="menu_about">About</string> +<string name="menu_wizard">Wizard</string> <string name="button_help">Hilfe</string> @@ -57,6 +59,9 @@ <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> +<string name="pref_has_root">Request Root Access</string> +<string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="status_install_success">Die Tor-Pakete wurden erfolgreich installiert!</string> <string name="status_install_fail">Die Tor-Pakete konnten nicht erfolgreich installiert werden. Bitte prüfen Sie das Logfile und wenden Sie sich an tor-assistants(a)torproject.org.</string> Modified: projects/android/trunk/Orbot/res/values-es/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-es/strings.xml 2011-04-17 16:15:56 UTC (rev 24648) +++ projects/android/trunk/Orbot/res/values-es/strings.xml 2011-04-17 16:16:31 UTC (rev 24649) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.4</string> + <string name="app_version">1.0.5-dev</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> @@ -29,6 +29,8 @@ <string name="menu_apps">Aplicaciones</string> <string name="menu_start">Iniciar</string> <string name="menu_stop">Detener</string> +<string name="menu_about">About</string> +<string name="menu_wizard">Wizard</string> <string name="button_help">Ayuda</string> @@ -57,6 +59,9 @@ <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> +<string name="pref_has_root">Request Root Access</string> +<string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="status_install_success">¡Binarios de Tor instalados con éxito!</string> <string name="status_install_fail">Los archivos binarios de Tor no se han podido instalar. Por favor, verifique el Historial y notifique a: tor-assistants(a)torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-fa/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-fa/strings.xml 2011-04-17 16:15:56 UTC (rev 24648) +++ projects/android/trunk/Orbot/res/values-fa/strings.xml 2011-04-17 16:16:31 UTC (rev 24649) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">اوربات</string> - <string name="app_version">1.0.4</string> + <string name="app_version">1.0.5-dev</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> @@ -30,6 +30,8 @@ <string name="menu_start">آغاز</string> <string name="menu_stop">ایست</string> +<string name="menu_about">About</string> +<string name="menu_wizard">Wizard</string> <string name="button_help">کمک</string> <string name="button_close">بسته</string> @@ -57,6 +59,9 @@ <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> +<string name="pref_has_root">Request Root Access</string> +<string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="status_install_success">دوتایی های Tor با موفقیت نصب شدند!</string> <string name="status_install_fail">نصب فایل های دوتایی Tor ممکن نبود. لطفن قطعه را وارسی کنید و به tor-assistance(a)torproject.org اطلاع دهید.</string> Modified: projects/android/trunk/Orbot/res/values-mk/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-mk/strings.xml 2011-04-17 16:15:56 UTC (rev 24648) +++ projects/android/trunk/Orbot/res/values-mk/strings.xml 2011-04-17 16:16:31 UTC (rev 24649) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Орбот</string> - <string name="app_version">1.0.4</string> + <string name="app_version">1.0.5-dev</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> @@ -29,6 +29,8 @@ <string name="menu_apps">Апликации</string> <string name="menu_start">Вклучи</string> <string name="menu_stop">Исклучи</string> +<string name="menu_about">About</string> +<string name="menu_wizard">Wizard</string> <string name="button_help">Помош</string> @@ -57,6 +59,9 @@ <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> +<string name="pref_has_root">Request Root Access</string> +<string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="status_install_success">Извршните програми за Тор се успешно инсталирани!</string> <string name="status_install_fail">Извршните фајлови на Тор не можеа да се инсталираат. Видете го логот и известете нè за ова на tor-assistants(a)torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-nb/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-nb/strings.xml 2011-04-17 16:15:56 UTC (rev 24648) +++ projects/android/trunk/Orbot/res/values-nb/strings.xml 2011-04-17 16:16:31 UTC (rev 24649) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.4</string> + <string name="app_version">1.0.5-dev</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> @@ -30,8 +30,14 @@ <string name="menu_start">Start</string> <string name="menu_stop">Stopp</string> +<string name="menu_about">About</string> +<string name="menu_wizard">Wizard</string> +<string name="pref_has_root">Request Root Access</string> +<string name="pref_has_root_summary">>Request root access for transparent proxying</string> + + <string name="button_help">Hjelp</string> <string name="button_close">Avslutt</string> <string name="button_about">Om</string> Modified: projects/android/trunk/Orbot/res/values-nl/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-nl/strings.xml 2011-04-17 16:15:56 UTC (rev 24648) +++ projects/android/trunk/Orbot/res/values-nl/strings.xml 2011-04-17 16:16:31 UTC (rev 24649) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.4</string> + <string name="app_version">1.0.5-dev</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> @@ -30,6 +30,8 @@ <string name="menu_start">Start</string> <string name="menu_stop">Stop</string> +<string name="menu_about">About</string> +<string name="menu_wizard">Wizard</string> <string name="button_help">Hulp</string> <string name="button_close">Afsluiten</string> @@ -57,6 +59,9 @@ <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> +<string name="pref_has_root">Request Root Access</string> +<string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="status_install_success">Tor\'s binaire bestanden succesvol geïnstalleerd</string> <string name="status_install_fail">The binaire bestanden konden niet worden geïnstalleerd. Gelieve het log te raadplegen en tor-assistants(a)torproject.org op de hoogte te stellen</string> Modified: projects/android/trunk/Orbot/res/values-pl/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-pl/strings.xml 2011-04-17 16:15:56 UTC (rev 24648) +++ projects/android/trunk/Orbot/res/values-pl/strings.xml 2011-04-17 16:16:31 UTC (rev 24649) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.4</string> + <string name="app_version">1.0.5-dev</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> @@ -30,6 +30,8 @@ <string name="menu_start">Start</string> <string name="menu_stop">Stop</string> +<string name="menu_about">About</string> +<string name="menu_wizard">Wizard</string> <string name="button_help">Pomoc</string> <string name="button_close">Zamknij</string> @@ -57,6 +59,9 @@ <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> +<string name="pref_has_root">Request Root Access</string> +<string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="status_install_success">Binarki Tora pomyslnie zainstalowane!</string> <string name="status_install_fail">Nie można zainstalować plików binarnych Tora. Zajrzyj do dziennika i powiadom tor-assistants(a)torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-pt/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-pt/strings.xml 2011-04-17 16:15:56 UTC (rev 24648) +++ projects/android/trunk/Orbot/res/values-pt/strings.xml 2011-04-17 16:16:31 UTC (rev 24649) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.4</string> + <string name="app_version">1.0.5-dev</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> <string name="secure_default_web_url">https://check.torproject.org</string> @@ -29,6 +29,8 @@ <string name="menu_start">Iniciar</string> <string name="menu_stop">Parar</string> +<string name="menu_about">About</string> +<string name="menu_wizard">Wizard</string> <string name="button_help">Ajuda</string> @@ -36,6 +38,9 @@ <string name="button_about">Sobre</string> +<string name="pref_has_root">Request Root Access</string> +<string name="pref_has_root_summary">>Request root access for transparent proxying</string> + <string name="menu_verify">Check</string> <string name="menu_exit">Exit</string> </resources> Modified: projects/android/trunk/Orbot/res/values-ru/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-ru/strings.xml 2011-04-17 16:15:56 UTC (rev 24648) +++ projects/android/trunk/Orbot/res/values-ru/strings.xml 2011-04-17 16:16:31 UTC (rev 24649) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.4</string> + <string name="app_version">1.0.5-dev</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> @@ -30,6 +30,8 @@ <string name="menu_start">Запустить</string> <string name="menu_stop">Остановить</string> +<string name="menu_about">About</string> +<string name="menu_wizard">Wizard</string> <string name="button_help">Справка</string> <string name="button_close">Закрыть</string> @@ -57,6 +59,9 @@ <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> +<string name="pref_has_root">Request Root Access</string> +<string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="status_install_success">Программа Tor успешно установлена!</string> <string name="status_install_fail">Не удалось установить программу Tor. Пожалуйста, проверьте системный журнал и сообщите нам: tor-assistants(a)torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-sv/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-sv/strings.xml 2011-04-17 16:15:56 UTC (rev 24648) +++ projects/android/trunk/Orbot/res/values-sv/strings.xml 2011-04-17 16:16:31 UTC (rev 24649) @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.4</string> + <string name="app_version">1.0.5-dev</string> + <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> <string name="secure_default_web_url">https://check.torproject.org</string> @@ -29,8 +30,13 @@ <string name="menu_start">Start</string> <string name="menu_stop">Stopp</string> +<string name="menu_about">About</string> +<string name="menu_wizard">Wizard</string> +<string name="pref_has_root">Request Root Access</string> +<string name="pref_has_root_summary">>Request root access for transparent proxying</string> + <string name="button_help">Hjälp</string> <string name="button_close">Stäng</string> <string name="button_about">Om</string> Modified: projects/android/trunk/Orbot/res/values-zh/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-zh/strings.xml 2011-04-17 16:15:56 UTC (rev 24648) +++ projects/android/trunk/Orbot/res/values-zh/strings.xml 2011-04-17 16:16:31 UTC (rev 24649) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.4</string> + <string name="app_version">1.0.5-dev</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> @@ -30,6 +30,8 @@ <string name="menu_start">启动</string> <string name="menu_stop">停止</string> +<string name="menu_about">About</string> +<string name="menu_wizard">Wizard</string> <string name="button_help">帮助</string> <string name="button_close">关闭</string> @@ -57,6 +59,9 @@ <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> +<string name="pref_has_root">Request Root Access</string> +<string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="status_install_success">Tor 二进制程序安装成功！</string> <string name="status_install_fail">Tor 二进制程序无法安装。请查看日志 tor-assistants(a)torproject.org</string> Modified: projects/android/trunk/Orbot/res/xml/preferences.xml =================================================================== --- projects/android/trunk/Orbot/res/xml/preferences.xml 2011-04-17 16:15:56 UTC (rev 24648) +++ projects/android/trunk/Orbot/res/xml/preferences.xml 2011-04-17 16:16:31 UTC (rev 24649) @@ -7,6 +7,13 @@ android:title="@string/pref_start_boot_title" android:summary="@string/pref_start_boot_summary" android:enabled="true"/> + +<CheckBoxPreference +android:defaultValue="false" +android:key="has_root" +android:title="@string/pref_has_root" +android:summary="@string/pref_has_root_summary" +android:enabled="true"/> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_trans_proxy_group"> @@ -33,19 +40,6 @@ android:enabled="true"/> -<CheckBoxPreference -android:defaultValue="false" -android:key="pref_transparent_port_fallback" -android:summary="@string/pref_transparent_port_fallback_summary" -android:enabled="true" -android:title="@string/pref_transparent_port_fallback_title"/> - -<EditTextPreference android:key="pref_port_list" -android:defaultValue="80,443,8080,8888,8443" -android:title="@string/pref_transparent_port_title" -android:summary="@string/pref_transparent_port_summary" -android:dialogTitle="@string/pref_transparent_port_dialog" -/> </PreferenceCategory> @@ -111,9 +105,34 @@ /> </PreferenceCategory> -<PreferenceCategory android:title="@string/pref_hs_group"><CheckBoxPreference android:title="Enable Hidden Services" android:summary="run servers accessible via the Tor network" android:key="pref_hs_enable"></CheckBoxPreference> +<PreferenceCategory android:title="@string/pref_hs_group"> +<CheckBoxPreference android:title="Enable Hidden Services" android:summary="run servers accessible via the Tor network" android:key="pref_hs_enable"></CheckBoxPreference> <EditTextPreference android:summary="enter localhost ports for hidden services" android:title="Hidden Service Ports" android:enabled="false" android:key="pref_hs_ports"></EditTextPreference> <EditTextPreference android:key="pref_hs_hostname" android:summary="the addressable name for your hidden service (generated automatically)" android:title=".Onion Hostname"></EditTextPreference> </PreferenceCategory> + +<PreferenceCategory android:title="Debug"> +<CheckBoxPreference +android:key="pref_enable_logging" +android:defaultValue="false" +android:title="Debug Log" +android:summary="enable debug log to output (must use adb or aLogCat to view)" +android:enabled="true"></CheckBoxPreference> + + +<CheckBoxPreference +android:defaultValue="false" +android:key="pref_transparent_port_fallback" +android:summary="@string/pref_transparent_port_fallback_summary" +android:enabled="true" +android:title="@string/pref_transparent_port_fallback_title"/> + +<EditTextPreference android:key="pref_port_list" +android:defaultValue="80,443,8080,8888,8443" +android:title="@string/pref_transparent_port_title" +android:summary="@string/pref_transparent_port_summary" +android:dialogTitle="@string/pref_transparent_port_dialog" +/> +</PreferenceCategory> </PreferenceScreen>

1 0

r24648: {} moves settings to proper Android imp of background thread (projects/android/trunk/Orbot/src/org/torproject/android)
by Nathan Freitas 17 Apr '11

17 Apr '11

Author: n8fr8 Date: 2011-04-17 16:15:56 +0000 (Sun, 17 Apr 2011) New Revision: 24648 Added: projects/android/trunk/Orbot/src/org/torproject/android/ProcessSettingsAsyncTask.java Log: moves settings to proper Android imp of background thread Added: projects/android/trunk/Orbot/src/org/torproject/android/ProcessSettingsAsyncTask.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/ProcessSettingsAsyncTask.java (rev 0) +++ projects/android/trunk/Orbot/src/org/torproject/android/ProcessSettingsAsyncTask.java 2011-04-17 16:15:56 UTC (rev 24648) @@ -0,0 +1,32 @@ +package org.torproject.android; + +import org.torproject.android.service.ITorService; + +import android.os.AsyncTask; +import android.os.RemoteException; + +public class ProcessSettingsAsyncTask extends AsyncTask<ITorService, Integer, Long> +{ + + + @Override + protected Long doInBackground(ITorService... torService) { + + try { + torService[0].processSettings(); + } catch (RemoteException e) { + e.printStackTrace(); + } + + return 100L; + } + + protected void onProgressUpdate(Integer... progress) { + + } + + protected void onPostExecute(Long result) { + + } + +}

1 0

[vidalia/alpha] update the paths in the script
by chiiph＠torproject.org 17 Apr '11

17 Apr '11

commit 7c03c2207bc960bd843ea20b365401b437cffe49 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Tue Apr 12 18:20:06 2011 +0100 update the paths in the script --- src/vidalia/help/content/po2html.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vidalia/help/content/po2html.sh b/src/vidalia/help/content/po2html.sh index ca6f01d..b94ee77 100755 --- a/src/vidalia/help/content/po2html.sh +++ b/src/vidalia/help/content/po2html.sh @@ -12,11 +12,11 @@ ### Start config ### # Location of the translated po files. Do not add the trailing slash. -translated="/home/runa/tor/vidaliahelp/po" +translated="/home/runa/tor/vidalia/src/vidalia/help/content/po" # Location of the original and translated html files. Do not add the # trailing slash. -html="/home/runa/tor/vidaliahelp/" +html="/home/runa/tor/vidalia/src/vidalia/help/content" ### End config ###

1 0

[vidalia/alpha] Fix wrong string. Thanks to bastik_tor
by chiiph＠torproject.org 17 Apr '11

17 Apr '11

commit a1d9af25f8b97beb7b5b62cf6aeca26987601dd8 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Sun Apr 17 12:52:52 2011 -0300 Fix wrong string. Thanks to bastik_tor --- src/vidalia/MainWindow.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 1a3c215..3c5c789 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1649,7 +1649,7 @@ MainWindow::warnDangerousPort(quint16 port, bool rejected) application = " "; } - QString text = tr("One of your applications%1appears to be making a " + QString text = tr("One of your applications %1 appears to be making a " "potentially unencrypted and unsafe connection to port %2.") .arg(application).arg(port);

1 0

[vidalia/alpha] Merge remote-tracking branch 'runa/master'
by chiiph＠torproject.org 17 Apr '11

17 Apr '11

commit c91d4a5800100bee9e74f013e8415f1208c9c754 Merge: dc1e6b5 7c03c22 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Wed Apr 13 08:21:48 2011 -0300 Merge remote-tracking branch 'runa/master' pkg/win32/po/.tx/config | 2 +- pkg/win32/po/af/vidalia_af.po | 2 +- pkg/win32/po/ak/vidalia_ak.po | 2 +- pkg/win32/po/am/vidalia_am.po | 2 +- pkg/win32/po/ar/vidalia_ar.po | 2 +- pkg/win32/po/arn/vidalia_arn.po | 2 +- pkg/win32/po/ast/vidalia_ast.po | 2 +- pkg/win32/po/az/vidalia_az.po | 2 +- pkg/win32/po/bg/vidalia_bg.po | 2 +- pkg/win32/po/bn_IN/vidalia_bn_IN.po | 2 +- pkg/win32/po/ca/vidalia_ca.po | 2 +- pkg/win32/po/cs/vidalia_cs.po | 2 +- pkg/win32/po/csb/vidalia_csb.po | 2 +- pkg/win32/po/cy/vidalia_cy.po | 2 +- pkg/win32/po/de/vidalia_de.po | 2 +- pkg/win32/po/de_CH/vidalia_de_CH.po | 2 +- pkg/win32/po/dz/vidalia_dz.po | 2 +- pkg/win32/po/el/vidalia_el.po | 2 +- pkg/win32/po/eo/vidalia_eo.po | 2 +- pkg/win32/po/es/vidalia_es.po | 2 +- pkg/win32/po/et/vidalia_et.po | 2 +- pkg/win32/po/eu/vidalia_eu.po | 2 +- pkg/win32/po/fil/vidalia_fil.po | 2 +- pkg/win32/po/fur/vidalia_fur.po | 2 +- pkg/win32/po/ga/vidalia_ga.po | 2 +- pkg/win32/po/gl/vidalia_gl.po | 2 +- pkg/win32/po/gu/vidalia_gu.po | 2 +- pkg/win32/po/gun/vidalia_gun.po | 2 +- pkg/win32/po/ha/vidalia_ha.po | 2 +- pkg/win32/po/he/vidalia_he.po | 2 +- pkg/win32/po/hi/vidalia_hi.po | 2 +- pkg/win32/po/hr/vidalia_hr.po | 2 +- pkg/win32/po/ht/vidalia_ht.po | 2 +- pkg/win32/po/hu/vidalia_hu.po | 2 +- pkg/win32/po/id/vidalia_id.po | 2 +- pkg/win32/po/is/vidalia_is.po | 2 +- pkg/win32/po/it/vidalia_it.po | 2 +- pkg/win32/po/kn/vidalia_kn.po | 2 +- pkg/win32/po/lb/vidalia_lb.po | 2 +- pkg/win32/po/ln/vidalia_ln.po | 2 +- pkg/win32/po/lo/vidalia_lo.po | 2 +- pkg/win32/po/lt/vidalia_lt.po | 2 +- pkg/win32/po/lv/vidalia_lv.po | 2 +- pkg/win32/po/mg/vidalia_mg.po | 2 +- pkg/win32/po/mi/vidalia_mi.po | 2 +- pkg/win32/po/mk/vidalia_mk.po | 2 +- pkg/win32/po/ml/vidalia_ml.po | 2 +- pkg/win32/po/mn/vidalia_mn.po | 2 +- pkg/win32/po/mr/vidalia_mr.po | 2 +- pkg/win32/po/ms/vidalia_ms.po | 2 +- pkg/win32/po/mt/vidalia_mt.po | 2 +- pkg/win32/po/my/vidalia_my.po | 2 +- pkg/win32/po/nah/vidalia_nah.po | 2 +- pkg/win32/po/nap/vidalia_nap.po | 2 +- pkg/win32/po/nb/vidalia_nb.po | 2 +- pkg/win32/po/ne/vidalia_ne.po | 2 +- pkg/win32/po/nl/vidalia_nl.po | 2 +- pkg/win32/po/nn/vidalia_nn.po | 2 +- pkg/win32/po/nso/vidalia_nso.po | 2 +- pkg/win32/po/oc/vidalia_oc.po | 2 +- pkg/win32/po/pa/vidalia_pa.po | 2 +- pkg/win32/po/pap/vidalia_pap.po | 2 +- pkg/win32/po/pl/vidalia_pl.po | 2 +- pkg/win32/po/pms/vidalia_pms.po | 2 +- pkg/win32/po/ps/vidalia_ps.po | 2 +- pkg/win32/po/pt/vidalia_pt.po | 2 +- pkg/win32/po/pt_BR/vidalia_pt_BR.po | 2 +- pkg/win32/po/ru/vidalia_ru.po | 18 +- pkg/win32/po/sco/vidalia_sco.po | 2 +- pkg/win32/po/son/vidalia_son.po | 2 +- pkg/win32/po/su/vidalia_su.po | 2 +- pkg/win32/po/sw/vidalia_sw.po | 2 +- pkg/win32/po/ta/vidalia_ta.po | 2 +- pkg/win32/po/te/vidalia_te.po | 2 +- pkg/win32/po/tg/vidalia_tg.po | 2 +- pkg/win32/po/th/vidalia_th.po | 2 +- pkg/win32/po/ti/vidalia_ti.po | 2 +- pkg/win32/po/tk/vidalia_tk.po | 2 +- pkg/win32/po/tr/vidalia_tr.po | 2 +- pkg/win32/po/ur/vidalia_ur.po | 2 +- pkg/win32/po/ve/vidalia_ve.po | 2 +- pkg/win32/po/vi/vidalia_vi.po | 2 +- pkg/win32/po/zh_CN/vidalia_zh_CN.po | 2 +- pkg/win32/po/zh_HK/vidalia_zh_HK.po | 2 +- pkg/win32/po/zu/vidalia_zu.po | 2 +- src/vidalia/help/content/ar/bridges.html | 2 +- src/vidalia/help/content/ar/config.html | 187 +++++++-------- src/vidalia/help/content/ar/index.html | 2 +- src/vidalia/help/content/ar/links.html | 2 +- src/vidalia/help/content/ar/log.html | 2 +- src/vidalia/help/content/ar/netview.html | 2 +- src/vidalia/help/content/ar/running.html | 2 +- src/vidalia/help/content/ar/server.html | 2 +- src/vidalia/help/content/ar/troubleshooting.html | 2 +- src/vidalia/help/content/es/bridges.html | 2 +- src/vidalia/help/content/fa/bridges.html | 2 +- src/vidalia/help/content/fa/config.html | 2 +- src/vidalia/help/content/fa/index.html | 2 +- src/vidalia/help/content/fa/links.html | 2 +- src/vidalia/help/content/fa/log.html | 2 +- src/vidalia/help/content/fa/netview.html | 2 +- src/vidalia/help/content/fa/running.html | 2 +- src/vidalia/help/content/fa/server.html | 2 +- src/vidalia/help/content/fa/troubleshooting.html | 2 +- src/vidalia/help/content/it/links.html | 2 +- src/vidalia/help/content/my/bridges.html | 2 +- src/vidalia/help/content/my/config.html | 2 +- src/vidalia/help/content/my/index.html | 2 +- src/vidalia/help/content/my/links.html | 2 +- src/vidalia/help/content/my/log.html | 2 +- src/vidalia/help/content/my/netview.html | 2 +- src/vidalia/help/content/my/running.html | 2 +- src/vidalia/help/content/my/server.html | 2 +- src/vidalia/help/content/my/troubleshooting.html | 2 +- src/vidalia/help/content/nl/index.html | 2 +- src/vidalia/help/content/nl/links.html | 2 +- src/vidalia/help/content/nl/running.html | 2 +- src/vidalia/help/content/pl/bridges.html | 2 +- src/vidalia/help/content/pl/index.html | 2 +- src/vidalia/help/content/pl/links.html | 2 +- src/vidalia/help/content/po/.tx/config | 20 +- src/vidalia/help/content/po/af/netview.po | 37 +-- src/vidalia/help/content/po/ak/netview.po | 37 +-- src/vidalia/help/content/po/am/netview.po | 37 +-- src/vidalia/help/content/po/ar/config.po | 279 +++++++++++----------- src/vidalia/help/content/po/arn/netview.po | 37 +-- src/vidalia/help/content/po/ast/netview.po | 37 +-- src/vidalia/help/content/po/az/netview.po | 37 +-- src/vidalia/help/content/po/be/netview.po | 37 +-- src/vidalia/help/content/po/bg/netview.po | 37 +-- src/vidalia/help/content/po/bn/netview.po | 37 +-- src/vidalia/help/content/po/bn_IN/netview.po | 37 +-- src/vidalia/help/content/po/ca/netview.po | 37 +-- src/vidalia/help/content/po/cs/netview.po | 37 +-- src/vidalia/help/content/po/csb/netview.po | 37 +-- src/vidalia/help/content/po/cy/netview.po | 37 +-- src/vidalia/help/content/po/da/config.po | 132 ++++++----- src/vidalia/help/content/po/dz/netview.po | 37 +-- src/vidalia/help/content/po/el/netview.po | 37 +-- src/vidalia/help/content/po/eo/netview.po | 37 +-- src/vidalia/help/content/po/et/netview.po | 37 +-- src/vidalia/help/content/po/eu/netview.po | 37 +-- src/vidalia/help/content/po/fil/netview.po | 37 +-- src/vidalia/help/content/po/fur/netview.po | 37 +-- src/vidalia/help/content/po/ga/netview.po | 37 +-- src/vidalia/help/content/po/gl/netview.po | 37 +-- src/vidalia/help/content/po/gu/netview.po | 37 +-- src/vidalia/help/content/po/gun/netview.po | 37 +-- src/vidalia/help/content/po/ha/netview.po | 37 +-- src/vidalia/help/content/po/he/netview.po | 37 +-- src/vidalia/help/content/po/hi/netview.po | 37 +-- src/vidalia/help/content/po/hr/netview.po | 37 +-- src/vidalia/help/content/po/ht/netview.po | 37 +-- src/vidalia/help/content/po/hu/netview.po | 37 +-- src/vidalia/help/content/po/id/netview.po | 37 +-- src/vidalia/help/content/po/is/netview.po | 37 +-- src/vidalia/help/content/po/kn/netview.po | 37 +-- src/vidalia/help/content/po/kw/netview.po | 37 +-- src/vidalia/help/content/po/lb/netview.po | 37 +-- src/vidalia/help/content/po/ln/netview.po | 37 +-- src/vidalia/help/content/po/lo/netview.po | 37 +-- src/vidalia/help/content/po/lt/netview.po | 37 +-- src/vidalia/help/content/po/lv/netview.po | 37 +-- src/vidalia/help/content/po/mg/netview.po | 37 +-- src/vidalia/help/content/po/mi/netview.po | 37 +-- src/vidalia/help/content/po/mk/netview.po | 37 +-- src/vidalia/help/content/po/ml/netview.po | 37 +-- src/vidalia/help/content/po/mn/netview.po | 37 +-- src/vidalia/help/content/po/mr/netview.po | 37 +-- src/vidalia/help/content/po/ms/netview.po | 37 +-- src/vidalia/help/content/po/mt/netview.po | 37 +-- src/vidalia/help/content/po/nap/netview.po | 37 +-- src/vidalia/help/content/po/nb/netview.po | 37 +-- src/vidalia/help/content/po/ne/netview.po | 37 +-- src/vidalia/help/content/po/nl/netview.po | 37 +-- src/vidalia/help/content/po/nn/netview.po | 37 +-- src/vidalia/help/content/po/nso/netview.po | 37 +-- src/vidalia/help/content/po/oc/netview.po | 37 +-- src/vidalia/help/content/po/pa/netview.po | 37 +-- src/vidalia/help/content/po/pap/netview.po | 37 +-- src/vidalia/help/content/po/pl/netview.po | 37 +-- src/vidalia/help/content/po/pms/netview.po | 37 +-- src/vidalia/help/content/po/ps/netview.po | 37 +-- src/vidalia/help/content/po/pt/netview.po | 37 +-- src/vidalia/help/content/po/pt_BR/netview.po | 37 +-- src/vidalia/help/content/po/ro/netview.po | 37 +-- src/vidalia/help/content/po/sco/netview.po | 37 +-- src/vidalia/help/content/po/son/netview.po | 37 +-- src/vidalia/help/content/po/su/netview.po | 37 +-- src/vidalia/help/content/po/sw/netview.po | 37 +-- src/vidalia/help/content/po/ta/netview.po | 37 +-- src/vidalia/help/content/po/te/netview.po | 37 +-- src/vidalia/help/content/po/tg/netview.po | 37 +-- src/vidalia/help/content/po/th/netview.po | 37 +-- src/vidalia/help/content/po/ti/netview.po | 37 +-- src/vidalia/help/content/po/tk/netview.po | 37 +-- src/vidalia/help/content/po/tr/config.po | 118 +++++----- src/vidalia/help/content/po/tr/netview.po | 37 +-- src/vidalia/help/content/po/uk/netview.po | 37 +-- src/vidalia/help/content/po/ur/netview.po | 37 +-- src/vidalia/help/content/po/ve/netview.po | 37 +-- src/vidalia/help/content/po/vi/netview.po | 37 +-- src/vidalia/help/content/po/wa/netview.po | 37 +-- src/vidalia/help/content/po/zh_CN/netview.po | 124 ++++------ src/vidalia/help/content/po/zh_HK/netview.po | 37 +-- src/vidalia/help/content/po/zh_TW/netview.po | 37 +-- src/vidalia/help/content/po/zu/netview.po | 37 +-- src/vidalia/help/content/po2html.sh | 4 +- src/vidalia/help/content/pt_BR/bridges.html | 2 +- src/vidalia/help/content/sv/links.html | 2 +- src/vidalia/help/content/tr/links.html | 2 +- src/vidalia/i18n/po/.tx/config | 4 +- src/vidalia/i18n/po/af/vidalia_af.po | 2 +- src/vidalia/i18n/po/ak/vidalia_ak.po | 2 +- src/vidalia/i18n/po/am/vidalia_am.po | 2 +- src/vidalia/i18n/po/arn/vidalia_arn.po | 2 +- src/vidalia/i18n/po/ast/vidalia_ast.po | 2 +- src/vidalia/i18n/po/az/vidalia_az.po | 2 +- src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po | 2 +- src/vidalia/i18n/po/ca/vidalia_ca.po | 2 +- src/vidalia/i18n/po/csb/vidalia_csb.po | 2 +- src/vidalia/i18n/po/cy/vidalia_cy.po | 2 +- src/vidalia/i18n/po/de_CH/vidalia_de_CH.po | 2 +- src/vidalia/i18n/po/dz/vidalia_dz.po | 2 +- src/vidalia/i18n/po/et/vidalia_et.po | 2 +- src/vidalia/i18n/po/eu/vidalia_eu.po | 2 +- src/vidalia/i18n/po/fil/vidalia_fil.po | 2 +- src/vidalia/i18n/po/fur/vidalia_fur.po | 2 +- src/vidalia/i18n/po/ga/vidalia_ga.po | 2 +- src/vidalia/i18n/po/gl/vidalia_gl.po | 2 +- src/vidalia/i18n/po/gun/vidalia_gun.po | 2 +- src/vidalia/i18n/po/ha/vidalia_ha.po | 2 +- src/vidalia/i18n/po/hr/vidalia_hr.po | 2 +- src/vidalia/i18n/po/ht/vidalia_ht.po | 2 +- src/vidalia/i18n/po/kn/vidalia_kn.po | 2 +- src/vidalia/i18n/po/lb/vidalia_lb.po | 2 +- src/vidalia/i18n/po/ln/vidalia_ln.po | 2 +- src/vidalia/i18n/po/lo/vidalia_lo.po | 2 +- src/vidalia/i18n/po/lt/vidalia_lt.po | 2 +- src/vidalia/i18n/po/lv/vidalia_lv.po | 2 +- src/vidalia/i18n/po/mg/vidalia_mg.po | 2 +- src/vidalia/i18n/po/mi/vidalia_mi.po | 2 +- src/vidalia/i18n/po/mk/vidalia_mk.po | 2 +- src/vidalia/i18n/po/ml/vidalia_ml.po | 2 +- src/vidalia/i18n/po/mn/vidalia_mn.po | 2 +- src/vidalia/i18n/po/mr/vidalia_mr.po | 2 +- src/vidalia/i18n/po/ms/vidalia_ms.po | 2 +- src/vidalia/i18n/po/mt/vidalia_mt.po | 2 +- src/vidalia/i18n/po/nah/vidalia_nah.po | 2 +- src/vidalia/i18n/po/nap/vidalia_nap.po | 2 +- src/vidalia/i18n/po/ne/vidalia_ne.po | 2 +- src/vidalia/i18n/po/nn/vidalia_nn.po | 2 +- src/vidalia/i18n/po/nso/vidalia_nso.po | 2 +- src/vidalia/i18n/po/oc/vidalia_oc.po | 2 +- src/vidalia/i18n/po/pa/vidalia_pa.po | 2 +- src/vidalia/i18n/po/pap/vidalia_pap.po | 2 +- src/vidalia/i18n/po/pms/vidalia_pms.po | 2 +- src/vidalia/i18n/po/ps/vidalia_ps.po | 2 +- src/vidalia/i18n/po/sco/vidalia_sco.po | 2 +- src/vidalia/i18n/po/son/vidalia_son.po | 2 +- src/vidalia/i18n/po/su/vidalia_su.po | 2 +- src/vidalia/i18n/po/sw/vidalia_sw.po | 2 +- src/vidalia/i18n/po/ta/vidalia_ta.po | 2 +- src/vidalia/i18n/po/te/vidalia_te.po | 2 +- src/vidalia/i18n/po/tg/vidalia_tg.po | 2 +- src/vidalia/i18n/po/ti/vidalia_ti.po | 2 +- src/vidalia/i18n/po/tk/vidalia_tk.po | 2 +- src/vidalia/i18n/po/ur/vidalia_ur.po | 2 +- src/vidalia/i18n/po/ve/vidalia_ve.po | 2 +- src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po | 2 +- src/vidalia/i18n/po/zu/vidalia_zu.po | 2 +- 271 files changed, 1663 insertions(+), 2617 deletions(-)

1 0

[vidalia/alpha] Merge branch 'master' into alpha
by chiiph＠torproject.org 17 Apr '11

17 Apr '11

commit 4d108e9628433ae16b059175565eafbbc609962a Merge: f2d8f5f a1d9af2 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Sun Apr 17 12:55:18 2011 -0300 Merge branch 'master' into alpha pkg/win32/po/.tx/config | 2 +- pkg/win32/po/af/vidalia_af.po | 2 +- pkg/win32/po/ak/vidalia_ak.po | 2 +- pkg/win32/po/am/vidalia_am.po | 2 +- pkg/win32/po/ar/vidalia_ar.po | 2 +- pkg/win32/po/arn/vidalia_arn.po | 2 +- pkg/win32/po/ast/vidalia_ast.po | 2 +- pkg/win32/po/az/vidalia_az.po | 2 +- pkg/win32/po/bg/vidalia_bg.po | 2 +- pkg/win32/po/bn_IN/vidalia_bn_IN.po | 2 +- pkg/win32/po/ca/vidalia_ca.po | 2 +- pkg/win32/po/cs/vidalia_cs.po | 2 +- pkg/win32/po/csb/vidalia_csb.po | 2 +- pkg/win32/po/cy/vidalia_cy.po | 2 +- pkg/win32/po/de/vidalia_de.po | 2 +- pkg/win32/po/de_CH/vidalia_de_CH.po | 2 +- pkg/win32/po/dz/vidalia_dz.po | 2 +- pkg/win32/po/el/vidalia_el.po | 2 +- pkg/win32/po/eo/vidalia_eo.po | 2 +- pkg/win32/po/es/vidalia_es.po | 2 +- pkg/win32/po/et/vidalia_et.po | 2 +- pkg/win32/po/eu/vidalia_eu.po | 2 +- pkg/win32/po/fil/vidalia_fil.po | 2 +- pkg/win32/po/fur/vidalia_fur.po | 2 +- pkg/win32/po/ga/vidalia_ga.po | 2 +- pkg/win32/po/gl/vidalia_gl.po | 2 +- pkg/win32/po/gu/vidalia_gu.po | 2 +- pkg/win32/po/gun/vidalia_gun.po | 2 +- pkg/win32/po/ha/vidalia_ha.po | 2 +- pkg/win32/po/he/vidalia_he.po | 2 +- pkg/win32/po/hi/vidalia_hi.po | 2 +- pkg/win32/po/hr/vidalia_hr.po | 2 +- pkg/win32/po/ht/vidalia_ht.po | 2 +- pkg/win32/po/hu/vidalia_hu.po | 2 +- pkg/win32/po/id/vidalia_id.po | 2 +- pkg/win32/po/is/vidalia_is.po | 2 +- pkg/win32/po/it/vidalia_it.po | 2 +- pkg/win32/po/kn/vidalia_kn.po | 2 +- pkg/win32/po/lb/vidalia_lb.po | 2 +- pkg/win32/po/ln/vidalia_ln.po | 2 +- pkg/win32/po/lo/vidalia_lo.po | 2 +- pkg/win32/po/lt/vidalia_lt.po | 2 +- pkg/win32/po/lv/vidalia_lv.po | 2 +- pkg/win32/po/mg/vidalia_mg.po | 2 +- pkg/win32/po/mi/vidalia_mi.po | 2 +- pkg/win32/po/mk/vidalia_mk.po | 2 +- pkg/win32/po/ml/vidalia_ml.po | 2 +- pkg/win32/po/mn/vidalia_mn.po | 2 +- pkg/win32/po/mr/vidalia_mr.po | 2 +- pkg/win32/po/ms/vidalia_ms.po | 2 +- pkg/win32/po/mt/vidalia_mt.po | 2 +- pkg/win32/po/my/vidalia_my.po | 2 +- pkg/win32/po/nah/vidalia_nah.po | 2 +- pkg/win32/po/nap/vidalia_nap.po | 2 +- pkg/win32/po/nb/vidalia_nb.po | 2 +- pkg/win32/po/ne/vidalia_ne.po | 2 +- pkg/win32/po/nl/vidalia_nl.po | 2 +- pkg/win32/po/nn/vidalia_nn.po | 2 +- pkg/win32/po/nso/vidalia_nso.po | 2 +- pkg/win32/po/oc/vidalia_oc.po | 2 +- pkg/win32/po/pa/vidalia_pa.po | 2 +- pkg/win32/po/pap/vidalia_pap.po | 2 +- pkg/win32/po/pl/vidalia_pl.po | 2 +- pkg/win32/po/pms/vidalia_pms.po | 2 +- pkg/win32/po/ps/vidalia_ps.po | 2 +- pkg/win32/po/pt/vidalia_pt.po | 2 +- pkg/win32/po/pt_BR/vidalia_pt_BR.po | 2 +- pkg/win32/po/ru/vidalia_ru.po | 18 +- pkg/win32/po/sco/vidalia_sco.po | 2 +- pkg/win32/po/son/vidalia_son.po | 2 +- pkg/win32/po/su/vidalia_su.po | 2 +- pkg/win32/po/sw/vidalia_sw.po | 2 +- pkg/win32/po/ta/vidalia_ta.po | 2 +- pkg/win32/po/te/vidalia_te.po | 2 +- pkg/win32/po/tg/vidalia_tg.po | 2 +- pkg/win32/po/th/vidalia_th.po | 2 +- pkg/win32/po/ti/vidalia_ti.po | 2 +- pkg/win32/po/tk/vidalia_tk.po | 2 +- pkg/win32/po/tr/vidalia_tr.po | 2 +- pkg/win32/po/ur/vidalia_ur.po | 2 +- pkg/win32/po/ve/vidalia_ve.po | 2 +- pkg/win32/po/vi/vidalia_vi.po | 2 +- pkg/win32/po/zh_CN/vidalia_zh_CN.po | 2 +- pkg/win32/po/zh_HK/vidalia_zh_HK.po | 2 +- pkg/win32/po/zu/vidalia_zu.po | 2 +- src/vidalia/MainWindow.cpp | 2 +- src/vidalia/help/content/ar/bridges.html | 2 +- src/vidalia/help/content/ar/config.html | 187 +++++++-------- src/vidalia/help/content/ar/index.html | 2 +- src/vidalia/help/content/ar/links.html | 2 +- src/vidalia/help/content/ar/log.html | 2 +- src/vidalia/help/content/ar/netview.html | 2 +- src/vidalia/help/content/ar/running.html | 2 +- src/vidalia/help/content/ar/server.html | 2 +- src/vidalia/help/content/ar/troubleshooting.html | 2 +- src/vidalia/help/content/es/bridges.html | 2 +- src/vidalia/help/content/fa/bridges.html | 2 +- src/vidalia/help/content/fa/config.html | 2 +- src/vidalia/help/content/fa/index.html | 2 +- src/vidalia/help/content/fa/links.html | 2 +- src/vidalia/help/content/fa/log.html | 2 +- src/vidalia/help/content/fa/netview.html | 2 +- src/vidalia/help/content/fa/running.html | 2 +- src/vidalia/help/content/fa/server.html | 2 +- src/vidalia/help/content/fa/troubleshooting.html | 2 +- src/vidalia/help/content/it/links.html | 2 +- src/vidalia/help/content/my/bridges.html | 2 +- src/vidalia/help/content/my/config.html | 2 +- src/vidalia/help/content/my/index.html | 2 +- src/vidalia/help/content/my/links.html | 2 +- src/vidalia/help/content/my/log.html | 2 +- src/vidalia/help/content/my/netview.html | 2 +- src/vidalia/help/content/my/running.html | 2 +- src/vidalia/help/content/my/server.html | 2 +- src/vidalia/help/content/my/troubleshooting.html | 2 +- src/vidalia/help/content/nl/index.html | 2 +- src/vidalia/help/content/nl/links.html | 2 +- src/vidalia/help/content/nl/running.html | 2 +- src/vidalia/help/content/pl/bridges.html | 2 +- src/vidalia/help/content/pl/index.html | 2 +- src/vidalia/help/content/pl/links.html | 2 +- src/vidalia/help/content/po/.tx/config | 20 +- src/vidalia/help/content/po/af/netview.po | 37 +-- src/vidalia/help/content/po/ak/netview.po | 37 +-- src/vidalia/help/content/po/am/netview.po | 37 +-- src/vidalia/help/content/po/ar/config.po | 279 +++++++++++----------- src/vidalia/help/content/po/arn/netview.po | 37 +-- src/vidalia/help/content/po/ast/netview.po | 37 +-- src/vidalia/help/content/po/az/netview.po | 37 +-- src/vidalia/help/content/po/be/netview.po | 37 +-- src/vidalia/help/content/po/bg/netview.po | 37 +-- src/vidalia/help/content/po/bn/netview.po | 37 +-- src/vidalia/help/content/po/bn_IN/netview.po | 37 +-- src/vidalia/help/content/po/ca/netview.po | 37 +-- src/vidalia/help/content/po/cs/netview.po | 37 +-- src/vidalia/help/content/po/csb/netview.po | 37 +-- src/vidalia/help/content/po/cy/netview.po | 37 +-- src/vidalia/help/content/po/da/config.po | 132 ++++++----- src/vidalia/help/content/po/dz/netview.po | 37 +-- src/vidalia/help/content/po/el/netview.po | 37 +-- src/vidalia/help/content/po/eo/netview.po | 37 +-- src/vidalia/help/content/po/et/netview.po | 37 +-- src/vidalia/help/content/po/eu/netview.po | 37 +-- src/vidalia/help/content/po/fil/netview.po | 37 +-- src/vidalia/help/content/po/fur/netview.po | 37 +-- src/vidalia/help/content/po/ga/netview.po | 37 +-- src/vidalia/help/content/po/gl/netview.po | 37 +-- src/vidalia/help/content/po/gu/netview.po | 37 +-- src/vidalia/help/content/po/gun/netview.po | 37 +-- src/vidalia/help/content/po/ha/netview.po | 37 +-- src/vidalia/help/content/po/he/netview.po | 37 +-- src/vidalia/help/content/po/hi/netview.po | 37 +-- src/vidalia/help/content/po/hr/netview.po | 37 +-- src/vidalia/help/content/po/ht/netview.po | 37 +-- src/vidalia/help/content/po/hu/netview.po | 37 +-- src/vidalia/help/content/po/id/netview.po | 37 +-- src/vidalia/help/content/po/is/netview.po | 37 +-- src/vidalia/help/content/po/kn/netview.po | 37 +-- src/vidalia/help/content/po/kw/netview.po | 37 +-- src/vidalia/help/content/po/lb/netview.po | 37 +-- src/vidalia/help/content/po/ln/netview.po | 37 +-- src/vidalia/help/content/po/lo/netview.po | 37 +-- src/vidalia/help/content/po/lt/netview.po | 37 +-- src/vidalia/help/content/po/lv/netview.po | 37 +-- src/vidalia/help/content/po/mg/netview.po | 37 +-- src/vidalia/help/content/po/mi/netview.po | 37 +-- src/vidalia/help/content/po/mk/netview.po | 37 +-- src/vidalia/help/content/po/ml/netview.po | 37 +-- src/vidalia/help/content/po/mn/netview.po | 37 +-- src/vidalia/help/content/po/mr/netview.po | 37 +-- src/vidalia/help/content/po/ms/netview.po | 37 +-- src/vidalia/help/content/po/mt/netview.po | 37 +-- src/vidalia/help/content/po/nap/netview.po | 37 +-- src/vidalia/help/content/po/nb/netview.po | 37 +-- src/vidalia/help/content/po/ne/netview.po | 37 +-- src/vidalia/help/content/po/nl/netview.po | 37 +-- src/vidalia/help/content/po/nn/netview.po | 37 +-- src/vidalia/help/content/po/nso/netview.po | 37 +-- src/vidalia/help/content/po/oc/netview.po | 37 +-- src/vidalia/help/content/po/pa/netview.po | 37 +-- src/vidalia/help/content/po/pap/netview.po | 37 +-- src/vidalia/help/content/po/pl/netview.po | 37 +-- src/vidalia/help/content/po/pms/netview.po | 37 +-- src/vidalia/help/content/po/ps/netview.po | 37 +-- src/vidalia/help/content/po/pt/netview.po | 37 +-- src/vidalia/help/content/po/pt_BR/netview.po | 37 +-- src/vidalia/help/content/po/ro/netview.po | 37 +-- src/vidalia/help/content/po/sco/netview.po | 37 +-- src/vidalia/help/content/po/son/netview.po | 37 +-- src/vidalia/help/content/po/su/netview.po | 37 +-- src/vidalia/help/content/po/sw/netview.po | 37 +-- src/vidalia/help/content/po/ta/netview.po | 37 +-- src/vidalia/help/content/po/te/netview.po | 37 +-- src/vidalia/help/content/po/tg/netview.po | 37 +-- src/vidalia/help/content/po/th/netview.po | 37 +-- src/vidalia/help/content/po/ti/netview.po | 37 +-- src/vidalia/help/content/po/tk/netview.po | 37 +-- src/vidalia/help/content/po/tr/config.po | 118 +++++----- src/vidalia/help/content/po/tr/netview.po | 37 +-- src/vidalia/help/content/po/uk/netview.po | 37 +-- src/vidalia/help/content/po/ur/netview.po | 37 +-- src/vidalia/help/content/po/ve/netview.po | 37 +-- src/vidalia/help/content/po/vi/netview.po | 37 +-- src/vidalia/help/content/po/wa/netview.po | 37 +-- src/vidalia/help/content/po/zh_CN/netview.po | 124 ++++------ src/vidalia/help/content/po/zh_HK/netview.po | 37 +-- src/vidalia/help/content/po/zh_TW/netview.po | 37 +-- src/vidalia/help/content/po/zu/netview.po | 37 +-- src/vidalia/help/content/po2html.sh | 4 +- src/vidalia/help/content/pt_BR/bridges.html | 2 +- src/vidalia/help/content/sv/links.html | 2 +- src/vidalia/help/content/tr/links.html | 2 +- src/vidalia/i18n/po/.tx/config | 4 +- src/vidalia/i18n/po/af/vidalia_af.po | 2 +- src/vidalia/i18n/po/ak/vidalia_ak.po | 2 +- src/vidalia/i18n/po/am/vidalia_am.po | 2 +- src/vidalia/i18n/po/arn/vidalia_arn.po | 2 +- src/vidalia/i18n/po/ast/vidalia_ast.po | 2 +- src/vidalia/i18n/po/az/vidalia_az.po | 2 +- src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po | 2 +- src/vidalia/i18n/po/ca/vidalia_ca.po | 2 +- src/vidalia/i18n/po/csb/vidalia_csb.po | 2 +- src/vidalia/i18n/po/cy/vidalia_cy.po | 2 +- src/vidalia/i18n/po/de_CH/vidalia_de_CH.po | 2 +- src/vidalia/i18n/po/dz/vidalia_dz.po | 2 +- src/vidalia/i18n/po/et/vidalia_et.po | 2 +- src/vidalia/i18n/po/eu/vidalia_eu.po | 2 +- src/vidalia/i18n/po/fil/vidalia_fil.po | 2 +- src/vidalia/i18n/po/fur/vidalia_fur.po | 2 +- src/vidalia/i18n/po/ga/vidalia_ga.po | 2 +- src/vidalia/i18n/po/gl/vidalia_gl.po | 2 +- src/vidalia/i18n/po/gun/vidalia_gun.po | 2 +- src/vidalia/i18n/po/ha/vidalia_ha.po | 2 +- src/vidalia/i18n/po/hr/vidalia_hr.po | 2 +- src/vidalia/i18n/po/ht/vidalia_ht.po | 2 +- src/vidalia/i18n/po/kn/vidalia_kn.po | 2 +- src/vidalia/i18n/po/lb/vidalia_lb.po | 2 +- src/vidalia/i18n/po/ln/vidalia_ln.po | 2 +- src/vidalia/i18n/po/lo/vidalia_lo.po | 2 +- src/vidalia/i18n/po/lt/vidalia_lt.po | 2 +- src/vidalia/i18n/po/lv/vidalia_lv.po | 2 +- src/vidalia/i18n/po/mg/vidalia_mg.po | 2 +- src/vidalia/i18n/po/mi/vidalia_mi.po | 2 +- src/vidalia/i18n/po/mk/vidalia_mk.po | 2 +- src/vidalia/i18n/po/ml/vidalia_ml.po | 2 +- src/vidalia/i18n/po/mn/vidalia_mn.po | 2 +- src/vidalia/i18n/po/mr/vidalia_mr.po | 2 +- src/vidalia/i18n/po/ms/vidalia_ms.po | 2 +- src/vidalia/i18n/po/mt/vidalia_mt.po | 2 +- src/vidalia/i18n/po/nah/vidalia_nah.po | 2 +- src/vidalia/i18n/po/nap/vidalia_nap.po | 2 +- src/vidalia/i18n/po/ne/vidalia_ne.po | 2 +- src/vidalia/i18n/po/nn/vidalia_nn.po | 2 +- src/vidalia/i18n/po/nso/vidalia_nso.po | 2 +- src/vidalia/i18n/po/oc/vidalia_oc.po | 2 +- src/vidalia/i18n/po/pa/vidalia_pa.po | 2 +- src/vidalia/i18n/po/pap/vidalia_pap.po | 2 +- src/vidalia/i18n/po/pms/vidalia_pms.po | 2 +- src/vidalia/i18n/po/ps/vidalia_ps.po | 2 +- src/vidalia/i18n/po/sco/vidalia_sco.po | 2 +- src/vidalia/i18n/po/son/vidalia_son.po | 2 +- src/vidalia/i18n/po/su/vidalia_su.po | 2 +- src/vidalia/i18n/po/sw/vidalia_sw.po | 2 +- src/vidalia/i18n/po/ta/vidalia_ta.po | 2 +- src/vidalia/i18n/po/te/vidalia_te.po | 2 +- src/vidalia/i18n/po/tg/vidalia_tg.po | 2 +- src/vidalia/i18n/po/ti/vidalia_ti.po | 2 +- src/vidalia/i18n/po/tk/vidalia_tk.po | 2 +- src/vidalia/i18n/po/ur/vidalia_ur.po | 2 +- src/vidalia/i18n/po/ve/vidalia_ve.po | 2 +- src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po | 2 +- src/vidalia/i18n/po/zu/vidalia_zu.po | 2 +- 272 files changed, 1664 insertions(+), 2618 deletions(-)

1 0

[vidalia/alpha] updated the translation priority
by chiiph＠torproject.org 17 Apr '11

17 Apr '11

commit b9f4d5c41f8d87f8f417c87687df72e9038ca747 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Wed Apr 13 12:11:41 2011 +0100 updated the translation priority --- pkg/win32/po/.tx/config | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pkg/win32/po/.tx/config b/pkg/win32/po/.tx/config index 7ac2c35..a066f41 100644 --- a/pkg/win32/po/.tx/config +++ b/pkg/win32/po/.tx/config @@ -1,7 +1,7 @@ [main] host = https://www.transifex.net -[torproject.vidalia-installer-vidalia-pot] +[torproject.2-vidalia-installer-vidalia-pot] source_file = templates/vidalia.pot source_lang = en trans.af = af/vidalia_af.po

1 0

[vidalia/alpha] Updated translation priority for Vidalia
by chiiph＠torproject.org 17 Apr '11

17 Apr '11

commit daf0233d5b9b299401ce0a41755cd8df8c46a2e2 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Tue Apr 12 15:40:36 2011 +0100 Updated translation priority for Vidalia --- src/vidalia/i18n/po/.tx/config | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vidalia/i18n/po/.tx/config b/src/vidalia/i18n/po/.tx/config index 80bc4e6..749d770 100644 --- a/src/vidalia/i18n/po/.tx/config +++ b/src/vidalia/i18n/po/.tx/config @@ -1,7 +1,7 @@ [main] host = https://www.transifex.net -[torproject.vidalia-qt-pot] +[torproject.1-vidalia-qt-pot] source_file = templates/qt.pot source_lang = en trans.af = af/qt_af.po @@ -123,7 +123,7 @@ trans.zh_HK = zh_HK/qt_zh_HK.po trans.zh_TW = zh_TW/qt_zh_TW.po trans.zu = zu/qt_zu.po -[torproject.vidalia-vidalia-pot] +[torproject.1-vidalia-vidalia-pot] source_file = templates/vidalia.pot source_lang = en trans.af = af/vidalia_af.po

1 0