December 2020 - tor-commits - lists.torproject.org

[orbot/master] improve logic for start/stop/reconnect of tor to handle orphaned processes
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit d6ebcd7ef7771fa0ef42e3b7271e131eec246c69 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Nov 16 16:11:39 2020 -0500 improve logic for start/stop/reconnect of tor to handle orphaned processes - if someone rapidly stops/starts tor, there can be a case where a tor process is launched and not shutdown. This can currently cause the UI to hang and be unable to start tor or connecting to an exsiting control port. --- .../torproject/android/service/OrbotService.java | 73 ++++++++++++++-------- 1 file changed, 48 insertions(+), 25 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 97c985ac..04f4f053 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -116,7 +116,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb private NotificationManager mNotificationManager = null; private NotificationCompat.Builder mNotifyBuilder; private boolean mNotificationShowing = false; - private final ExecutorService mExecutor = Executors.newFixedThreadPool(3); + private final ExecutorService mExecutor = Executors.newCachedThreadPool(); private File mHSBasePath; private ArrayList<Bridge> alBridges = null; private final String[] hsProjection = new String[]{ @@ -173,7 +173,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb private boolean findExistingTorDaemon() { try { - mLastProcessId = initControlConnection(3, true); + mLastProcessId = initControlConnection(1, true); if (mLastProcessId != -1 && conn != null) { sendCallbackLogMessage(getString(R.string.found_existing_tor_process)); @@ -182,6 +182,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return true; } } catch (Exception e) { + debug("Error finding existing tor daemon: " + e); } return false; } @@ -309,7 +310,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (useIPtProxy()) IPtProxy.stopObfs4Proxy(); - killAllDaemons(); + stopTorDaemon(true); //stop the foreground priority and make sure to remove the persistant notification stopForeground(true); @@ -331,20 +332,34 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return bridgeList.contains("obfs3")|| bridgeList.contains("obfs4")||bridgeList.contains("meek"); } - private void killAllDaemons() throws Exception { + /** + * if someone stops during startup, we may have to wait for the conn port to be setup, so we can properly shutdown tor + * @throws Exception + */ + private void stopTorDaemon(boolean waitForConnection) throws Exception { - if (conn != null) { - logNotice("Using control port to shutdown Tor"); + int tryCount = 0; - try { - logNotice("sending HALT signal to Tor process"); - conn.shutdownTor("SHUTDOWN"); + while (tryCount++ < 3) { + if (conn != null) { + logNotice("Using control port to shutdown Tor"); - } catch (IOException e) { - Log.d(OrbotConstants.TAG, "error shutting down Tor via connection", e); + try { + logNotice("sending HALT signal to Tor process"); + conn.shutdownTor("SHUTDOWN"); + + } catch (IOException e) { + Log.d(OrbotConstants.TAG, "error shutting down Tor via connection", e); + } + + conn = null; + break; } - conn = null; + if (!waitForConnection) + break; + + try { Thread.sleep(3000);}catch (Exception e){} } } @@ -515,8 +530,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb extraLines.append("PidFile").append(' ').append(filePid.getCanonicalPath()).append('\n'); - extraLines.append("RunAsDaemon 1").append('\n'); - extraLines.append("AvoidDiskWrites 1").append('\n'); + extraLines.append("RunAsDaemon 0").append('\n'); + extraLines.append("AvoidDiskWrites 0").append('\n'); String socksPortPref = prefs.getString(OrbotConstants.PREF_SOCKS, (TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT)); @@ -683,12 +698,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb */ private void startTor() { - String torProcId = null; - - try { - if (conn != null) torProcId = conn.getInfo("process/pid"); - } catch (Exception e) { - } try { @@ -697,7 +706,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb // these states should probably be handled better sendCallbackLogMessage("Ignoring start request, currently " + mCurrentStatus); return; - } else if (mCurrentStatus == STATUS_ON && (torProcId != null)) { + } else if (mCurrentStatus == STATUS_ON && (mLastProcessId != -1)) { showConnectedToTorNetworkNotification(); sendCallbackLogMessage("Ignoring start request, already started."); // setTorNetworkEnabled (true); @@ -705,15 +714,29 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return; } + sendCallbackStatus(STATUS_STARTING); + + try { + if (conn != null) { + String torProcId = conn.getInfo("process/pid"); + if (!TextUtils.isEmpty(torProcId)) + mLastProcessId = Integer.parseInt(torProcId); + } + else { + if (fileControlPort!=null && fileControlPort.exists()) + findExistingTorDaemon(); + + } + } catch (Exception e) { + } // make sure there are no stray daemons running - killAllDaemons(); + stopTorDaemon(false); SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED, null); logNotice("checking binary version: " + version); - sendCallbackStatus(STATUS_STARTING); showToolbarNotification(getString(R.string.status_starting_up), NOTIFY_ID, R.drawable.ic_stat_tor); //sendCallbackLogMessage(getString(R.string.status_starting_up)); //logNotice(getString(R.string.status_starting_up)); @@ -878,7 +901,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb int controlPort = -1; int attempt = 0; - logNotice("Waiting for control port..."); + logNotice(getString(R.string.waiting_for_control_port)); while (conn == null && attempt++ < maxTries && (mCurrentStatus != STATUS_OFF)) { try { @@ -886,7 +909,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb controlPort = getControlPort(); if (controlPort != -1) { - logNotice("Connecting to control port: " + controlPort); + logNotice(getString(R.string.connecting_to_control_port) + controlPort); break;

1 0

[orbot/master] Merge branch 'master' of github.com:guardianproject/orbot
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit e81e50cd38d6d79fe9fdd6fb5372a7c12b20a40d Merge: 3afa7612 4a39df4e Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Nov 16 11:42:54 2020 -0500 Merge branch 'master' of github.com:guardianproject/orbot app/src/main/AndroidManifest.xml | 5 +++-- app/src/main/java/org/torproject/android/MainConstants.java | 2 -- .../main/java/org/torproject/android/OrbotMainActivity.java | 11 +++-------- .../java/org/torproject/android/service/OrbotService.java | 8 -------- 4 files changed, 6 insertions(+), 20 deletions(-)

1 0

[orbot/master] update version to 1633100200
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit a2158981b5cf611096f8c3c5b1a2349dd4d82a82 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Nov 16 16:18:55 2020 -0500 update version to 1633100200 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 94025d34..8eaa7b63 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1633100100 + versionCode 1633100200 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] externalize log strings
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 68aa65b4bccbeefdab0b013d1e063dd200910296 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Nov 16 16:11:29 2020 -0500 externalize log strings --- orbotservice/src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/orbotservice/src/main/res/values/strings.xml b/orbotservice/src/main/res/values/strings.xml index b77869d1..c1d5e1dc 100644 --- a/orbotservice/src/main/res/values/strings.xml +++ b/orbotservice/src/main/res/values/strings.xml @@ -20,4 +20,6 @@ <string name="updating_settings_in_tor_service">updating settings in Tor service</string> <string name="menu_new_identity">New Identity</string> + <string name="waiting_for_control_port">Waiting for control port...</string> + <string name="connecting_to_control_port">\"Connecting to control port: \"</string> </resources>

1 0

[orbot/master] remove quotes from string
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit e88c84aac1a2b9dc37f6d5ccf14c048a9ce81c52 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Nov 20 11:00:48 2020 -0500 remove quotes from string --- orbotservice/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/src/main/res/values/strings.xml b/orbotservice/src/main/res/values/strings.xml index c1d5e1dc..4d1a65b9 100644 --- a/orbotservice/src/main/res/values/strings.xml +++ b/orbotservice/src/main/res/values/strings.xml @@ -21,5 +21,5 @@ <string name="menu_new_identity">New Identity</string> <string name="waiting_for_control_port">Waiting for control port...</string> - <string name="connecting_to_control_port">\"Connecting to control port: \"</string> + <string name="connecting_to_control_port">Connecting to control port:</string> </resources>

1 0

[orbot/master] update changelog for 16.3.3-RC-1-tor-0.4.3.6
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit da34729553b399cae681235563c16dd3765d2009 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Nov 20 11:03:37 2020 -0500 update changelog for 16.3.3-RC-1-tor-0.4.3.6 --- CHANGELOG | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 7187f2cc..0e0e7fad 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,26 @@ +/** 16.3.3-RC-1-tor-0.4.3.6 / 20 November 2020 **/ +daa2e7b4 (HEAD -> master) update version code to 1633300100 +e88c84aa (origin/master, origin/HEAD) remove quotes from string +a2158981 (tag: 16.3.3-BETA-2-tor-0.4.3.6) update version to 1633100200 +d6ebcd7e improve logic for start/stop/reconnect of tor to handle orphaned processes - if someone rapidly stops/starts tor, there can be a case where a tor process is launched and not shutdown. This can currently cause the UI to hang and be unable to start tor or connecting to an exsiting control port. +68aa65b4 externalize log strings +9a21cd65 Merge branch 'master' of github.com:guardianproject/orbot +05e9dd8f Merge pull request #412 from bitmold/IPtProxy_aar_module +e81e50cd Merge branch 'master' of github.com:guardianproject/orbot +a5a146c8 Made IPtProxy a module, only ship app with one AAR file +4a39df4e added maxSdkVersion18 for WRITE_EXTERNAL_STORAGE prem +9a7ef0d8 deleted superflous comments +5ef1da70 removed unused constants/warnings +3afa7612 (tag: 16.3.3-BETA-1-tor-0.4.3.6) update version code to 1633100100 +317923b7 Merge pull request #411 from guardianproject/dev_iptproxy +42b65133 (origin/dev_iptproxy, dev_iptproxy) remove unused bridge list loop +8d7a79a5 add use IPtProxy function +4e7ecdef use IPtProxy instead of the AndroidPT dependency +be40bf56 modifying dependencies to support use of AAR for IPtProxy (temporarily) +b3006347 the main app needs access to the aar for building as well +0e33a652 add IPtProxy as aar for now +075c6ddf update gradle and tools +50ee0d6f small changes to ensure handling of auto start on boot /** 16.3.2-RC-1-tor-0.4.3.6 / 2 November 2020 / c69a217aa8e1f09a34634da50e7af55c4fc73a21 **/

1 0

[orbot/master] update version code to 1633300100
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit daa2e7b4133c127c605b9d1fa884166743f33c7f Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Nov 20 11:02:25 2020 -0500 update version code to 1633300100 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 8eaa7b63..fdc9566e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1633100200 + versionCode 1633300100 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] Removed very outdated text/graphics from "docs" folder.
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit f9d5fcf522475b1ca33b27ffb30e0a9b83ff90d9 Author: bim <dsnake(a)protonmail.com> Date: Sun Nov 29 16:00:40 2020 -0500 Removed very outdated text/graphics from "docs" folder. Moved svg icon from root of repo into docs folder --- docs/GSoC.txt | 45 ----------------- docs/WALKTHROUGH | 85 -------------------------------- ic_launcher.svg => docs/ic_launcher.svg | 0 docs/onionroots.xcf | Bin 1748142 -> 0 bytes docs/orbotnewicons.xcf | Bin 1118257 -> 0 bytes 5 files changed, 130 deletions(-) diff --git a/docs/GSoC.txt b/docs/GSoC.txt deleted file mode 100644 index d1d851e1..00000000 --- a/docs/GSoC.txt +++ /dev/null @@ -1,45 +0,0 @@ -GSoC Plan -========= - -A tl;dr version ---------------- -I will be improving the Orbot UI/UX, and adding several features such as data statistics and also -implementing the TorCheck API. I plan on extending the ORLib library and also creating an ORLib enabled -app as a sort of primer for other third party apps to follow - -The full version ----------------- - -Orbot UI/UX -=========== -At the moment, the Orbot UI/UX is clustered and not very intuitive. I plan on improving the existing -elements of the UI and also add a variety of new features such as - -* A new Set – up Wizard ( which checks for iptables ) -* Changes to the preferences ( should be made to follow the Android guidelines) - -Orbot Core app work -=================== -At the moment, Orbot displays a successful connection without actually checking the connection. This is a -pressing issue, because the user is not notified if the set-up has failed, unless he/she manually checks -the torcheck web service. This should be made automatic by making using of the TorCheck API. Also, Orbot -should be configured to show more information about the data being transmitted such as - - -* Amount of data transferred -* Quality of the connection -* Number of circuits connected - -ORLib -===== -Currently, ORLib is very minimal at the moment, both in term of features and support/documentation. ORLib -is very critical to the use of Orbot as it provides transparent proxying on non-rooted devices ( A major -chunk of android phones are un-rooted). I intend to - - -* Improve the existing library by adding additional features - * Check for existing of Orbot - * Check status of connection to Tor - * Provide option to start Orbot via intent -* Request hidden service by port, and get return hidden service .onion address -* Create an ORLib enabled “Twitter, Status.net or other micro blogging Client” – A sort of primer for - third-party apps -* Improve the documentation diff --git a/docs/WALKTHROUGH b/docs/WALKTHROUGH deleted file mode 100644 index 55a356b5..00000000 --- a/docs/WALKTHROUGH +++ /dev/null @@ -1,85 +0,0 @@ - -. -└── org - └── torproject - └── android - ├── AppManager.java - //this is what helps us track the app-by-app torification - //and gets the app name, icon, etc for display - we have some problems here - //in normalizing the icon on the list label - //some of this code came originally from DroidWall project (yay open source) - - ├── boot - │ └── OnbootBroadcastReceiver.java - //i think this is a dup now and should be removed - - ├── HiddenServiceManager.java - //empty! but at some point i thought it would be good to aggregate HS functions here - - ├── OnBootReceiver.java - //this is the class registered in AndroidManifest.xml to handle Onboot events - //to start Orbot/Tor when the device boots if the user has elected to do so - what kind of permissions does this require? - // <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> - - ├── OrbotMainActivity.java - //our wonderful main activity! - - ├── ProcessSettingsAsyncTask.java - //this was just added in 1.0.5.x, but it was meant to help stop the UI blocking while processing settings and prefs - //it uses the AsyncTask feature of Android, which seems to work pretty well - //for this type of non-time critical function you just want to happen in the background at some point soon-ish - - ├── SettingsPreferences.java - // Settings activity that loads the res/xml/preferences.xml resource up - // has some custom event handlng, onActivityResult callback result code's as well - // basically meant to tell Orbot activity if critical settings have been modified and whether - // those new settings should be applied (like iptables/transproxy changes) - - ├── TorConstants.java - // globals! well, constants! but yeah, just a place to put values we use a lot - - ├── TorifiedApp.java - // object to store a single app's metadata for display in UI and for transproxy process - - ├── Utils.java - // random methods that can be useful, a.k.a. another place to put stuff - - ├── WizardActivity.java - // our original attempt at wizard activity that didn't get far - - └── WizardHelper.java - // the helper class that manages the dialog based wizard - - ├── service //okay the Service subpackage! - - │ ├── Api.java - //this is more code taken from DroidWall, that needs to be cleaned up and paired down to just what we need it for - //this is related to 1.0.5.x changes with how we bundle and install our C binaries (tor, privoxy and iptables) - - │ ├── ITorService.aidl - // the android remote interface definition file; - // this is the remote interface which the Orbot activity gets a reference to - // and that in the TorService is instantiated as the "binder" - - │ ├── ITorServiceCallback.aidl - // this is the callback interface that the Orbot activity instantiates, and passes - // to the ITorService; reverse of ITorService in a sense - - │ ├── TorBinaryInstaller.java - // this handles installation of binaries; uses Api.java; // tied into Wizard as well - - │ ├── TorServiceConstants.java - // reusable constants for just the Service package - - │ ├── TorService.java - // the main might powerful service class; Orbot and TorService are the front and backends of this whole app - // should run as a remote service, but the manifest doesn't seem to indicate that at the moment - - │ ├── TorServiceUtils.java - //utility methods for the service; specificaly check for root and tools for finding processID of background binaries - - │ └── TorTransProxy.java - // all the code for iptables transproxying management - - - diff --git a/ic_launcher.svg b/docs/ic_launcher.svg similarity index 100% rename from ic_launcher.svg rename to docs/ic_launcher.svg diff --git a/docs/onionroots.xcf b/docs/onionroots.xcf deleted file mode 100644 index eac39c78..00000000 Binary files a/docs/onionroots.xcf and /dev/null differ diff --git a/docs/orbotnewicons.xcf b/docs/orbotnewicons.xcf deleted file mode 100644 index a6955dc1..00000000 Binary files a/docs/orbotnewicons.xcf and /dev/null differ

1 0

[orbot/master] Merge remote-tracking branch 'upstream/master'
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 4a5aad9239cd3aacdc52f4df3bac2a736f797073 Merge: edc6cee9 e88c84aa Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Wed Nov 25 12:55:18 2020 +0100 Merge remote-tracking branch 'upstream/master' CHANGELOG | 61 ++++ IPtProxy/IPtProxy.aar | Bin 0 -> 29425327 bytes IPtProxy/build.gradle | 2 + app-mini/build.gradle | 2 +- app-mini/src/debug/AndroidManifest.xml | 132 --------- app/build.gradle | 15 +- app/src/main/AndroidManifest.xml | 15 +- .../java/org/torproject/android/MainConstants.java | 2 - .../org/torproject/android/OrbotMainActivity.java | 43 +-- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- orbotservice/build.gradle | 12 +- orbotservice/src/main/AndroidManifest.xml | 2 + .../torproject/android/service/OrbotService.java | 308 +++++++++------------ .../android/service/TorEventHandler.java | 2 +- orbotservice/src/main/res/values/strings.xml | 2 + settings.gradle | 1 + 17 files changed, 248 insertions(+), 357 deletions(-)

1 0

[orbot/master] Correct data-rate units, Fixes #378
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 590d440dadd6cd8a8dc5b50ffb62320b8d5ef5b1 Author: bim <dsnake(a)protonmail.com> Date: Sun Dec 6 13:53:12 2020 -0500 Correct data-rate units, Fixes #378 --- app-mini/src/main/res/values-ar/strings.xml | 2 -- app-mini/src/main/res/values-ay/strings.xml | 2 -- app-mini/src/main/res/values-az/strings.xml | 2 -- app-mini/src/main/res/values-be/strings.xml | 2 -- app-mini/src/main/res/values-bg/strings.xml | 2 -- app-mini/src/main/res/values-ca/strings.xml | 2 -- app-mini/src/main/res/values-cs-rCZ/strings.xml | 2 -- app-mini/src/main/res/values-de/strings.xml | 2 -- app-mini/src/main/res/values-el/strings.xml | 2 -- app-mini/src/main/res/values-es-rAR/strings.xml | 2 -- app-mini/src/main/res/values-es/strings.xml | 2 -- app-mini/src/main/res/values-eu/strings.xml | 2 -- app-mini/src/main/res/values-fa/strings.xml | 2 -- app-mini/src/main/res/values-fi/strings.xml | 2 -- app-mini/src/main/res/values-fr-rFR/strings.xml | 2 -- app-mini/src/main/res/values-fr/strings.xml | 2 -- app-mini/src/main/res/values-gl/strings.xml | 2 -- app-mini/src/main/res/values-he/strings.xml | 2 -- app-mini/src/main/res/values-hi/strings.xml | 2 -- app-mini/src/main/res/values-hr/strings.xml | 2 -- app-mini/src/main/res/values-hu/strings.xml | 2 -- app-mini/src/main/res/values-id/strings.xml | 2 -- app-mini/src/main/res/values-in-rID/strings.xml | 2 -- app-mini/src/main/res/values-is/strings.xml | 2 -- app-mini/src/main/res/values-it/strings.xml | 2 -- app-mini/src/main/res/values-iw/strings.xml | 2 -- app-mini/src/main/res/values-ja/strings.xml | 2 -- app-mini/src/main/res/values-ko/strings.xml | 2 -- app-mini/src/main/res/values-lv/strings.xml | 2 -- app-mini/src/main/res/values-mk/strings.xml | 2 -- app-mini/src/main/res/values-nb/strings.xml | 2 -- app-mini/src/main/res/values-nl/strings.xml | 2 -- app-mini/src/main/res/values-pl/strings.xml | 2 -- app-mini/src/main/res/values-pt-rBR/strings.xml | 2 -- app-mini/src/main/res/values-pt-rPT/strings.xml | 2 -- app-mini/src/main/res/values-pt/strings.xml | 2 -- app-mini/src/main/res/values-ro/strings.xml | 2 -- app-mini/src/main/res/values-ru/strings.xml | 2 -- app-mini/src/main/res/values-sk/strings.xml | 2 -- app-mini/src/main/res/values-sr/strings.xml | 2 -- app-mini/src/main/res/values-sv/strings.xml | 2 -- app-mini/src/main/res/values-th/strings.xml | 2 -- app-mini/src/main/res/values-tl/strings.xml | 2 -- app-mini/src/main/res/values-tr/strings.xml | 2 -- app-mini/src/main/res/values-uk/strings.xml | 2 -- app-mini/src/main/res/values-vi/strings.xml | 2 -- app-mini/src/main/res/values-zh-rCN/strings.xml | 2 -- app-mini/src/main/res/values-zh-rTW/strings.xml | 2 -- app-mini/src/main/res/values/strings.xml | 4 ---- .../java/org/torproject/android/OrbotMainActivity.java | 16 ++++++++-------- app/src/main/res/values-ar/strings.xml | 4 ---- app/src/main/res/values-ay/strings.xml | 4 ---- app/src/main/res/values-az/strings.xml | 4 ---- app/src/main/res/values-be/strings.xml | 4 ---- app/src/main/res/values-bg/strings.xml | 4 ---- app/src/main/res/values-ca/strings.xml | 4 ---- app/src/main/res/values-cs-rCZ/strings.xml | 4 ---- app/src/main/res/values-da/strings.xml | 2 -- app/src/main/res/values-de/strings.xml | 4 ---- app/src/main/res/values-el/strings.xml | 4 ---- app/src/main/res/values-es-rAR/strings.xml | 4 ---- app/src/main/res/values-es/strings.xml | 4 ---- app/src/main/res/values-eu/strings.xml | 4 ---- app/src/main/res/values-fa/strings.xml | 4 ---- app/src/main/res/values-fi/strings.xml | 4 ---- app/src/main/res/values-fr-rFR/strings.xml | 4 ---- app/src/main/res/values-fr/strings.xml | 4 ---- app/src/main/res/values-gl/strings.xml | 4 ---- app/src/main/res/values-he/strings.xml | 4 ---- app/src/main/res/values-hi/strings.xml | 4 ---- app/src/main/res/values-hr/strings.xml | 4 ---- app/src/main/res/values-hu/strings.xml | 4 ---- app/src/main/res/values-id/strings.xml | 4 ---- app/src/main/res/values-in-rID/strings.xml | 4 ---- app/src/main/res/values-is/strings.xml | 4 ---- app/src/main/res/values-it/strings.xml | 4 ---- app/src/main/res/values-iw/strings.xml | 4 ---- app/src/main/res/values-ja/strings.xml | 4 ---- app/src/main/res/values-ko/strings.xml | 4 ---- app/src/main/res/values-lv/strings.xml | 4 ---- app/src/main/res/values-mk/strings.xml | 4 ---- app/src/main/res/values-my/strings.xml | 2 -- app/src/main/res/values-nb/strings.xml | 4 ---- app/src/main/res/values-nl/strings.xml | 4 ---- app/src/main/res/values-pl/strings.xml | 4 ---- app/src/main/res/values-pt-rBR/strings.xml | 4 ---- app/src/main/res/values-pt-rPT/strings.xml | 4 ---- app/src/main/res/values-pt/strings.xml | 4 ---- app/src/main/res/values-ro/strings.xml | 4 ---- app/src/main/res/values-ru/strings.xml | 4 ---- app/src/main/res/values-si-rLK/strings.xml | 2 -- app/src/main/res/values-sk/strings.xml | 4 ---- app/src/main/res/values-sr/strings.xml | 4 ---- app/src/main/res/values-sv/strings.xml | 4 ---- app/src/main/res/values-th/strings.xml | 4 ---- app/src/main/res/values-tl/strings.xml | 4 ---- app/src/main/res/values-tr/strings.xml | 4 ---- app/src/main/res/values-uk/strings.xml | 4 ---- app/src/main/res/values-vi/strings.xml | 4 ---- app/src/main/res/values-zh-rCN/strings.xml | 4 ---- app/src/main/res/values-zh-rTW/strings.xml | 4 ---- app/src/main/res/values/strings.xml | 11 ++++------- 102 files changed, 12 insertions(+), 313 deletions(-) diff --git a/app-mini/src/main/res/values-ar/strings.xml b/app-mini/src/main/res/values-ar/strings.xml index d7fd30eb..a8dbc404 100644 --- a/app-mini/src/main/res/values-ar/strings.xml +++ b/app-mini/src/main/res/values-ar/strings.xml @@ -116,8 +116,6 @@ <string name="pref_torrc_title">ترتيبات خاصة بـ torrc</string> <string name="pref_torrc_summary">للخبراء فقط : أدخل أسطر ملف torrc مباشرةً</string> <string name="pref_torrc_dialog">torrc خاص</string> - <string name="kbps">كيلوبيت في الثانية</string> - <string name="mbps">ميغابيت في الثانية</string> <string name="kb">كيلوبايت</string> <string name="mb">ميغابايت</string> <string name="bridges_updated">تم تحديث الجسور</string> diff --git a/app-mini/src/main/res/values-ay/strings.xml b/app-mini/src/main/res/values-ay/strings.xml index aeeedd59..ca0481a8 100644 --- a/app-mini/src/main/res/values-ay/strings.xml +++ b/app-mini/src/main/res/values-ay/strings.xml @@ -119,8 +119,6 @@ <string name="pref_torrc_title">Torrc mayjt\'ayaña</string> <string name="pref_torrc_summary">YATIRINAKATAKIKI: torrc apthapitan chiqak mayjt\'ayam</string> <string name="pref_torrc_dialog">Maynipachpatak Torrc kuttayaña</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Jichhaptayat jalakipañanaka</string> diff --git a/app-mini/src/main/res/values-az/strings.xml b/app-mini/src/main/res/values-az/strings.xml index d67dc076..5f50bf33 100644 --- a/app-mini/src/main/res/values-az/strings.xml +++ b/app-mini/src/main/res/values-az/strings.xml @@ -116,8 +116,6 @@ LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> <string name="pref_torrc_title">Torrc Custom Config</string> <string name="pref_torrc_summary">YALNIZ EKSPERTLƏR: birbaşa torrc config xətlərini daxil edin</string> <string name="pref_torrc_dialog">Custom Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Körpülər yeniləndi</string> diff --git a/app-mini/src/main/res/values-be/strings.xml b/app-mini/src/main/res/values-be/strings.xml index 9533e9c9..462ce5fc 100644 --- a/app-mini/src/main/res/values-be/strings.xml +++ b/app-mini/src/main/res/values-be/strings.xml @@ -119,8 +119,6 @@ <string name="pref_torrc_title">Карыстальніцкія налады Torrc</string> <string name="pref_torrc_summary">ТОЛЬКІ ДЛЯ ЭКСПЕРТАЎ: унясіце налады наўпрост у радкі файла канфігурацыі torrc</string> <string name="pref_torrc_dialog">Карыстальніцкі Torrc</string> - <string name="kbps">кбіт/с</string> - <string name="mbps">мбіт/с</string> <string name="kb">КБ</string> <string name="mb">МБ</string> <string name="bridges_updated">Масты абноўлены</string> diff --git a/app-mini/src/main/res/values-bg/strings.xml b/app-mini/src/main/res/values-bg/strings.xml index 9166a944..90da19be 100644 --- a/app-mini/src/main/res/values-bg/strings.xml +++ b/app-mini/src/main/res/values-bg/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Torrc Custom Config</string> <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТИ: въведи директно torrc конфигурационният код</string> <string name="pref_torrc_dialog">Ръчно настроен Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Мостове включени!</string> diff --git a/app-mini/src/main/res/values-ca/strings.xml b/app-mini/src/main/res/values-ca/strings.xml index 1cea27f3..36e2a1d2 100644 --- a/app-mini/src/main/res/values-ca/strings.xml +++ b/app-mini/src/main/res/values-ca/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Configuració personalitzada del Torrc</string> <string name="pref_torrc_summary">NOMÉS EXPERTS: Escriviu les línies de configuració directa del Torrc</string> <string name="pref_torrc_dialog">Torrc personalitzat</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">S\'han actualitzat els ponts</string> diff --git a/app-mini/src/main/res/values-cs-rCZ/strings.xml b/app-mini/src/main/res/values-cs-rCZ/strings.xml index 4b308812..e9269469 100644 --- a/app-mini/src/main/res/values-cs-rCZ/strings.xml +++ b/app-mini/src/main/res/values-cs-rCZ/strings.xml @@ -114,8 +114,6 @@ <string name="pref_torrc_title">Torrc vstastní konfigurace</string> <string name="pref_torrc_summary">POUZE PRO EXPERTY: zadejte přímo řádky nastavení torrc</string> <string name="pref_torrc_dialog">Vlastní Torrs</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">kB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridge aktualizovány</string> diff --git a/app-mini/src/main/res/values-de/strings.xml b/app-mini/src/main/res/values-de/strings.xml index e6ffbf36..48ec58f3 100644 --- a/app-mini/src/main/res/values-de/strings.xml +++ b/app-mini/src/main/res/values-de/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Benutzerdefinierte Torrc-Konfiguration</string> <string name="pref_torrc_summary">NUR FÜR EXPERTEN: torrc-Konfigurationszeilen direkt eingeben</string> <string name="pref_torrc_dialog">Benutzerdefinierter Torrc</string> - <string name="kbps">Kbit/s</string> - <string name="mbps">Mbit/s</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Brücken Aktualisiert</string> diff --git a/app-mini/src/main/res/values-el/strings.xml b/app-mini/src/main/res/values-el/strings.xml index f1b85e4f..cfff37a8 100644 --- a/app-mini/src/main/res/values-el/strings.xml +++ b/app-mini/src/main/res/values-el/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Torrc Custom Config</string> <string name="pref_torrc_summary">ΜΟΝΟ ΓΙΑ ΕΙΔΙΚΟΥΣ: πληκτρολογήστε απευθείας torrc config γραμμές</string> <string name="pref_torrc_dialog">Προσαρμογή Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Οι γέφυρες ενημερώθηκαν</string> diff --git a/app-mini/src/main/res/values-es-rAR/strings.xml b/app-mini/src/main/res/values-es-rAR/strings.xml index 709fa574..a71184de 100644 --- a/app-mini/src/main/res/values-es-rAR/strings.xml +++ b/app-mini/src/main/res/values-es-rAR/strings.xml @@ -102,8 +102,6 @@ <string name="pref_socks_title">Tor SOCKS</string> <string name="pref_dnsport_title">Puerto DNS Tor</string> <string name="pref_dnsport_dialog">Configuración del Puerto DNS</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="get_bridges_email">Email</string> diff --git a/app-mini/src/main/res/values-es/strings.xml b/app-mini/src/main/res/values-es/strings.xml index f63c64e7..21b80b75 100644 --- a/app-mini/src/main/res/values-es/strings.xml +++ b/app-mini/src/main/res/values-es/strings.xml @@ -121,8 +121,6 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de <string name="pref_torrc_title">Configuración personalizada de torrc</string> <string name="pref_torrc_summary">SÓLO EXPERTOS: Introduzca directamente las líneas de configuración en el fichero torrc</string> <string name="pref_torrc_dialog">torrc personalizado</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridges actualizados</string> diff --git a/app-mini/src/main/res/values-eu/strings.xml b/app-mini/src/main/res/values-eu/strings.xml index 6b952c70..c1d362ad 100644 --- a/app-mini/src/main/res/values-eu/strings.xml +++ b/app-mini/src/main/res/values-eu/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Torrc konfigurazio pertsonala</string> <string name="pref_torrc_summary">ADITUAK BESTERIK EZ: sartu torrc konfigurazio lerroak</string> <string name="pref_torrc_dialog">Torrc pertsonalizatua</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Zubiak eguneratuta</string> diff --git a/app-mini/src/main/res/values-fa/strings.xml b/app-mini/src/main/res/values-fa/strings.xml index de9cf07b..9078e6b5 100644 --- a/app-mini/src/main/res/values-fa/strings.xml +++ b/app-mini/src/main/res/values-fa/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">پیکربندی سفارشی Torrc</string> <string name="pref_torrc_summary">فقط متخصصان: enter direct torrc config lines</string> <string name="pref_torrc_dialog">سفارشی Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridges به روز شدند</string> diff --git a/app-mini/src/main/res/values-fi/strings.xml b/app-mini/src/main/res/values-fi/strings.xml index f0b183c5..73ceb3ac 100644 --- a/app-mini/src/main/res/values-fi/strings.xml +++ b/app-mini/src/main/res/values-fi/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Torrc:n mukautetut asetukset</string> <string name="pref_torrc_summary">VAIN ASIANTUNTIJAT: syötä torrc:n määritysrivejä suoraan</string> <string name="pref_torrc_dialog">Mukautettu torrc</string> - <string name="kbps">kilobittiä per sekunti</string> - <string name="mbps">megabittiä per sekunti</string> <string name="kb">kt</string> <string name="mb">Mt</string> <string name="bridges_updated">Sillat päivitetty</string> diff --git a/app-mini/src/main/res/values-fr-rFR/strings.xml b/app-mini/src/main/res/values-fr-rFR/strings.xml index ad7f5413..601b244c 100644 --- a/app-mini/src/main/res/values-fr-rFR/strings.xml +++ b/app-mini/src/main/res/values-fr-rFR/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Configuration personnalisée de Torrc</string> <string name="pref_torrc_summary">EXPERTS SEULEMENT : saisissez les lignes de configuration de torrc direct</string> <string name="pref_torrc_dialog">Personnaliser Torrc </string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">Ko</string> <string name="mb">Mo</string> <string name="bridges_updated">Ponts mis à jour</string> diff --git a/app-mini/src/main/res/values-fr/strings.xml b/app-mini/src/main/res/values-fr/strings.xml index 9b909234..d5b8edca 100644 --- a/app-mini/src/main/res/values-fr/strings.xml +++ b/app-mini/src/main/res/values-fr/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Configuration personnalisée de Torrc</string> <string name="pref_torrc_summary">EXPERTS SEULEMENT : saisissez les lignes de configuration de torrc direct</string> <string name="pref_torrc_dialog">Personnaliser Torrc </string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">Ko</string> <string name="mb">Mo</string> <string name="bridges_updated">Ponts mis à jour</string> diff --git a/app-mini/src/main/res/values-gl/strings.xml b/app-mini/src/main/res/values-gl/strings.xml index 88ef572a..afa33369 100644 --- a/app-mini/src/main/res/values-gl/strings.xml +++ b/app-mini/src/main/res/values-gl/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Axuste Torrc personalizado</string> <string name="pref_torrc_summary">SO PARA EXPERTAS: introducir liñas de configuración directa torrc</string> <string name="pref_torrc_dialog">Torrc personalizado</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Pontes actualizadas</string> diff --git a/app-mini/src/main/res/values-he/strings.xml b/app-mini/src/main/res/values-he/strings.xml index 6573befe..2e388a24 100644 --- a/app-mini/src/main/res/values-he/strings.xml +++ b/app-mini/src/main/res/values-he/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">תצורה מותאמת אישית של Torrc</string> <string name="pref_torrc_summary">מומחים בלבד: הכנס שורות תצורת torrc ישיר</string> <string name="pref_torrc_dialog">Torrc מותאם אישית</string> - <string name="kbps">ק\"ב/ש</string> - <string name="mbps">מ\"ב/ש</string> <string name="kb">ק\"ב</string> <string name="mb">מ\"ב</string> <string name="bridges_updated">גשרים עודכנו</string> diff --git a/app-mini/src/main/res/values-hi/strings.xml b/app-mini/src/main/res/values-hi/strings.xml index d9fef9c8..5fbee296 100644 --- a/app-mini/src/main/res/values-hi/strings.xml +++ b/app-mini/src/main/res/values-hi/strings.xml @@ -121,8 +121,6 @@ <string name="pref_torrc_title">टोररक कस्टम कॉन्फ़िग</string> <string name="pref_torrc_summary">केवल विशेषज्ञ: प्रत्यक्ष टॉर्च कॉन्फ़िग लाइनें दर्ज करें</string> <string name="pref_torrc_dialog">कस्टम टोररक</string> - <string name="kbps">केबीपीएस</string> - <string name="mbps">एमबीपीएस</string> <string name="kb">कब</string> <string name="mb">मब </string> <string name="bridges_updated">पुल अपडेटेड </string> diff --git a/app-mini/src/main/res/values-hr/strings.xml b/app-mini/src/main/res/values-hr/strings.xml index 8d7d64a7..6b096e51 100644 --- a/app-mini/src/main/res/values-hr/strings.xml +++ b/app-mini/src/main/res/values-hr/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Torrc prilagođena konfiguracija</string> <string name="pref_torrc_summary">SAMO ZA STRUČNJAKE: unesite direktno torrc konfiguracijske linije</string> <string name="pref_torrc_dialog">Prilagođeni Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Mostova ažurirano</string> diff --git a/app-mini/src/main/res/values-hu/strings.xml b/app-mini/src/main/res/values-hu/strings.xml index a96cedd1..7650c8be 100644 --- a/app-mini/src/main/res/values-hu/strings.xml +++ b/app-mini/src/main/res/values-hu/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Torrc egyedi konfiguráció</string> <string name="pref_torrc_summary">CSAK SZAKÉRTŐKNEK: torrc konfigurációs sorok közvetlen beírása</string> <string name="pref_torrc_dialog">Egyedi Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Hidak frissítve</string> diff --git a/app-mini/src/main/res/values-id/strings.xml b/app-mini/src/main/res/values-id/strings.xml index 33770a27..5f3dcb8a 100644 --- a/app-mini/src/main/res/values-id/strings.xml +++ b/app-mini/src/main/res/values-id/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Konfigurasi Torrc</string> <string name="pref_torrc_summary">HANYA UNTUK AHLI: masukkan baris konfigurasi direct Torrc</string> <string name="pref_torrc_dialog">Torrc Custom</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridge Telah Diperbarui</string> diff --git a/app-mini/src/main/res/values-in-rID/strings.xml b/app-mini/src/main/res/values-in-rID/strings.xml index e1dbef8b..00d78343 100644 --- a/app-mini/src/main/res/values-in-rID/strings.xml +++ b/app-mini/src/main/res/values-in-rID/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Konfigurasi Torrc</string> <string name="pref_torrc_summary">HANYA UNTUK AHLI: masukkan baris konfigurasi direct Torrc</string> <string name="pref_torrc_dialog">Torrc Custom</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridge Telah Diperbarui</string> diff --git a/app-mini/src/main/res/values-is/strings.xml b/app-mini/src/main/res/values-is/strings.xml index 1fdf58ab..7db32d11 100644 --- a/app-mini/src/main/res/values-is/strings.xml +++ b/app-mini/src/main/res/values-is/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Sérsniðnar stillingar Torrc</string> <string name="pref_torrc_summary">AÐEINS SÉRFRÆÐINGAR: sláðu inn stillingarlínur beint í torrc</string> <string name="pref_torrc_dialog">Sérsniðið Torrc</string> - <string name="kbps">kb/sek</string> - <string name="mbps">mb/sek</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Brýr uppfærðar</string> diff --git a/app-mini/src/main/res/values-it/strings.xml b/app-mini/src/main/res/values-it/strings.xml index 2606154c..46394b42 100644 --- a/app-mini/src/main/res/values-it/strings.xml +++ b/app-mini/src/main/res/values-it/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Configurazioni personalizzate di Torrc</string> <string name="pref_torrc_summary">SOLO ESPERTI: inserisci direttamente configurazioni torrc</string> <string name="pref_torrc_dialog">Torrc personalizzate</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridge attivati</string> diff --git a/app-mini/src/main/res/values-iw/strings.xml b/app-mini/src/main/res/values-iw/strings.xml index e8dbb353..3534083b 100644 --- a/app-mini/src/main/res/values-iw/strings.xml +++ b/app-mini/src/main/res/values-iw/strings.xml @@ -94,8 +94,6 @@ <string name="pref_transport_title">Tor TransProxy Port</string> <string name="pref_transport_dialog">הגדרת הפורט של TransProxy</string> <string name="pref_dnsport_title">Tor DNS Port</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="menu_qr">קוד QR</string> diff --git a/app-mini/src/main/res/values-ja/strings.xml b/app-mini/src/main/res/values-ja/strings.xml index a6f82937..b3c7ea44 100644 --- a/app-mini/src/main/res/values-ja/strings.xml +++ b/app-mini/src/main/res/values-ja/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Torrc カスタム設定</string> <string name="pref_torrc_summary">上級者家のみ: 直接torrc設定行を入力します</string> <string name="pref_torrc_dialog">Torrcをカスタム</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">ブリッジを更新しました</string> diff --git a/app-mini/src/main/res/values-ko/strings.xml b/app-mini/src/main/res/values-ko/strings.xml index d064dbf0..b99be824 100644 --- a/app-mini/src/main/res/values-ko/strings.xml +++ b/app-mini/src/main/res/values-ko/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">사용자 지정 Torrc 구성</string> <string name="pref_torrc_summary">전문가 전용: torrc 구성 줄을 직접 입력합니다</string> <string name="pref_torrc_dialog">나만의 Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">브릿지가 업데이트되었습니다</string> diff --git a/app-mini/src/main/res/values-lv/strings.xml b/app-mini/src/main/res/values-lv/strings.xml index c8f912f7..cc9ec1d8 100644 --- a/app-mini/src/main/res/values-lv/strings.xml +++ b/app-mini/src/main/res/values-lv/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Torrc pielāgota konfigurēšana</string> <string name="pref_torrc_summary">VIENĪGI EKSPERTIEM: tieši ievadīt torrc konfigurēšanas rindas</string> <string name="pref_torrc_dialog">Pielāgot Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Tilti ir atjaunināti</string> diff --git a/app-mini/src/main/res/values-mk/strings.xml b/app-mini/src/main/res/values-mk/strings.xml index 112f8c27..50a7b299 100644 --- a/app-mini/src/main/res/values-mk/strings.xml +++ b/app-mini/src/main/res/values-mk/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Прилагодено поставување на torrc</string> <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТИ: внесете директни команди за поставување на torrc</string> <string name="pref_torrc_dialog">Прилагоден torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Ажурирани мостови</string> diff --git a/app-mini/src/main/res/values-nb/strings.xml b/app-mini/src/main/res/values-nb/strings.xml index 1e96243d..d9854d16 100644 --- a/app-mini/src/main/res/values-nb/strings.xml +++ b/app-mini/src/main/res/values-nb/strings.xml @@ -117,8 +117,6 @@ <string name="pref_torrc_title">Egendefinert torrc-oppsett</string> <string name="pref_torrc_summary">BARE FOR EKSPERTER: skriv inn direkte torrc-oppsettslinjer</string> <string name="pref_torrc_dialog">Egendefinert torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Broer oppdatert</string> diff --git a/app-mini/src/main/res/values-nl/strings.xml b/app-mini/src/main/res/values-nl/strings.xml index 0384bba0..db5cb256 100644 --- a/app-mini/src/main/res/values-nl/strings.xml +++ b/app-mini/src/main/res/values-nl/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Torrc aangepaste configuratie</string> <string name="pref_torrc_summary">ENKEL VOOR GEVORDERDEN: voer rechtstreeks torrc-configuratieregels in</string> <string name="pref_torrc_dialog">Aangepaste Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridges bijgewerkt</string> diff --git a/app-mini/src/main/res/values-pl/strings.xml b/app-mini/src/main/res/values-pl/strings.xml index 537cb01e..77020281 100644 --- a/app-mini/src/main/res/values-pl/strings.xml +++ b/app-mini/src/main/res/values-pl/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Konfiguracja Torrc klienta</string> <string name="pref_torrc_summary">TYLKO DLA EKSPERTÓW: wpisz linijki konfiguracyjne torrc</string> <string name="pref_torrc_dialog">Torrc klienta</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Zaktualizowane Bridges</string> diff --git a/app-mini/src/main/res/values-pt-rBR/strings.xml b/app-mini/src/main/res/values-pt-rBR/strings.xml index fe77e9bb..c9139bbf 100644 --- a/app-mini/src/main/res/values-pt-rBR/strings.xml +++ b/app-mini/src/main/res/values-pt-rBR/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Config Personalizada do Torrc</string> <string name="pref_torrc_summary">SOMENTE EXPERIENTES: adicione sua própria linha de configuração torrc</string> <string name="pref_torrc_dialog">Torrc Personalizado</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Pontes Atualizadas</string> diff --git a/app-mini/src/main/res/values-pt-rPT/strings.xml b/app-mini/src/main/res/values-pt-rPT/strings.xml index 31b869c8..06d7e7d8 100644 --- a/app-mini/src/main/res/values-pt-rPT/strings.xml +++ b/app-mini/src/main/res/values-pt-rPT/strings.xml @@ -47,8 +47,6 @@ <string name="set_locale_title">idioma</string> <string name="pref_socks_title">SOCKS do Tor</string> <string name="pref_dnsport_title">Porta DNS do Tor</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="menu_qr">Códigos QR</string> diff --git a/app-mini/src/main/res/values-pt/strings.xml b/app-mini/src/main/res/values-pt/strings.xml index f10f226e..4a18c10f 100644 --- a/app-mini/src/main/res/values-pt/strings.xml +++ b/app-mini/src/main/res/values-pt/strings.xml @@ -70,8 +70,6 @@ <string name="updating_settings_in_tor_service">a atualizar as definições no serviço Tor</string> <string name="pref_socks_title">SOCKS Tor</string> <string name="pref_dnsport_title">Porta DNS Tor</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Pontes Atualizadas</string> diff --git a/app-mini/src/main/res/values-ro/strings.xml b/app-mini/src/main/res/values-ro/strings.xml index c467b1e7..ed16bea2 100644 --- a/app-mini/src/main/res/values-ro/strings.xml +++ b/app-mini/src/main/res/values-ro/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Configurare personalizată Torrc</string> <string name="pref_torrc_summary">PENTRU EXPERŢI: introdu direct liniile de configurare ale torrc</string> <string name="pref_torrc_dialog">Torrc Personalizat</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Punţi activate</string> diff --git a/app-mini/src/main/res/values-ru/strings.xml b/app-mini/src/main/res/values-ru/strings.xml index a96d664b..0cd94d2c 100644 --- a/app-mini/src/main/res/values-ru/strings.xml +++ b/app-mini/src/main/res/values-ru/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Пользовательские настройки Torrc</string> <string name="pref_torrc_summary">ТОЛЬКО ДЛЯ ЭКСПЕРТОВ: внесите настройки напрямую в строки файла конфигурации torrc</string> <string name="pref_torrc_dialog">Пользовательский Torrc</string> - <string name="kbps">кбит/с</string> - <string name="mbps">мбит/с</string> <string name="kb">КБ</string> <string name="mb">МБ</string> <string name="bridges_updated">Мосты обновлены</string> diff --git a/app-mini/src/main/res/values-sk/strings.xml b/app-mini/src/main/res/values-sk/strings.xml index 4e9309b1..7f1fec5a 100644 --- a/app-mini/src/main/res/values-sk/strings.xml +++ b/app-mini/src/main/res/values-sk/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Vlastné nastavenie Torrc</string> <string name="pref_torrc_summary">LEN PRE EXPERTOV: vložiť priamo riadky nastavenia torrc</string> <string name="pref_torrc_dialog">Vlasné Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Premostenia aktualizované</string> diff --git a/app-mini/src/main/res/values-sr/strings.xml b/app-mini/src/main/res/values-sr/strings.xml index 67ca4867..f745b39b 100644 --- a/app-mini/src/main/res/values-sr/strings.xml +++ b/app-mini/src/main/res/values-sr/strings.xml @@ -118,8 +118,6 @@ <string name="pref_torrc_title">Torrc Прерађена Подешавања</string> <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТЕ: унети директно torrc линије подешавања</string> <string name="pref_torrc_dialog">Подеси Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridges Ажурирање</string> diff --git a/app-mini/src/main/res/values-sv/strings.xml b/app-mini/src/main/res/values-sv/strings.xml index 1605d2b2..80518ff2 100644 --- a/app-mini/src/main/res/values-sv/strings.xml +++ b/app-mini/src/main/res/values-sv/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Torrc anpassad konfiguration</string> <string name="pref_torrc_summary">ENDAST EXPERTER: ange torrc konfiguration direkt</string> <string name="pref_torrc_dialog">Anpassad Torrc</string> - <string name="kbps">kb/s</string> - <string name="mbps">mb/s</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bryggor uppdaterade</string> diff --git a/app-mini/src/main/res/values-th/strings.xml b/app-mini/src/main/res/values-th/strings.xml index cc076900..36996761 100644 --- a/app-mini/src/main/res/values-th/strings.xml +++ b/app-mini/src/main/res/values-th/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">กำหนดค่า Torrc เอง</string> <string name="pref_torrc_summary">สำหรับผู้เชี่ยวชาญเท่านั้น: ระบุบรรทัดที่กำหนดค่า torcc โดยตรง</string> <string name="pref_torrc_dialog">Torrc ที่กำหนดเอง</string> - <string name="kbps">กิโลบิตต่อวินาที</string> - <string name="mbps">เมกะบิตต่อวินาที</string> <string name="kb">กิโลไบต์</string> <string name="mb">เมกะไบต์</string> <string name="bridges_updated">ปรับปรุง Bridges แล้ว</string> diff --git a/app-mini/src/main/res/values-tl/strings.xml b/app-mini/src/main/res/values-tl/strings.xml index a7f6287f..0ac1f22a 100644 --- a/app-mini/src/main/res/values-tl/strings.xml +++ b/app-mini/src/main/res/values-tl/strings.xml @@ -100,8 +100,6 @@ <string name="pref_disable_network_title">Walang Auto-Sleep sa Network</string> <string name="pref_disable_network_summary">Ilagay ang Tor sa sleep kapag walang internet na pwede</string> <string name="newnym">Ikaw ay nagpalit ng bagong pagkakakilanlan sa Tor!</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="get_bridges_email">Email</string> diff --git a/app-mini/src/main/res/values-tr/strings.xml b/app-mini/src/main/res/values-tr/strings.xml index 139c1b01..aff7c371 100644 --- a/app-mini/src/main/res/values-tr/strings.xml +++ b/app-mini/src/main/res/values-tr/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Özel Torrc Ayarları</string> <string name="pref_torrc_summary">UZMANLAR İÇİN: torrc ayar satırlarını doğrudan yazın</string> <string name="pref_torrc_dialog">Özel Torrc Ayarları</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Köprüler Güncellendi</string> diff --git a/app-mini/src/main/res/values-uk/strings.xml b/app-mini/src/main/res/values-uk/strings.xml index be4e0c6b..6d079faf 100644 --- a/app-mini/src/main/res/values-uk/strings.xml +++ b/app-mini/src/main/res/values-uk/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Додаткові налаштування Torrc</string> <string name="pref_torrc_summary">ЛИШЕ ДЛЯ ЕКСПЕРТІВ: введіть безпосередні рядки налаштувань torrc</string> <string name="pref_torrc_dialog">Додаткове у Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Мости оновлено</string> diff --git a/app-mini/src/main/res/values-vi/strings.xml b/app-mini/src/main/res/values-vi/strings.xml index 1922a77f..ca6d5626 100644 --- a/app-mini/src/main/res/values-vi/strings.xml +++ b/app-mini/src/main/res/values-vi/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Cấu hình tùy chỉnh cho Torrc</string> <string name="pref_torrc_summary">CHỈ NGƯỜI DÙNG CHUYÊN MÔN: nhập các thiết lập trực tiếp cho torrc</string> <string name="pref_torrc_dialog">Torrc tùy chỉnh</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridge được cập nhật</string> diff --git a/app-mini/src/main/res/values-zh-rCN/strings.xml b/app-mini/src/main/res/values-zh-rCN/strings.xml index 87b84171..8fb6a562 100644 --- a/app-mini/src/main/res/values-zh-rCN/strings.xml +++ b/app-mini/src/main/res/values-zh-rCN/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Torrc 自定义配置</string> <string name="pref_torrc_summary">仅供专家：直接输入 torrc 配置行</string> <string name="pref_torrc_dialog">自定义 Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">网桥已更新</string> diff --git a/app-mini/src/main/res/values-zh-rTW/strings.xml b/app-mini/src/main/res/values-zh-rTW/strings.xml index 9422f6b4..40724ef2 100644 --- a/app-mini/src/main/res/values-zh-rTW/strings.xml +++ b/app-mini/src/main/res/values-zh-rTW/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Torrc 自訂設置</string> <string name="pref_torrc_summary">僅限專家：輸入 torrc 設定指令</string> <string name="pref_torrc_dialog">自訂 Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">網橋已更新</string> diff --git a/app-mini/src/main/res/values/strings.xml b/app-mini/src/main/res/values/strings.xml index 919b2126..9d4af5fa 100644 --- a/app-mini/src/main/res/values/strings.xml +++ b/app-mini/src/main/res/values/strings.xml @@ -147,10 +147,6 @@ <string name="pref_torrc_dialog">Custom Torrc</string> - <string name="kbps">kbps</string> - - <string name="mbps">mbps</string> - <string name="kb">KB</string> <string name="mb">MB</string> diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 302154de..bab82a5d 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -1066,29 +1066,29 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan private String formatCount(long count) { NumberFormat numberFormat = NumberFormat.getInstance(Locale.getDefault()); // Converts the supplied argument into a string. - // Under 2Mb, returns "xxx.xKb" - // Over 2Mb, returns "xxx.xxMb" + // Under 2 mebibytes, returns "xxx.xKiB/s" + // Over 2 mebibytes, returns "xxx.xxMiB/s" if (count < 1e6) return numberFormat.format(Math.round(((float) ((int) (count * 10 / 1024)) / 10))) - + getString(R.string.kbps); + + getString(R.string.kibibyte_per_second); else return numberFormat.format(Math .round(((float) ((int) (count * 100 / 1024 / 1024)) / 100))) - + getString(R.string.mbps); + + getString(R.string.mebibyte_per_second); } private String formatTotal(long count) { NumberFormat numberFormat = NumberFormat.getInstance(Locale.getDefault()); // Converts the supplied argument into a string. - // Under 2Mb, returns "xxx.xKb" - // Over 2Mb, returns "xxx.xxMb" + // Under 2MiB, returns "xxx.xKiB" + // Over 2MiB, returns "xxx.xxMiB" if (count < 1e6) return numberFormat.format(Math.round(((float) ((int) (count * 10 / 1024)) / 10))) - + getString(R.string.kb); + + getString(R.string.kibibyte); else return numberFormat.format(Math .round(((float) ((int) (count * 100 / 1024 / 1024)) / 100))) - + getString(R.string.mb); + + getString(R.string.mebibyte); } private void requestNewTorIdentity() { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 54636f35..df4fdf7b 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -115,10 +115,6 @@ <string name="pref_torrc_title">ترتيبات خاصة بـ torrc</string> <string name="pref_torrc_summary">للخبراء فقط : أدخل أسطر ملف torrc مباشرةً</string> <string name="pref_torrc_dialog">torrc خاص</string> - <string name="kbps">كيلوبيت في الثانية</string> - <string name="mbps">ميغابيت في الثانية</string> - <string name="kb">كيلوبايت</string> - <string name="mb">ميغابايت</string> <string name="bridges_updated">تم تحديث الجسور</string> <string name="restart_orbot_to_use_this_bridge_">الرجاء إعادة تشغيل أوربوت لتفعيل التعديلات</string> <string name="menu_qr">رمز كيو آر</string> diff --git a/app/src/main/res/values-ay/strings.xml b/app/src/main/res/values-ay/strings.xml index f5da93b7..d62954ca 100644 --- a/app/src/main/res/values-ay/strings.xml +++ b/app/src/main/res/values-ay/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Torrc mayjt\'ayaña</string> <string name="pref_torrc_summary">YATIRINAKATAKIKI: torrc apthapitan chiqak mayjt\'ayam</string> <string name="pref_torrc_dialog">Maynipachpatak Torrc kuttayaña</string> - <string name="kbps">KBps</string> - <string name="mbps">MBps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Jichhaptayat jalakipañanaka</string> <string name="restart_orbot_to_use_this_bridge_">Mayjt\'ayatanak aqtayañatak Orbot mayamp qhant\'ayam, amp suma</string> <string name="menu_qr">QR chimpunaka</string> diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 266a754a..88160da4 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -115,10 +115,6 @@ LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> <string name="pref_torrc_title">Torrc Custom Config</string> <string name="pref_torrc_summary">YALNIZ EKSPERTLƏR: birbaşa torrc config xətlərini daxil edin</string> <string name="pref_torrc_dialog">Custom Torrc</string> - <string name="kbps">KBps</string> - <string name="mbps">MBps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Körpülər yeniləndi</string> <string name="restart_orbot_to_use_this_bridge_">Lütfən, Orbotu söndürün və yenidən yandırın ki, dəyişikliklər tətbiq edilsin.</string> <string name="menu_qr">QR kodlar</string> diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 7d3f2907..fee628e6 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Карыстальніцкія налады Torrc</string> <string name="pref_torrc_summary">ТОЛЬКІ ДЛЯ ЭКСПЕРТАЎ: унясіце налады наўпрост у радкі файла канфігурацыі torrc</string> <string name="pref_torrc_dialog">Карыстальніцкі Torrc</string> - <string name="kbps">кбіт/с</string> - <string name="mbps">мбіт/с</string> - <string name="kb">КБ</string> - <string name="mb">МБ</string> <string name="bridges_updated">Масты абноўлены</string> <string name="restart_orbot_to_use_this_bridge_">Калі ласка, перазапусціце Orbot для ўступу змены ў сілу</string> <string name="menu_qr">QR-коды</string> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 2d4c6f86..f0bfdf89 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Torrc Custom Config</string> <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТИ: въведи директно torrc конфигурационният код</string> <string name="pref_torrc_dialog">Ръчно настроен Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Мостове включени!</string> <string name="restart_orbot_to_use_this_bridge_">Моля, рестартирай Orbot, за да влязат в действие промените</string> <string name="menu_qr">QR Кодове</string> diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 0f353372..d5b05e23 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Configuració personalitzada del Torrc</string> <string name="pref_torrc_summary">NOMÉS EXPERTS: Escriviu les línies de configuració directa del Torrc</string> <string name="pref_torrc_dialog">Torrc personalitzat</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">S\'han actualitzat els ponts</string> <string name="restart_orbot_to_use_this_bridge_">Reinicieu l\'Orbot per aplicar els canvis</string> <string name="menu_qr">Codis QR</string> diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index b262d02d..dca66e74 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -112,10 +112,6 @@ <string name="pref_torrc_title">Torrc vstastní konfigurace</string> <string name="pref_torrc_summary">POUZE PRO EXPERTY: zadejte přímo řádky nastavení torrc</string> <string name="pref_torrc_dialog">Vlastní Torrs</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">kB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridge aktualizovány</string> <string name="restart_orbot_to_use_this_bridge_">Pro projevení změn restartujte Orbot</string> <string name="menu_qr">QR kódy</string> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 5263007f..955f757c 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -92,8 +92,6 @@ <string name="pref_use_persistent_notifications">Vis altid ikonet i statuslinien når Orbot er forbundet til netværket</string> <string name="pref_use_persistent_notifications_title">Vis altid notifikationer</string> <string name="set_locale_title">Sprog</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="get_bridges_email">Mail</string> <string name="hidden_services">Skjulte tjenester</string> <string name="title_activity_hidden_services">Skjulte tjenester</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 993a9266..e563d7d5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Benutzerdefinierte Torrc-Konfiguration</string> <string name="pref_torrc_summary">NUR FÜR EXPERTEN: torrc-Konfigurationszeilen direkt eingeben</string> <string name="pref_torrc_dialog">Benutzerdefinierter Torrc</string> - <string name="kbps">Kbit/s</string> - <string name="mbps">Mbit/s</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Brücken Aktualisiert</string> <string name="restart_orbot_to_use_this_bridge_">Bitte Tor Erneut Starten um die Änderungen wirksam werden zu lassen</string> <string name="menu_qr">QR Codes</string> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c900d1c0..2664399a 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Torrc Custom Config</string> <string name="pref_torrc_summary">ΜΟΝΟ ΓΙΑ ΕΙΔΙΚΟΥΣ: πληκτρολογήστε απευθείας torrc config γραμμές</string> <string name="pref_torrc_dialog">Προσαρμογή Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Οι γέφυρες ενημερώθηκαν</string> <string name="restart_orbot_to_use_this_bridge_">Παρακαλούμε επανεκκινήστε το Orbot για να ενεργοποιήσετε τις αλλαγές</string> <string name="menu_qr">Κώδικες QR</string> diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml index daeb0304..ee14d5ec 100644 --- a/app/src/main/res/values-es-rAR/strings.xml +++ b/app/src/main/res/values-es-rAR/strings.xml @@ -100,10 +100,6 @@ <string name="pref_socks_title">Tor SOCKS</string> <string name="pref_dnsport_title">Puerto DNS Tor</string> <string name="pref_dnsport_dialog">Configuración del Puerto DNS</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="get_bridges_email">Email</string> <string name="save">Guardar</string> <string name="name">Nombre</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 132dc1ac..244d2d25 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -119,10 +119,6 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de <string name="pref_torrc_title">Configuración personalizada de torrc</string> <string name="pref_torrc_summary">SÓLO EXPERTOS: Introduzca directamente las líneas de configuración en el fichero torrc</string> <string name="pref_torrc_dialog">torrc personalizado</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridges actualizados</string> <string name="restart_orbot_to_use_this_bridge_">Por favor, reinicie Orbot para habilitar los cambios</string> <string name="menu_qr">Códigos QR</string> diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 5923d4ee..66e8c156 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Torrc konfigurazio pertsonala</string> <string name="pref_torrc_summary">ADITUAK BESTERIK EZ: sartu torrc konfigurazio lerroak</string> <string name="pref_torrc_dialog">Torrc pertsonalizatua</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Zubiak eguneratuta</string> <string name="restart_orbot_to_use_this_bridge_">Berrabiarazi Orbot aldaketak aplikatzeko</string> <string name="menu_qr">QR Kodeak</string> diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 5122b88d..f2cdead5 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">پیکربندی سفارشی Torrc</string> <string name="pref_torrc_summary">فقط متخصصان: enter direct torrc config lines</string> <string name="pref_torrc_dialog">سفارشی Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridges به روز شدند</string> <string name="restart_orbot_to_use_this_bridge_">برای فعال کردن تغییرات لطفا Orbot را راه اندازی مجدد کنید</string> <string name="menu_qr">کدهای QR</string> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 9f4228cb..1aa74953 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Torrc:n mukautetut asetukset</string> <string name="pref_torrc_summary">VAIN ASIANTUNTIJAT: syötä torrc:n määritysrivejä suoraan</string> <string name="pref_torrc_dialog">Mukautettu torrc</string> - <string name="kbps">kilobittiä per sekunti</string> - <string name="mbps">megabittiä per sekunti</string> - <string name="kb">kt</string> - <string name="mb">Mt</string> <string name="bridges_updated">Sillat päivitetty</string> <string name="restart_orbot_to_use_this_bridge_">Käynnistä Orbot uudelleen ottaaksesi muutokset käyttöön</string> <string name="menu_qr">QR-koodit</string> diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 67b8e006..27922dca 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Configuration personnalisée de Torrc</string> <string name="pref_torrc_summary">EXPERTS SEULEMENT : saisissez les lignes de configuration de torrc direct</string> <string name="pref_torrc_dialog">Personnaliser Torrc </string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">Ko</string> - <string name="mb">Mo</string> <string name="bridges_updated">Ponts mis à jour</string> <string name="restart_orbot_to_use_this_bridge_">Veuillez redémarrer Orbot pour activer les changements</string> <string name="menu_qr">Codes QR</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 005b1b45..46bafec3 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Configuration personnalisée de Torrc</string> <string name="pref_torrc_summary">EXPERTS SEULEMENT : saisissez les lignes de configuration de torrc direct</string> <string name="pref_torrc_dialog">Personnaliser Torrc </string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">Ko</string> - <string name="mb">Mo</string> <string name="bridges_updated">Ponts mis à jour</string> <string name="restart_orbot_to_use_this_bridge_">Veuillez redémarrer Orbot pour activer les changements</string> <string name="menu_qr">Codes QR</string> diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 5f7bb235..0b3ec278 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Axuste Torrc personalizado</string> <string name="pref_torrc_summary">SO PARA EXPERTAS: introducir liñas de configuración directa torrc</string> <string name="pref_torrc_dialog">Torrc personalizado</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Pontes actualizadas</string> <string name="restart_orbot_to_use_this_bridge_">Por favor, reinicie Orbot para activar os cambios</string> <string name="menu_qr">Códigod QR</string> diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index d0d918d7..484131cf 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">תצורה מותאמת אישית של Torrc</string> <string name="pref_torrc_summary">מומחים בלבד: הכנס שורות תצורת torrc ישיר</string> <string name="pref_torrc_dialog">Torrc מותאם אישית</string> - <string name="kbps">ק\"ב/ש</string> - <string name="mbps">מ\"ב/ש</string> - <string name="kb">ק\"ב</string> - <string name="mb">מ\"ב</string> <string name="bridges_updated">גשרים עודכנו</string> <string name="restart_orbot_to_use_this_bridge_">אנא הפעל מחדש את Orbot כדי לאפשר את השינויים</string> <string name="menu_qr">קודי QR</string> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 7425c540..1c605f74 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -119,10 +119,6 @@ <string name="pref_torrc_title">टोररक कस्टम कॉन्फ़िग</string> <string name="pref_torrc_summary">केवल विशेषज्ञ: प्रत्यक्ष टॉर्च कॉन्फ़िग लाइनें दर्ज करें</string> <string name="pref_torrc_dialog">कस्टम टोररक</string> - <string name="kbps">केबीपीएस</string> - <string name="mbps">एमबीपीएस</string> - <string name="kb">कब</string> - <string name="mb">मब </string> <string name="bridges_updated">पुल अपडेटेड </string> <string name="restart_orbot_to_use_this_bridge_">परिवर्तन सक्षम करने के लिए Orbot पुनः प्रारंभ करें</string> <string name="menu_qr">QR कोड</string> diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index a6cfecca..be6aa908 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Torrc prilagođena konfiguracija</string> <string name="pref_torrc_summary">SAMO ZA STRUČNJAKE: unesite direktno torrc konfiguracijske linije</string> <string name="pref_torrc_dialog">Prilagođeni Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Mostova ažurirano</string> <string name="restart_orbot_to_use_this_bridge_">Ponovno pokrenite Orbot da bi omogućili promjene</string> <string name="menu_qr">QR kodovi</string> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 23a13203..84cac672 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Torrc egyedi konfiguráció</string> <string name="pref_torrc_summary">CSAK SZAKÉRTŐKNEK: torrc konfigurációs sorok közvetlen beírása</string> <string name="pref_torrc_dialog">Egyedi Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Hidak frissítve</string> <string name="restart_orbot_to_use_this_bridge_">Kérlek indítsd újra az Orbot-ot a változások engedélyezéséhez</string> <string name="menu_qr">QR kódok</string> diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index b00d1ac9..92576335 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Konfigurasi Torrc</string> <string name="pref_torrc_summary">HANYA UNTUK AHLI: masukkan baris konfigurasi direct Torrc</string> <string name="pref_torrc_dialog">Torrc Custom</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridge Telah Diperbarui</string> <string name="restart_orbot_to_use_this_bridge_">Silakan start ulang Orbot untuk mengaktifkan perubahan</string> <string name="menu_qr">Kode QR</string> diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index b5bc11c3..45885348 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Konfigurasi Torrc</string> <string name="pref_torrc_summary">HANYA UNTUK AHLI: masukkan baris konfigurasi direct Torrc</string> <string name="pref_torrc_dialog">Torrc Custom</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridge Telah Diperbarui</string> <string name="restart_orbot_to_use_this_bridge_">Silakan start ulang Orbot untuk mengaktifkan perubahan</string> <string name="menu_qr">Kode QR</string> diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index cae63586..51dec2be 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Sérsniðnar stillingar Torrc</string> <string name="pref_torrc_summary">AÐEINS SÉRFRÆÐINGAR: sláðu inn stillingarlínur beint í torrc</string> <string name="pref_torrc_dialog">Sérsniðið Torrc</string> - <string name="kbps">kb/sek</string> - <string name="mbps">mb/sek</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Brýr uppfærðar</string> <string name="restart_orbot_to_use_this_bridge_">Endurræstu Orbot til að breytingarnar taki gildi</string> <string name="menu_qr">QR-kóðar</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index aedee7b2..09989198 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Configurazioni personalizzate di Torrc</string> <string name="pref_torrc_summary">SOLO ESPERTI: inserisci direttamente configurazioni torrc</string> <string name="pref_torrc_dialog">Torrc personalizzate</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridge attivati</string> <string name="restart_orbot_to_use_this_bridge_">Per favore riavvia Orbot per rendere effettive le modifiche</string> <string name="menu_qr">Codici QR</string> diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index df55cd70..c772f2b7 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -92,10 +92,6 @@ <string name="pref_transport_title">Tor TransProxy Port</string> <string name="pref_transport_dialog">הגדרת הפורט של TransProxy</string> <string name="pref_dnsport_title">Tor DNS Port</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="menu_qr">קוד QR</string> <string name="get_bridges_email">דוא\"ל</string> <string name="send_email">שלח דוא\"ל</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9f48da09..120ac13c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Torrc カスタム設定</string> <string name="pref_torrc_summary">上級者家のみ: 直接torrc設定行を入力します</string> <string name="pref_torrc_dialog">Torrcをカスタム</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">ブリッジを更新しました</string> <string name="restart_orbot_to_use_this_bridge_">変更を有効にするにはOrbotを再起動してください</string> <string name="menu_qr">QRコード</string> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 1c51ec2d..3d169dcd 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">사용자 지정 Torrc 구성</string> <string name="pref_torrc_summary">전문가 전용: torrc 구성 줄을 직접 입력합니다</string> <string name="pref_torrc_dialog">나만의 Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">브릿지가 업데이트되었습니다</string> <string name="restart_orbot_to_use_this_bridge_">변경을 완료하려면 Orbot을 재시작하세요</string> <string name="menu_qr">QR 코드</string> diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 67df6a13..3c752274 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Torrc pielāgota konfigurēšana</string> <string name="pref_torrc_summary">VIENĪGI EKSPERTIEM: tieši ievadīt torrc konfigurēšanas rindas</string> <string name="pref_torrc_dialog">Pielāgot Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Tilti ir atjaunināti</string> <string name="restart_orbot_to_use_this_bridge_">Lūdzu pārstartējiet Orbot, lai iespējotu izmaiņas</string> <string name="menu_qr">QR kodi</string> diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index e3cf7015..530b2183 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Прилагодено поставување на torrc</string> <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТИ: внесете директни команди за поставување на torrc</string> <string name="pref_torrc_dialog">Прилагоден torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Ажурирани мостови</string> <string name="restart_orbot_to_use_this_bridge_">Ве молиме повторно стартувајте го Orbot за да се овозможат промените</string> <string name="menu_qr">QR-кодови</string> diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml index d9456370..c2a6e7bd 100644 --- a/app/src/main/res/values-my/strings.xml +++ b/app/src/main/res/values-my/strings.xml @@ -18,8 +18,6 @@  <string name="error">ချို့ယွင်းချက်</string> <string name="set_locale_title">ဘာသာစကား</string> - <string name="kb">ကီလိုဘိုက်</string> - <string name="mb">မဂ္ဂါဘိုက်</string> <string name="get_bridges_email">အီးေမးလ္</string> <string name="hidden_services">Hidden Services</string> <string name="title_activity_hidden_services">Hidden Services</string> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 847f8a37..8810cd38 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -115,10 +115,6 @@ <string name="pref_torrc_title">Egendefinert torrc-oppsett</string> <string name="pref_torrc_summary">BARE FOR EKSPERTER: skriv inn direkte torrc-oppsettslinjer</string> <string name="pref_torrc_dialog">Egendefinert torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Broer oppdatert</string> <string name="restart_orbot_to_use_this_bridge_">Gjør omstart av Orbot før endringer trer i kraft</string> <string name="menu_qr">QR-koder</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 45fae346..815a9a2b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Torrc aangepaste configuratie</string> <string name="pref_torrc_summary">ENKEL VOOR GEVORDERDEN: voer rechtstreeks torrc-configuratieregels in</string> <string name="pref_torrc_dialog">Aangepaste Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridges bijgewerkt</string> <string name="restart_orbot_to_use_this_bridge_">Herstart Orbot om de wijzigingen in te schakelen</string> <string name="menu_qr">QR-codes</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 0f2cb6fe..521f319e 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Konfiguracja Torrc klienta</string> <string name="pref_torrc_summary">TYLKO DLA EKSPERTÓW: wpisz linijki konfiguracyjne torrc</string> <string name="pref_torrc_dialog">Torrc klienta</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Zaktualizowane Bridges</string> <string name="restart_orbot_to_use_this_bridge_">Proszę zrestartować Orbot, aby zmiany mogły wejść w życie</string> <string name="menu_qr">Kody QR</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7214addd..35e4f594 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Config Personalizada do Torrc</string> <string name="pref_torrc_summary">SOMENTE EXPERIENTES: adicione sua própria linha de configuração torrc</string> <string name="pref_torrc_dialog">Torrc Personalizado</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Pontes Atualizadas</string> <string name="restart_orbot_to_use_this_bridge_">Por favor reinicie Orbot para habilitar as mundanças</string> <string name="menu_qr">QR Codes</string> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index f2b53796..aeb1e6c8 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -45,10 +45,6 @@ <string name="set_locale_title">idioma</string> <string name="pref_socks_title">SOCKS do Tor</string> <string name="pref_dnsport_title">Porta DNS do Tor</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="menu_qr">Códigos QR</string> <string name="get_bridges_email">E-mail</string> <string name="send_email">Enviar Mensagem</string> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 60224208..5f7c7c48 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -68,10 +68,6 @@ <string name="updating_settings_in_tor_service">a atualizar as definições no serviço Tor</string> <string name="pref_socks_title">SOCKS Tor</string> <string name="pref_dnsport_title">Porta DNS Tor</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Pontes Atualizadas</string> <string name="menu_qr">Códigos QR</string> <string name="get_bridges_email">Correio Eletrónico</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a66a817b..0504e815 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Configurare personalizată Torrc</string> <string name="pref_torrc_summary">PENTRU EXPERŢI: introdu direct liniile de configurare ale torrc</string> <string name="pref_torrc_dialog">Torrc Personalizat</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Punţi activate</string> <string name="restart_orbot_to_use_this_bridge_">Vă rugăm reporniţi Orbot pentru a aplica modificările</string> <string name="menu_qr">Coduri QR</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2371b913..34c660b6 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Пользовательские настройки Torrc</string> <string name="pref_torrc_summary">ТОЛЬКО ДЛЯ ЭКСПЕРТОВ: внесите настройки напрямую в строки файла конфигурации torrc</string> <string name="pref_torrc_dialog">Пользовательский Torrc</string> - <string name="kbps">кбит/с</string> - <string name="mbps">мбит/с</string> - <string name="kb">КБ</string> - <string name="mb">МБ</string> <string name="bridges_updated">Мосты обновлены</string> <string name="restart_orbot_to_use_this_bridge_">Пожалуйста, перезапустите Orbot для вступления изменения в силу</string> <string name="menu_qr">QR-коды</string> diff --git a/app/src/main/res/values-si-rLK/strings.xml b/app/src/main/res/values-si-rLK/strings.xml index 2604766b..3c9bc9d7 100644 --- a/app/src/main/res/values-si-rLK/strings.xml +++ b/app/src/main/res/values-si-rLK/strings.xml @@ -81,8 +81,6 @@ <string name="pref_use_persistent_notifications">Orbot සම්බන්ධ වී ඇති සැමවිටම විට මෙවලම් තීරුවේ නිරූපකය තබාගන්න</string> <string name="pref_use_persistent_notifications_title">නිවේදන ලැබීමට සලස්වන්න </string> <string name="set_locale_title">භාෂාව</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="hidden_services">සැගවුණු සේවා </string> <string name="title_activity_hidden_services">සැගවුණු සේවා </string> <string name="menu_hidden_services">සැගවුණු සේවා </string> diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index d72eb96b..e37ea50a 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Vlastné nastavenie Torrc</string> <string name="pref_torrc_summary">LEN PRE EXPERTOV: vložiť priamo riadky nastavenia torrc</string> <string name="pref_torrc_dialog">Vlasné Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Premostenia aktualizované</string> <string name="restart_orbot_to_use_this_bridge_">Prosím reštartujte Orbot, aby sa aktivovali zmeny</string> <string name="menu_qr">QR kódy</string> diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index e4dacc88..2551d36b 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -116,10 +116,6 @@ <string name="pref_torrc_title">Torrc Прерађена Подешавања</string> <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТЕ: унети директно torrc линије подешавања</string> <string name="pref_torrc_dialog">Подеси Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridges Ажурирање</string> <string name="restart_orbot_to_use_this_bridge_">Молимо покрените поново Орбот ради примењивања промена</string> <string name="menu_qr">QR Кодови</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 0080cdc1..d86b85da 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Torrc anpassad konfiguration</string> <string name="pref_torrc_summary">ENDAST EXPERTER: ange torrc konfiguration direkt</string> <string name="pref_torrc_dialog">Anpassad Torrc</string> - <string name="kbps">kb/s</string> - <string name="mbps">mb/s</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bryggor uppdaterade</string> <string name="restart_orbot_to_use_this_bridge_">Vänligen starta om Orbot för att aktivera ändringarna</string> <string name="menu_qr">QR-koder</string> diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 63ce987c..3d68ddc0 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">กำหนดค่า Torrc เอง</string> <string name="pref_torrc_summary">สำหรับผู้เชี่ยวชาญเท่านั้น: ระบุบรรทัดที่กำหนดค่า torcc โดยตรง</string> <string name="pref_torrc_dialog">Torrc ที่กำหนดเอง</string> - <string name="kbps">กิโลบิตต่อวินาที</string> - <string name="mbps">เมกะบิตต่อวินาที</string> - <string name="kb">กิโลไบต์</string> - <string name="mb">เมกะไบต์</string> <string name="bridges_updated">ปรับปรุง Bridges แล้ว</string> <string name="restart_orbot_to_use_this_bridge_">กรุณาเริ่ม Orbot ใหม่เพื่อให้การเปลี่ยนแปลงใช้งานได้</string> <string name="menu_qr">รหัสคิวอาร์</string> diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml index 4d0672eb..c095b970 100644 --- a/app/src/main/res/values-tl/strings.xml +++ b/app/src/main/res/values-tl/strings.xml @@ -98,10 +98,6 @@ <string name="pref_disable_network_title">Walang Auto-Sleep sa Network</string> <string name="pref_disable_network_summary">Ilagay ang Tor sa sleep kapag walang internet na pwede</string> <string name="newnym">Ikaw ay nagpalit ng bagong pagkakakilanlan sa Tor!</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="get_bridges_email">Email</string> <string name="send_email">Send Email</string> <string name="save">I-save</string> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 6dd2dd88..27635dba 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Özel Torrc Ayarları</string> <string name="pref_torrc_summary">UZMANLAR İÇİN: torrc ayar satırlarını doğrudan yazın</string> <string name="pref_torrc_dialog">Özel Torrc Ayarları</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Köprüler Güncellendi</string> <string name="restart_orbot_to_use_this_bridge_">Değişiklikleri etkinleştirmek için Orbot uygulamasını yeniden başlatın</string> <string name="menu_qr">QR Kodları</string> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index cc69b3dd..af30b762 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Додаткові налаштування Torrc</string> <string name="pref_torrc_summary">ЛИШЕ ДЛЯ ЕКСПЕРТІВ: введіть безпосередні рядки налаштувань torrc</string> <string name="pref_torrc_dialog">Додаткове у Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Мости оновлено</string> <string name="restart_orbot_to_use_this_bridge_">Будь ласка, перезапустіть Orbot, щоб зміни ввійшли в силу</string> <string name="menu_qr">QR-коди</string> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index cfeaa442..1c06cc7c 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Cấu hình tùy chỉnh cho Torrc</string> <string name="pref_torrc_summary">CHỈ NGƯỜI DÙNG CHUYÊN MÔN: nhập các thiết lập trực tiếp cho torrc</string> <string name="pref_torrc_dialog">Torrc tùy chỉnh</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridge được cập nhật</string> <string name="restart_orbot_to_use_this_bridge_">Vui lòng khởi động lại Orbot để áp dụng thay đổi</string> <string name="menu_qr">Mã QR</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 054fedcf..c574b7e5 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Torrc 自定义配置</string> <string name="pref_torrc_summary">仅供专家：直接输入 torrc 配置行</string> <string name="pref_torrc_dialog">自定义 Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">网桥已更新</string> <string name="restart_orbot_to_use_this_bridge_">请重启 Orbot 以使变更生效</string> <string name="menu_qr">QR码</string> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 3420d5dd..53c2fd03 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Torrc 自訂設置</string> <string name="pref_torrc_summary">僅限專家：輸入 torrc 設定指令</string> <string name="pref_torrc_dialog">自訂 Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">網橋已更新</string> <string name="restart_orbot_to_use_this_bridge_">請重新啟動 Orbot 來讓設定生效。</string> <string name="menu_qr">QR 碼</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 857f649c..1c5d2425 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -145,13 +145,10 @@ <string name="pref_torrc_dialog">Custom Torrc</string> - <string name="kbps">KBps</string> - - <string name="mbps">MBps</string> - - <string name="kb">KB</string> - - <string name="mb">MB</string> + <string name="kibibyte_per_second">KiB/s</string> + <string name="mebibyte_per_second">MiB/s</string> + <string name="kibibyte">KiB</string> + <string name="mebibyte">MiB</string> <string name="bridges_updated">Bridges Updated</string>

1 0