August 2012 - tor-commits - lists.torproject.org

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 14 Aug '12

14 Aug '12

commit c2f151d0b1a681b1baf56e1724cc2fd25043bfc1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 14 07:45:18 2012 +0000 Update translations for vidalia_help --- zh_CN/services.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/zh_CN/services.po b/zh_CN/services.po index 761d4d4..13db26c 100644 --- a/zh_CN/services.po +++ b/zh_CN/services.po @@ -1,13 +1,14 @@ # # Translators: # Christopher Meng <cickumqt(a)gmail.com>, 2012. +# <p1ckw1ck(a)teachers.org>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-08-01 10:52+0000\n" -"Last-Translator: Christopher Meng <cickumqt(a)gmail.com>\n" +"PO-Revision-Date: 2012-08-14 07:37+0000\n" +"Last-Translator: p1ckw1ck <p1ckw1ck(a)teachers.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +19,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/services.html:16 msgid "Hidden Services" -msgstr "" +msgstr "隐藏服务" #. type: Content of: <html><body> #: en/services.html:19 @@ -33,7 +34,7 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/services.html:26 msgid "What is a hidden service?" -msgstr "" +msgstr "隐藏服务是什么？" #. type: Content of: <html><body><p> #: en/services.html:28

1 0

[metrics-tasks/master] Add a README to task-5755/, telling where the code was moved.
by karsten＠torproject.org 14 Aug '12

14 Aug '12

commit a43f88c654e0bae57a180b89b531ff88203b74b6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 14 07:34:17 2012 +0200 Add a README to task-5755/, telling where the code was moved. --- task-5755/README | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/task-5755/README b/task-5755/README new file mode 100644 index 0000000..d63ad3c --- /dev/null +++ b/task-5755/README @@ -0,0 +1,2 @@ +The #5755 code has been moved to #6443 (task-6443/) in commit de7426a. +

1 0

[torbrowser/maint-2.2] OSX: add missing -f option to rm so it actually removes zips and xpis
by erinn＠torproject.org 13 Aug '12

13 Aug '12

commit cc4a6f91fa727ba9885c653513f40a18541eae46 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 13 23:08:32 2012 +0100 OSX: add missing -f option to rm so it actually removes zips and xpis --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index a9c5909..6ceb3e7 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -323,7 +323,7 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -mkdir $(DISTDIR) #hdiutil create -volname "Tor Browser Bundle for OS X" -format UDBZ -imagekey zlib-level=9 -srcfolder $(DISTDIR)/tmp/ $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).dmg zip -r $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).zip $(NAME)_$(LANGCODE).app - rm *.zip *.xpi + rm -f *.zip *.xpi copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$*

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 13 Aug '12

13 Aug '12

commit 4d1bbc978911e5abaf071cdb177f946ba530104c Merge: b9eca1c cc4a6f9 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 13 23:09:26 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 13 Aug '12

13 Aug '12

commit b9eca1c3ea873a888f5e1b86b704617bc5b87af3 Merge: 98ab7bf e2b3a8f Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 13 23:02:05 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 40 insertions(+), 16 deletions(-)

1 0

[torbrowser/master] OSX: add missing -f option to rm so it actually removes zips and xpis
by erinn＠torproject.org 13 Aug '12

13 Aug '12

commit cc4a6f91fa727ba9885c653513f40a18541eae46 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 13 23:08:32 2012 +0100 OSX: add missing -f option to rm so it actually removes zips and xpis --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index a9c5909..6ceb3e7 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -323,7 +323,7 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -mkdir $(DISTDIR) #hdiutil create -volname "Tor Browser Bundle for OS X" -format UDBZ -imagekey zlib-level=9 -srcfolder $(DISTDIR)/tmp/ $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).dmg zip -r $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).zip $(NAME)_$(LANGCODE).app - rm *.zip *.xpi + rm -f *.zip *.xpi copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$*

1 0

[torbrowser/maint-2.3] OSX: add missing -f option to rm so it actually removes zips and xpis
by erinn＠torproject.org 13 Aug '12

13 Aug '12

commit cc4a6f91fa727ba9885c653513f40a18541eae46 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 13 23:08:32 2012 +0100 OSX: add missing -f option to rm so it actually removes zips and xpis --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index a9c5909..6ceb3e7 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -323,7 +323,7 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -mkdir $(DISTDIR) #hdiutil create -volname "Tor Browser Bundle for OS X" -format UDBZ -imagekey zlib-level=9 -srcfolder $(DISTDIR)/tmp/ $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).dmg zip -r $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).zip $(NAME)_$(LANGCODE).app - rm *.zip *.xpi + rm -f *.zip *.xpi copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$*

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 13 Aug '12

13 Aug '12

commit 4d1bbc978911e5abaf071cdb177f946ba530104c Merge: b9eca1c cc4a6f9 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 13 23:09:26 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/master] Merge branch 'maint-2.3'
by erinn＠torproject.org 13 Aug '12

13 Aug '12

commit 0f92e656ff68514d21d01bb426b4e2b1ac83df88 Merge: f9919a1 4d1bbc9 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 13 23:09:31 2012 +0100 Merge branch 'maint-2.3' build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 13 Aug '12

13 Aug '12

commit b9eca1c3ea873a888f5e1b86b704617bc5b87af3 Merge: 98ab7bf e2b3a8f Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 13 23:02:05 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 40 insertions(+), 16 deletions(-)

1 0