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

[stem/master] Recognize NetBSD in is_bsd() check
by atagar＠torproject.org 20 Aug '18

20 Aug '18

commit ded189211eec6ac36a139f5b91fbc5441e7669fd Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 20 13:28:19 2018 -0700 Recognize NetBSD in is_bsd() check Presently our unit tests fail on NetBSD due to the man's lack of an '--encoding' argument... man --encoding=ascii -P cat foo man: unknown option -- e Usage: man [-acw|-h] [-C cfg] [-M path] [-m path] [-S srch] [[-s] sect] name ... Usage: man [-C file] -f command ... Usage: man [-C file] -k keyword ... Usage: man -p We hit this with OSX, FreeBSD, and other BSD variants before but our is_bsd() helper function didn't recognize NetBSD. Caught thanks to Thomas. --- stem/util/system.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/util/system.py b/stem/util/system.py index 4bfde995..3c03bc46 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -358,7 +358,7 @@ def is_bsd(): :returns: **bool** to indicate if we're on a BSD OS """ - return platform.system() in ('Darwin', 'FreeBSD', 'OpenBSD') + return platform.system() in ('Darwin', 'FreeBSD', 'OpenBSD', 'NetBSD') def is_available(command, cached=True):

1 0

[user-manual/alpha] Formatting and text revisions
by tommyc＠torproject.org 20 Aug '18

20 Aug '18

commit e140a133b04b086f7fd81eb12da10b446d0199fb Author: har00ga <jaruga(a)dial.ga> Date: Tue Aug 14 00:20:31 2018 +0000 Formatting and text revisions --- C/circumvention.page | 2 +- C/downloading.page | 4 ++-- C/onionsites.page | 4 ++-- C/plugins.page | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/C/circumvention.page b/C/circumvention.page index d46e876..c443db3 100644 --- a/C/circumvention.page +++ b/C/circumvention.page @@ -67,7 +67,7 @@ individual circumstances. If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs3, obfs4, ScrambleSuit, fte, -meek-azure, meek-amazon. +meek-azure and Snowflake. If you try all of these options, and none of them gets you online, diff --git a/C/downloading.page b/C/downloading.page index 54f78a1..3215c90 100644 --- a/C/downloading.page +++ b/C/downloading.page @@ -28,7 +28,7 @@ below. GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations, - such as Dropbox, Google Drive and Github.. + such as Dropbox, Google Drive and GitHub. @@ -68,7 +68,7 @@ below. </steps> - To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM): + To use GetTor via Jabber/XMPP (Jitsi, CoyIM, etc.): <steps> <item> diff --git a/C/onionsites.page b/C/onionsites.page index 4cbc75a..066a718 100644 --- a/C/onionsites.page +++ b/C/onionsites.page @@ -50,7 +50,7 @@ non-private web: Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of -sixteen mostly random letters and numbers, followed by “.onion”. +16 (and in V3 format, 56) mostly random letters and numbers, followed by “.onion”. </section> @@ -58,7 +58,7 @@ sixteen mostly random letters and numbers, followed by “.onion”. <title>Troubleshooting</title> If you cannot reach the onion service you require, make sure that you have -entered the 16-character onion address correctly: even a small mistake +entered the onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site. diff --git a/C/plugins.page b/C/plugins.page index 0f68a80..db4fe04 100644 --- a/C/plugins.page +++ b/C/plugins.page @@ -38,8 +38,9 @@ security of the browser, which might lead to deanonymization. Tor Browser includes an add-on called NoScript, accessed through the -“S” icon at the top-left of the window, which allows you to control the -JavaScript that runs on individual web pages, or to block it entirely. +“S” icon at the top-left of the window. NoScript allows you to control the +JavaScript (and other scripts) that runs on individual web pages, or +block it entirely. <media type="image" width="400" src="media/plugins/noscript_menu.png" />

1 0

[user-manual/alpha] fixing conflict in downloading.page
by tommyc＠torproject.org 20 Aug '18

20 Aug '18

commit f49285220938a6482c2e142ca067dc92ea735642 Merge: a8f3c53 e140a13 Author: Tommy Collison <tommyc(a)torproject.org> Date: Mon Aug 20 11:10:02 2018 -0700 fixing conflict in downloading.page C/circumvention.page | 2 +- C/downloading.page | 5 ++--- C/onionsites.page | 4 ++-- C/plugins.page | 5 +++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --cc C/downloading.page index 5ee7007,3215c90..34507d0 --- a/C/downloading.page +++ b/C/downloading.page @@@ -27,8 -27,8 +27,7 @@@ below <title>GetTor</title> GetTor is a service that automatically responds to messages with links -- to the latest version of Tor Browser, hosted at a variety of locations, - such as Dropbox, Google Drive and GitHub.. - such as Dropbox, Google Drive and GitHub. ++ to the latest version of Tor Browser, hosted at a variety of locations, such as Dropbox, Google Drive and GitHub.

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 24796 - Comment out excess permissions from GeckoView
by gk＠torproject.org 20 Aug '18

20 Aug '18

commit d0ccd485e2bb22fea4d9d758906dcee7468b4a6a Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Jul 16 22:22:59 2018 +0000 Bug 24796 - Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. --- .../android/geckoview/src/main/AndroidManifest.xml | 31 ++++++++++++---------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/mobile/android/geckoview/src/main/AndroidManifest.xml b/mobile/android/geckoview/src/main/AndroidManifest.xml index 9a74f5843240..6f82aa6aa74d 100644 --- a/mobile/android/geckoview/src/main/AndroidManifest.xml +++ b/mobile/android/geckoview/src/main/AndroidManifest.xml @@ -1,13 +1,15 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.geckoview"> -#ifdef MOZ_ANDROID_NETWORK_STATE + +  + <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> @@ -17,24 +19,25 @@ <uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.VIBRATE"/> -#ifdef MOZ_ANDROID_LOCATION + +  + <uses-feature android:name="android.hardware.touchscreen"/> - <uses-permission android:name="android.permission.CAMERA" /> - <uses-feature android:name="android.hardware.camera" android:required="false"/> - <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/> - -  +  - <uses-permission android:name="android.permission.RECORD_AUDIO"/>--> - <uses-feature android:name="android.hardware.audio.low_latency" android:required="false"/>--> - <uses-feature android:name="android.hardware.microphone" android:required="false"/>--> - <uses-feature android:name="android.hardware.camera.any" android:required="false"/>--> -  +  +  +  +  +  +  +  +  <uses-feature android:glEsVersion="0x00020000" android:required="true" />

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25696 - Implement alpha onboarding for Tor Browser for Android
by gk＠torproject.org 20 Aug '18

20 Aug '18

commit 9c58e200f6eb526a5b337138b994b9eb31af5817 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Aug 6 00:12:26 2018 -0300 Bug 25696 - Implement alpha onboarding for Tor Browser for Android - FirstrunTorPagerConfig.java: Create file that sets up all the views in the pager. - FirstrunPager.java: Update code to use the FirstrunTorPagerConfig. - FirstrunLastPanel.java: Create view that adds a close handler in the latest pager view. --- .../res/layout/firstrun_animation_container.xml | 10 +-- .../firstrun_basepanel_checkable_fragment.xml | 34 ++++++---- .../android/app/src/photon/res/values/colors.xml | 4 +- .../android/app/src/photon/res/values/styles.xml | 7 ++ .../mozilla/gecko/firstrun/FirstrunLastPanel.java | 30 +++++++++ .../org/mozilla/gecko/firstrun/FirstrunPager.java | 18 ++--- .../gecko/firstrun/FirstrunTorPagerConfig.java | 74 +++++++++++++++++++++ .../java/org/mozilla/gecko/firstrun/LastPanel.java | 11 ++- .../android/base/locales/en-US/android_strings.dtd | 20 +++++- mobile/android/base/strings.xml.in | 22 +++++- .../res/drawable-nodpi/figure_experience.png | Bin 0 -> 44299 bytes .../res/drawable-nodpi/figure_network.png | Bin 0 -> 70302 bytes .../torbrowser/res/drawable-nodpi/figure_onion.png | Bin 0 -> 139952 bytes .../res/drawable-nodpi/figure_privacy.png | Bin 0 -> 61696 bytes .../res/drawable-nodpi/figure_welcome.png | Bin 0 -> 83798 bytes .../drawable-nodpi/home_tab_menu_strip_tor.9.png | Bin 0 -> 126 bytes 16 files changed, 189 insertions(+), 41 deletions(-) diff --git a/mobile/android/app/src/main/res/layout/firstrun_animation_container.xml b/mobile/android/app/src/main/res/layout/firstrun_animation_container.xml index 3e7225365c57..dd20466a8e1a 100644 --- a/mobile/android/app/src/main/res/layout/firstrun_animation_container.xml +++ b/mobile/android/app/src/main/res/layout/firstrun_animation_container.xml @@ -8,7 +8,7 @@ xmlns:gecko="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" android:layout_width="match_parent" - android:background="@color/dark_transparent_overlay"> + android:background="@android:color/white"> <org.mozilla.gecko.firstrun.FirstrunPager android:id="@+id/firstrun_pager" @@ -18,12 +18,12 @@ <org.mozilla.gecko.home.TabMenuStrip android:layout_width="match_parent" android:layout_height="@dimen/tabs_strip_height" - android:background="@color/firstrun_pager_header" + android:background="@android:color/white" android:visibility="visible" android:layout_gravity="top" - gecko:strip="@drawable/home_tab_menu_strip" - gecko:activeTextColor="@color/placeholder_grey" - gecko:inactiveTextColor="@color/tab_text_color" + gecko:strip="@drawable/home_tab_menu_strip_tor" + gecko:activeTextColor="@color/tor_tab_active_text" + gecko:inactiveTextColor="@color/tor_tab_inactive_text" gecko:tabsMarginLeft="@dimen/firstrun_tab_strip_content_start" /> </org.mozilla.gecko.firstrun.FirstrunPager> diff --git a/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml b/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml index 700ab20663ce..6233198982d9 100644 --- a/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml +++ b/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml @@ -13,31 +13,37 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="@dimen/firstrun_min_height" - android:background="@color/about_page_header_grey" + android:background="@android:color/white" android:gravity="center_horizontal" android:orientation="vertical"> - <ImageView android:id="@+id/firstrun_image" - android:layout_width="wrap_content" - android:layout_height="@dimen/firstrun_background_height" - android:layout_marginTop="30dp" - android:layout_marginBottom="18dp" - android:scaleType="fitCenter" - android:layout_gravity="center" - android:adjustViewBounds="true"/> + <LinearLayout android:layout_width="match_parent" + android:layout_height="@dimen/firstrun_background_height" + android:background="@android:color/white" + android:gravity="center" + android:layout_gravity="center"> + + <ImageView android:id="@+id/firstrun_image" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:scaleType="fitCenter" + android:layout_gravity="center" + android:adjustViewBounds="true"/> + </LinearLayout> <TextView android:id="@+id/firstrun_text" android:layout_width="@dimen/firstrun_content_width" android:layout_height="wrap_content" - android:gravity="center" + android:gravity="left" android:textAppearance="@style/TextAppearance.FirstrunLight.Main"/> <TextView android:id="@+id/firstrun_subtext" android:layout_width="@dimen/firstrun_content_width" android:layout_height="wrap_content" android:paddingTop="20dp" - android:gravity="center" - android:textAppearance="@style/TextAppearance.FirstrunRegular.Body"/> + android:gravity="left" + android:lineSpacingExtra="5dp" + android:textAppearance="@style/TextAppearance.FirstrunTorRegular.Body"/> <android.support.v7.widget.SwitchCompat android:id="@+id/firstrun_switch" @@ -47,10 +53,10 @@ android:visibility="invisible"/> <TextView android:id="@+id/firstrun_link" - android:layout_width="wrap_content" + android:layout_width="@dimen/firstrun_content_width" android:layout_height="wrap_content" android:layout_marginBottom="30dp" - android:gravity="center" + android:gravity="left" android:textAppearance="@style/TextAppearance.Link" android:textAllCaps="true" android:text="@string/firstrun_button_next"/> diff --git a/mobile/android/app/src/photon/res/values/colors.xml b/mobile/android/app/src/photon/res/values/colors.xml index 73478f47bf4a..b3522be3c2db 100644 --- a/mobile/android/app/src/photon/res/values/colors.xml +++ b/mobile/android/app/src/photon/res/values/colors.xml @@ -130,7 +130,7 @@ <color name="private_browsing_purple">#CF68FF</color>  - <color name="ob_click">#0A84FF</color> + <color name="ob_click">#7D4698</color> <color name="ob_press">#003EAA</color> <color name="ob_title">#212121</color> <color name="ob_subtitle">#737373</color> @@ -151,6 +151,8 @@ <color name="url_bar_shadow_private">#272727</color> + <color name="tor_tab_inactive_text">#484848</color> + <color name="tor_tab_active_text">#7D4698</color>  <color name="restricted_profile_background_gold">#ffffcb51</color> diff --git a/mobile/android/app/src/photon/res/values/styles.xml b/mobile/android/app/src/photon/res/values/styles.xml index 49e01ee1caee..3330430b22d7 100644 --- a/mobile/android/app/src/photon/res/values/styles.xml +++ b/mobile/android/app/src/photon/res/values/styles.xml @@ -729,6 +729,7 @@ <style name="TextAppearance.FirstrunLight"/> <style name="TextAppearance.FirstrunRegular"/> + <style name="TextAppearance.FirstrunTorRegular"/> <style name="TextAppearance.FirstrunLight.Main"> <item name="android:textSize">20sp</item> @@ -741,6 +742,12 @@ <item name="android:lineSpacingMultiplier">1.25</item> </style> + <style name="TextAppearance.FirstrunTorRegular.Body"> + <item name="android:textSize">16sp</item> + <item name="android:textColor">@color/ob_subtitle</item> + <item name="android:lineSpacingMultiplier">2</item> + </style> + <style name="TextAppearance.Link"> <item name="android:textSize">16sp</item> <item name="android:textColor">@color/ob_click</item> diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunLastPanel.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunLastPanel.java new file mode 100644 index 000000000000..37ccda25d328 --- /dev/null +++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunLastPanel.java @@ -0,0 +1,30 @@ +/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*- + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.gecko.firstrun; + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import org.mozilla.gecko.R; + +public class FirstrunLastPanel extends FirstrunPanel { + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstance) { + final ViewGroup root = (ViewGroup) super.onCreateView(inflater, container, savedInstance); + + root.findViewById(R.id.firstrun_link).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + close(); + } + }); + + return root; + } +} diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPager.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPager.java index 044fe41850d5..48152c60870f 100644 --- a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPager.java +++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPager.java @@ -64,15 +64,7 @@ public class FirstrunPager extends RtlViewPager { } public void load(Context appContext, FragmentManager fm, final FirstrunAnimationContainer.OnFinishListener onFinishListener) { - final List<FirstrunPagerConfig.FirstrunPanelConfig> panels; - - if (Restrictions.isRestrictedProfile(context)) { - panels = FirstrunPagerConfig.getRestricted(); - } else if (FirefoxAccounts.firefoxAccountsExist(context)) { - panels = FirstrunPagerConfig.forFxAUser(appContext); - } else { - panels = FirstrunPagerConfig.getDefault(appContext); - } + final List<FirstrunTorPagerConfig.FirstrunTorPanelConfig> panels = FirstrunTorPagerConfig.getDefault(appContext); setAdapter(new ViewPagerAdapter(fm, panels)); this.pagerNavigation = new FirstrunPanel.PagerNavigation() { @@ -136,14 +128,14 @@ public class FirstrunPager extends RtlViewPager { } protected class ViewPagerAdapter extends FragmentPagerAdapter { - private final List<FirstrunPagerConfig.FirstrunPanelConfig> panels; + private final List<FirstrunTorPagerConfig.FirstrunTorPanelConfig> panels; private final Fragment[] fragments; - public ViewPagerAdapter(FragmentManager fm, List<FirstrunPagerConfig.FirstrunPanelConfig> panels) { + public ViewPagerAdapter(FragmentManager fm, List<FirstrunTorPagerConfig.FirstrunTorPanelConfig> panels) { super(fm); this.panels = panels; this.fragments = new Fragment[panels.size()]; - for (FirstrunPagerConfig.FirstrunPanelConfig panel : panels) { + for (FirstrunTorPagerConfig.FirstrunTorPanelConfig panel : panels) { mDecor.onAddPagerView(context.getString(panel.getTitleRes())); } @@ -156,7 +148,7 @@ public class FirstrunPager extends RtlViewPager { public Fragment getItem(int i) { Fragment fragment = this.fragments[i]; if (fragment == null) { - FirstrunPagerConfig.FirstrunPanelConfig panelConfig = panels.get(i); + FirstrunTorPagerConfig.FirstrunTorPanelConfig panelConfig = panels.get(i); fragment = Fragment.instantiate(context, panelConfig.getClassname(), panelConfig.getArgs()); ((FirstrunPanel) fragment).setPagerNavigation(pagerNavigation); fragments[i] = fragment; diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java new file mode 100644 index 000000000000..40b72e705784 --- /dev/null +++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java @@ -0,0 +1,74 @@ +/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*- + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.gecko.firstrun; + +import android.content.Context; +import android.os.Bundle; +import android.util.Log; +import org.mozilla.gecko.GeckoSharedPrefs; +import org.mozilla.gecko.R; +import org.mozilla.gecko.Telemetry; +import org.mozilla.gecko.TelemetryContract; +import org.mozilla.gecko.Experiments; + +import java.util.LinkedList; +import java.util.List; + +public class FirstrunTorPagerConfig { + public static final String LOGTAG = "FirstrunPagerConfigTor"; + + public static final String KEY_IMAGE = "imageRes"; + public static final String KEY_TEXT = "textRes"; + public static final String KEY_SUBTEXT = "subtextRes"; + + public static List<FirstrunTorPanelConfig> getDefault(Context context) { + final List<FirstrunTorPanelConfig> panels = new LinkedList<>(); + panels.add(SimplePanelConfigs.welcomeTorPanelConfig); + panels.add(SimplePanelConfigs.privacyPanelConfig); + panels.add(SimplePanelConfigs.torNetworkPanelConfig); + panels.add(SimplePanelConfigs.tipsPanelConfig); + panels.add(SimplePanelConfigs.onionServicesPanelConfig); + + return panels; + } + + public static class FirstrunTorPanelConfig { + + private String classname; + private int titleRes; + private Bundle args; + + public FirstrunTorPanelConfig(String classname, int titleRes, int imageRes, int textRes, int subtextRes) { + this.classname = classname; + this.titleRes = titleRes; + + this.args = new Bundle(); + this.args.putInt(KEY_IMAGE, imageRes); + this.args.putInt(KEY_TEXT, textRes); + this.args.putInt(KEY_SUBTEXT, subtextRes); + } + + public String getClassname() { + return this.classname; + } + + public int getTitleRes() { + return this.titleRes; + } + + public Bundle getArgs() { + return args; + } + } + + private static class SimplePanelConfigs { + public static final FirstrunTorPanelConfig welcomeTorPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_welcome_tab_title, R.drawable.figure_welcome, R.string.firstrun_welcome_title, R.string.firstrun_welcome_message); + public static final FirstrunTorPanelConfig privacyPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_privacy_tab_title, R.drawable.figure_privacy, R.string.firstrun_privacy_title, R.string.firstrun_privacy_message); + public static final FirstrunTorPanelConfig torNetworkPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_tornetwork_tab_title, R.drawable.figure_network, R.string.firstrun_tornetwork_title, R.string.firstrun_tornetwork_message); + public static final FirstrunTorPanelConfig tipsPanelConfig = new FirstrunTorPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_tips_tab_title, R.drawable.figure_experience, R.string.firstrun_tips_title, R.string.firstrun_tips_message); + public static final FirstrunTorPanelConfig onionServicesPanelConfig = new FirstrunTorPanelConfig(LastPanel.class.getName(), R.string.firstrun_onionservices_tab_title, R.drawable.figure_onion, R.string.firstrun_onionservices_title, R.string.firstrun_onionservices_message); + } +} diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/LastPanel.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/LastPanel.java index d100c49b3480..c4e4aa0dd96a 100644 --- a/mobile/android/base/java/org/mozilla/gecko/firstrun/LastPanel.java +++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/LastPanel.java @@ -6,6 +6,7 @@ package org.mozilla.gecko.firstrun; import android.os.Bundle; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -13,8 +14,6 @@ import android.widget.ImageView; import android.widget.TextView; import org.mozilla.gecko.R; -import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.TelemetryContract; public class LastPanel extends FirstrunPanel { @Override @@ -29,19 +28,19 @@ public class LastPanel extends FirstrunPanel { ((ImageView) root.findViewById(R.id.firstrun_image)).setImageResource(imageRes); ((TextView) root.findViewById(R.id.firstrun_text)).setText(textRes); ((TextView) root.findViewById(R.id.firstrun_subtext)).setText(subtextRes); - ((TextView) root.findViewById(R.id.firstrun_link)).setText(R.string.firstrun_welcome_button_browser); - } + TextView nextLink = (TextView) root.findViewById(R.id.firstrun_link); + nextLink.setText(R.string.firstrun_welcome_button_browser); + nextLink.setGravity(Gravity.CENTER); + root.findViewById(R.id.firstrun_link).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.BUTTON, "firstrun-next"); close(); } }); - return root; } } diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index b4e2296268c1..b9181bb82e1b 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -6,7 +6,7 @@ <!ENTITY firstrun_urlbar_message2 "Thanks for choosing &brandShortName;"> <!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from The Tor Project, the non-profit committed to a free and open web."> <!ENTITY firstrun_panel_title_privacy "Privacy"> -<!ENTITY firstrun_privacy_message "Browse like no one\'s watching"> + <!ENTITY firstrun_privacy_subtext "Private Browsing with Tracking Protection blocks trackers while you browse and won’t remember your history when you finish browsing."> <!ENTITY firstrun_panel_title_customize "Customize"> <!ENTITY firstrun_customize_message "Make &brandShortName; your own."> @@ -43,6 +43,24 @@ <!ENTITY firstrun_account_title "You"> <!ENTITY firstrun_account_message "Have &brandShortName; on another device?"> + +<!ENTITY firstrun_welcome_tab_title "Welcome"> +<!ENTITY firstrun_welcome_title "You\'re ready"> +<!ENTITY firstrun_welcome_message "Tor Browser for Android offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance, and censorship. Here\'s a quick onboarding about how it works."> +<!ENTITY firstrun_privacy_tab_title "Privacy"> +<!ENTITY firstrun_privacy_title "Snub trackers and snoopers"> +<!ENTITY firstrun_privacy_message "Tor Browser isolates each domain you visit. That means trackers and advertisers can’t follow you. And any information stored, such as isolated cookies or your browsing history, is deleted after your session. These modifications ensure your privacy is protected while you\'re browsing. Click \'Tor Network\' to learn how we protect you on the network level."> +<!ENTITY firstrun_tornetwork_tab_title "Tor Network"> +<!ENTITY firstrun_tornetwork_title "Travel a decentralized network"> +<!ENTITY firstrun_tornetwork_message "Tor Browser for Android routes your connection over the Tor network. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, there\'s no single point of failure and no centralized entity you need to trust in order to enjoy the internet, unlike when you use a VPN. For each domain you access, a new circuit through the network is created for you."> +<!ENTITY firstrun_tips_tab_title "Tips"> +<!ENTITY firstrun_tips_title "Experience Tips"> +<!ENTITY firstrun_tips_message "With all the security and privacy features provided by the Tor Browser and the Tor network, your experience while browsing the internet will be a little bit different. Since your connection is going through 3 relays around the world, things may run a bit slower than you\'re used to. Sometimes sites will ask you to prove you are a human, not a robot, and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on providing real privacy."> +<!ENTITY firstrun_onionservices_tab_title "Onion Services"> +<!ENTITY firstrun_onionservices_title "Onion Services"> +<!ENTITY firstrun_onionservices_message "For enhanced privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and +visitors, including added safeguards against censorship. The same way Tor Browser for Android allows you to browse the web with a high degree of privacy onion services allow people to provide content and services privately. You can access .onion sites using Tor Browser for Android."> + <!ENTITY onboard_start_restricted1 "Stay safe and in control with this simplified version of &brandShortName;.">  <string name="firstrun_privacy_subtext">&firstrun_privacy_subtext;</string> <string name="firstrun_panel_title_customize">&firstrun_panel_title_customize;</string> <string name="firstrun_customize_message">&firstrun_customize_message;</string> @@ -51,6 +51,26 @@ <string name="firstrun_welcome_restricted">&onboard_start_restricted1;</string> + <string name="firstrun_welcome_tab_title">&firstrun_welcome_tab_title;</string> + <string name="firstrun_welcome_title">&firstrun_welcome_title;</string> + <string name="firstrun_welcome_message">&firstrun_welcome_message;</string> + + <string name="firstrun_privacy_tab_title">&firstrun_privacy_tab_title;</string> + <string name="firstrun_privacy_title">&firstrun_privacy_title;</string> + <string name="firstrun_privacy_message">&firstrun_privacy_message;</string> + + <string name="firstrun_tornetwork_tab_title">&firstrun_tornetwork_tab_title;</string> + <string name="firstrun_tornetwork_title">&firstrun_tornetwork_title;</string> + <string name="firstrun_tornetwork_message">&firstrun_tornetwork_message;</string> + + <string name="firstrun_tips_tab_title">&firstrun_tips_tab_title;</string> + <string name="firstrun_tips_title">&firstrun_tips_title;</string> + <string name="firstrun_tips_message">&firstrun_tips_message;</string> + + <string name="firstrun_onionservices_tab_title">&firstrun_onionservices_tab_title;</string> + <string name="firstrun_onionservices_title">&firstrun_onionservices_title;</string> + <string name="firstrun_onionservices_message">&firstrun_onionservices_message;</string> + <string name="bookmarks_title">&bookmarks_title;</string> <string name="history_title">&history_title;</string> diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_experience.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_experience.png new file mode 100644 index 000000000000..2eeeb1ccbd7d Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_experience.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_network.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_network.png new file mode 100644 index 000000000000..62bf5e2d144d Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_network.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_onion.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_onion.png new file mode 100644 index 000000000000..cbd8236f82e9 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_onion.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_privacy.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_privacy.png new file mode 100644 index 000000000000..d9d56229aa8a Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_privacy.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_welcome.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_welcome.png new file mode 100644 index 000000000000..274dea5c31a6 Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/figure_welcome.png differ diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/home_tab_menu_strip_tor.9.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/home_tab_menu_strip_tor.9.png new file mode 100644 index 000000000000..a92420d11b8e Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/home_tab_menu_strip_tor.9.png differ

1 0

[webwml/master] Add new Tor Browser version: 8.0a10
by boklm＠torproject.org 20 Aug '18

20 Aug '18

commit d1e60bc7665ccd97e104ed283d78e9d8160bb811 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 20 18:50:29 2018 +0200 Add new Tor Browser version: 8.0a10 --- include/versions.wmi | 4 ++-- projects/torbrowser/RecommendedTBBVersions | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index ada5f1f5..2fa8dcfe 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -22,8 +22,8 @@ <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundle>/tor-win32-<version-win32-stable>.zip</define-tag> # *** tor browser beta/alpha *** -<define-tag version-torbrowserbundlebeta-all whitespace=delete>8.0a9</define-tag> -<define-tag releasedate-torbrowserbundlebeta-all whitespace=delete>2018-06-27</define-tag> +<define-tag version-torbrowserbundlebeta-all whitespace=delete>8.0a10</define-tag> +<define-tag releasedate-torbrowserbundlebeta-all whitespace=delete>2018-08-20</define-tag> # If all platforms are on the same version, you only need to update # version-torbrowserbundlebeta-all and releasedate-torbrowserbundlebeta-all diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index d9cb6ef7..7b0b4f0c 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -6,5 +6,9 @@ "8.0a9", "8.0a9-MacOS", "8.0a9-Linux", -"8.0a9-Windows" +"8.0a9-Windows", +"8.0a10", +"8.0a10-MacOS", +"8.0a10-Linux", +"8.0a10-Windows" ]

1 0

[webwml/master] Bug 27151: Add TBB-alpha locales ca, ga-IE, id, is, nb-NO
by boklm＠torproject.org 20 Aug '18

20 Aug '18

commit 199bde6b63257182d8e62f2ebf12b44a6c06a7ce Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Aug 17 02:04:29 2018 -0400 Bug 27151: Add TBB-alpha locales ca, ga-IE, id, is, nb-NO --- projects/en/torbrowser.wml | 90 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index 27000d11..91cc778c 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -362,6 +362,24 @@ • <a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_ar.tar.xz">64-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_ar.tar.xz.asc">sig</a>)</td> </tr> + <tr class="alt"> + <td>Català (ca)</td> + <td> + <a href="../dist/torbrowser/<version-torbrowserbundlebeta>/torbrowser-install-<version-torbrowserbundlebeta>_ca.exe">32/64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlebeta>/torbrowser-install-<version-torbrowserbundlebeta>_ca.exe.asc">sig</a>) + • + <a href="../dist/torbrowser/<version-torbrowserbundlewin64beta>/torbrowser-install-win64-<version-torbrowserbundlewin64beta>_ca.exe">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlewin64beta>/torbrowser-install-win64-<version-torbrowserbundlewin64beta>_ca.exe.asc">sig</a>) + </td> + <td><a href="../dist/torbrowser/<version-torbrowserbundleosx64beta>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_ca.dmg">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundleosx64beta>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_ca.dmg.asc">sig</a>) +  + <td><a href="../dist/torbrowser/<version-torbrowserbundlelinux32beta>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_ca.tar.xz">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlelinux32beta>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_ca.tar.xz.asc">sig</a>) + • <a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_ca.tar.xz">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_ca.tar.xz.asc">sig</a>)</td> + </tr> <tr> <td>Dansk (da)</td> <td> @@ -452,6 +470,24 @@ • <a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_fr.tar.xz">64-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_fr.tar.xz.asc">sig</a>)</td> </tr> + <tr class="alt"> + <td>Gaeilge (Irish) (ga-IE)</td> + <td> + <a href="../dist/torbrowser/<version-torbrowserbundlebeta>/torbrowser-install-<version-torbrowserbundlebeta>_ga-IE.exe">32/64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlebeta>/torbrowser-install-<version-torbrowserbundlebeta>_ga-IE.exe.asc">sig</a>) + • + <a href="../dist/torbrowser/<version-torbrowserbundlewin64beta>/torbrowser-install-win64-<version-torbrowserbundlewin64beta>_ga-IE.exe">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlewin64beta>/torbrowser-install-win64-<version-torbrowserbundlewin64beta>_ga-IE.exe.asc">sig</a>) + </td> + <td><a href="../dist/torbrowser/<version-torbrowserbundleosx64beta>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_ga-IE.dmg">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundleosx64beta>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_ga-IE.dmg.asc">sig</a>) +  + <td><a href="../dist/torbrowser/<version-torbrowserbundlelinux32beta>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_ga-IE.tar.xz">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlelinux32beta>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_ga-IE.tar.xz.asc">sig</a>) + • <a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_ga-IE.tar.xz">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_ga-IE.tar.xz.asc">sig</a>)</td> + </tr> <tr> <td>עברית (he)</td> <td> @@ -470,6 +506,42 @@ • <a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_he.tar.xz">64-bit</a> (<a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_he.tar.xz.asc">sig</a>)</td> </tr> + <tr class="alt"> + <td>bahasa Indonesia (id)</td> + <td> + <a href="../dist/torbrowser/<version-torbrowserbundlebeta>/torbrowser-install-<version-torbrowserbundlebeta>_id.exe">32/64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlebeta>/torbrowser-install-<version-torbrowserbundlebeta>_id.exe.asc">sig</a>) + • + <a href="../dist/torbrowser/<version-torbrowserbundlewin64beta>/torbrowser-install-win64-<version-torbrowserbundlewin64beta>_id.exe">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlewin64beta>/torbrowser-install-win64-<version-torbrowserbundlewin64beta>_id.exe.asc">sig</a>) + </td> + <td><a href="../dist/torbrowser/<version-torbrowserbundleosx64beta>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_id.dmg">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundleosx64beta>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_id.dmg.asc">sig</a>) +  + <td><a href="../dist/torbrowser/<version-torbrowserbundlelinux32beta>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_id.tar.xz">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlelinux32beta>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_id.tar.xz.asc">sig</a>) + • <a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_id.tar.xz">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_id.tar.xz.asc">sig</a>)</td> + </tr> + <tr class="alt"> + <td>íslenska (is)</td> + <td> + <a href="../dist/torbrowser/<version-torbrowserbundlebeta>/torbrowser-install-<version-torbrowserbundlebeta>_is.exe">32/64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlebeta>/torbrowser-install-<version-torbrowserbundlebeta>_is.exe.asc">sig</a>) + • + <a href="../dist/torbrowser/<version-torbrowserbundlewin64beta>/torbrowser-install-win64-<version-torbrowserbundlewin64beta>_is.exe">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlewin64beta>/torbrowser-install-win64-<version-torbrowserbundlewin64beta>_is.exe.asc">sig</a>) + </td> + <td><a href="../dist/torbrowser/<version-torbrowserbundleosx64beta>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_is.dmg">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundleosx64beta>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_is.dmg.asc">sig</a>) +  + <td><a href="../dist/torbrowser/<version-torbrowserbundlelinux32beta>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_is.tar.xz">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlelinux32beta>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_is.tar.xz.asc">sig</a>) + • <a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_is.tar.xz">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_is.tar.xz.asc">sig</a>)</td> + </tr> <tr> <td>Italiano (it)</td> <td> @@ -525,6 +597,24 @@ (<a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_ko.tar.xz.asc">sig</a>)</td> </tr> <tr class="alt"> + <td>Norsk bokmåͅl (nb)</td> + <td> + <a href="../dist/torbrowser/<version-torbrowserbundlebeta>/torbrowser-install-<version-torbrowserbundlebeta>_nb-NO.exe">32/64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlebeta>/torbrowser-install-<version-torbrowserbundlebeta>_nb-NO.exe.asc">sig</a>) + • + <a href="../dist/torbrowser/<version-torbrowserbundlewin64beta>/torbrowser-install-win64-<version-torbrowserbundlewin64beta>_nb-NO.exe">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlewin64beta>/torbrowser-install-win64-<version-torbrowserbundlewin64beta>_nb-NO.exe.asc">sig</a>) + </td> + <td><a href="../dist/torbrowser/<version-torbrowserbundleosx64beta>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_nb-NO.dmg">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundleosx64beta>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_nb-NO.dmg.asc">sig</a>) +  + <td><a href="../dist/torbrowser/<version-torbrowserbundlelinux32beta>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_nb-NO.tar.xz">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlelinux32beta>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_nb-NO.tar.xz.asc">sig</a>) + • <a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_nb-NO.tar.xz">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_nb-NO.tar.xz.asc">sig</a>)</td> + </tr> + <tr class="alt"> <td>Nederlands (nl)</td> <td> <a href="../dist/torbrowser/<version-torbrowserbundlebeta>/torbrowser-install-<version-torbrowserbundlebeta>_nl.exe">32/64-bit</a>

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 20 Aug '18

20 Aug '18

commit 3b2771069c5633b26b8091cbe5ad4b23077c422a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 20 15:45:10 2018 +0000 Update translations for abouttor-homepage_completed --- pt/aboutTor.dtd | 42 +++++++++++------------------------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/pt/aboutTor.dtd b/pt/aboutTor.dtd index be08623c8..4a7708378 100644 --- a/pt/aboutTor.dtd +++ b/pt/aboutTor.dtd @@ -1,45 +1,25 @@  <!ENTITY aboutTor.title "Sobre o Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "AVISO: este navegador está desatualizado."> -<!ENTITY aboutTor.outOfDateTorOff.label "Este navegador também está desatualizado."> -<!ENTITY aboutTor.outOfDate2.label "Clique na cebola e escolha 'Procurar por atualizações do Navegador Tor'"> - -<!ENTITY aboutTor.check.label "Testar Configurações da Rede Tor"> - -<!ENTITY aboutTor.success.label "Bem-vindo ao Navegador Tor"> -<!ENTITY aboutTor.success2.label "Ligado à rede Tor."> -<!ENTITY aboutTor.success3.label "Agora já está livre para navegar anonimamente na Internet."> +<!ENTITY aboutTor.ready.label "Explore, Secretamente"> +<!ENTITY aboutTor.ready2.label "Está pronto para a experiência de navegação mais privada do mundo."> <!ENTITY aboutTor.failure.label "Ocorreu algo de errado!"> <!ENTITY aboutTor.failure2.label "O Tor não está a funcionar neste navegador."> -<!ENTITY aboutTor.search.label "Procurar"> +<!ENTITY aboutTor.search.label "Pesquise com DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> -<!ENTITY aboutTor.torInfo1.label "Informação adicional:"> -<!ENTITY aboutTor.torInfo2.label "País e Endereço de IP:"> -<!ENTITY aboutTor.torInfo3.label "Nó de saída:"> -<!ENTITY aboutTor.torInfo4.label "Este servidor não regista qualquer informação sobre os visitantes."> -<!ENTITY aboutTor.whatnextQuestion.label "E a seguir?"> -<!ENTITY aboutTor.whatnextAnswer.label "O Tor NÃO é tudo o que precisa para navegar anonimamente! Poderá ter que alterar alguns dos seus hábitos de navegação para assegurar que a sua identidade fica segura."> -<!ENTITY aboutTor.whatnext.label "Dicas Sobre Como se Manter Anónimo »"> -<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Perguntas?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Consulte o nosso Tor Browser - Manual »"> + <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser - Manual do Utilizador"> -<!ENTITY aboutTor.helpInfo1.label "Você Pode Ajudar!"> -<!ENTITY aboutTor.helpInfo2.label "Pode ajudar de muitas maneiras para tornar a Rede Tor mais rápida e segura:"> -<!ENTITY aboutTor.helpInfo3.label "Executar um Nó de Retransmissão Tor »"> -<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Voluntarie os Seus Serviços »"> -<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Efetue um Donativo »"> -<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser - Manual"> -<!ENTITY aboutTor.footer.label "O Projeto Tor é uma organização sem fins lucrativos US 501(c)(3), dedicada à investigação, desenvolvimento e promoção do anonimato e privacidade on-line."> -<!ENTITY aboutTor.learnMore.label "Saber mais sobre o Projeto Tor »"> -<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> +<!ENTITY aboutTor.tor_mission.label "O Tor Project é uma organização sem fins lucrativos EUA 501 (c) (3) que promove os direitos humanos e liberdades, criando e disponibilizando tecnologias de privacidade e anonimato de código aberto e livre, apoiando a sua disponibilidade e utilização irrestrita, e promovendo a sua interpretação científica e popular."> +<!ENTITY aboutTor.getInvolved.label "Participe »"> +<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 20 Aug '18

20 Aug '18

commit 17cd5202b6f27cc0abcdc8250bdcb98673bde9b8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 20 15:45:04 2018 +0000 Update translations for abouttor-homepage --- pt/aboutTor.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pt/aboutTor.dtd b/pt/aboutTor.dtd index 4862becbf..4a7708378 100644 --- a/pt/aboutTor.dtd +++ b/pt/aboutTor.dtd @@ -6,20 +6,20 @@ <!ENTITY aboutTor.title "Sobre o Tor"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready.label "Explore, Secretamente"> +<!ENTITY aboutTor.ready2.label "Está pronto para a experiência de navegação mais privada do mundo."> <!ENTITY aboutTor.failure.label "Ocorreu algo de errado!"> <!ENTITY aboutTor.failure2.label "O Tor não está a funcionar neste navegador."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "Pesquise com DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Perguntas?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Consulte o nosso Tor Browser - Manual »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser - Manual"> -<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> -<!ENTITY aboutTor.getInvolved.label "Get Involved »"> +<!ENTITY aboutTor.tor_mission.label "O Tor Project é uma organização sem fins lucrativos EUA 501 (c) (3) que promove os direitos humanos e liberdades, criando e disponibilizando tecnologias de privacidade e anonimato de código aberto e livre, apoiando a sua disponibilidade e utilização irrestrita, e promovendo a sua interpretação científica e popular."> +<!ENTITY aboutTor.getInvolved.label "Participe »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 19 Aug '18

19 Aug '18

commit 91117eb22819ad6a042c9ae7c1c4d4e61801fd1b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 19 22:15:15 2018 +0000 Update translations for bridgedb_completed --- ar/LC_MESSAGES/bridgedb.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index 69a6d927b..e2a3106c6 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -12,10 +12,11 @@ # ButterflyOfFire, 2018 # debo debo <a.adeebo(a)yahoo.com>, 2015 # Mohamed El-Feky <elfeky.m(a)gmail.com>, 2014 +# Elias Saba <elias55saba(a)gmail.com>, 2018 # AnonymousLady <farah.jaza(a)hotmail.com>, 2014 # 0xidz <ghoucine(a)gmail.com>, 2014 # lamine Kacimi <k_lamine27(a)yahoo.fr>, 2015 -# Khaled Hosny <khaledhosny(a)eglug.org>, 2018 +# Khaled Hosny, 2018 # maher tharwat <mahmoud_tharwat2002(a)hotmail.com>, 2016 # محمد الحرقان <malham1(a)gmail.com>, 2011 # Nudroid A <Nudroid(a)outlook.com>, 2015 @@ -30,8 +31,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-07-03 12:54+0000\n" -"Last-Translator: Khaled Hosny <khaledhosny(a)eglug.org>\n" +"PO-Revision-Date: 2018-08-19 22:03+0000\n" +"Last-Translator: Elias Saba <elias55saba(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -288,7 +289,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "طريقة أخرى للحصول على جسور عبر إرسال بريد إلكتروني إلى %s. يرجى ملاحظة أنّه يجب ارسال البريد الإلكتروني من احدى العناوين البريدية التالية: %s أو %s أو %s." +msgstr "طريقة أخرى للحصول على جسور هي عبر إرسال بريد إلكتروني إلى %s. يرجى ملاحظة أنّه يجب ارسال البريد الإلكتروني عبر عنوان بريدي من احدى مزودي خدمة البريد الالكتروني التاليين: %s أو %s أو %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" @@ -350,7 +351,7 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "لتتمكن من إدخال جسور إلى المتصفح ، أذهب إلى %s صفحة تحميلات المتصفح %s وأتبع التعليمات المذكورة بها لتحميل وبدء المتصفح " +msgstr "لتتمكن من إدخال جسور إلى المتصفح Tor، أذهب إلى %s صفحة تحميلات المتصفح Tor %s وأتبع التعليمات المذكورة فيها من اجل تحميل وبدء المتصفح Tor" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:151

1 0