[tor-commits] [orbot/master] consistent data transfer logic in service, makes units in notiifcation accurate
n8fr8 at torproject.org
n8fr8 at torproject.org
Wed Dec 22 21:55:08 UTC 2021
commit 2519bb35cb72d9c3c523d534dc32dc6add124b2b
Author: bim <dsnake at protonmail.com>
Date: Tue Jun 1 18:57:22 2021 -0400
consistent data transfer logic in service, makes units in notiifcation accurate
---
.../org/torproject/android/OrbotMainActivity.java | 20 ++-----------
app/src/main/res/values-de/strings.xml | 2 --
app/src/main/res/values-fr-rFR/strings.xml | 2 --
app/src/main/res/values-is/strings.xml | 2 --
app/src/main/res/values-nb/strings.xml | 2 --
app/src/main/res/values-pt-rBR/strings.xml | 2 --
app/src/main/res/values-pt-rPT/strings.xml | 2 --
app/src/main/res/values-pt/strings.xml | 2 --
app/src/main/res/values-tr/strings.xml | 2 --
app/src/main/res/values-uk/strings.xml | 2 --
app/src/main/res/values-vi/strings.xml | 2 --
app/src/main/res/values-zh-rCN/strings.xml | 2 --
app/src/main/res/values/strings.xml | 2 --
.../torproject/android/service/OrbotService.java | 12 ++++++++
.../android/service/TorEventHandler.java | 33 +++++-----------------
orbotservice/src/main/res/values-de/strings.xml | 2 ++
.../src/main/res/values-fr-rFR/strings.xml | 2 ++
orbotservice/src/main/res/values-is/strings.xml | 3 ++
orbotservice/src/main/res/values-nb/strings.xml | 2 ++
.../src/main/res/values-pt-rBR/strings.xml | 2 ++
.../src/main/res/values-pt-rPT/strings.xml | 3 ++
orbotservice/src/main/res/values-pt/strings.xml | 2 ++
orbotservice/src/main/res/values-tr/strings.xml | 2 ++
orbotservice/src/main/res/values-uk/strings.xml | 2 ++
orbotservice/src/main/res/values-vi/strings.xml | 2 ++
.../src/main/res/values-zh-rCN/strings.xml | 2 ++
orbotservice/src/main/res/values/strings.xml | 5 ++++
27 files changed, 51 insertions(+), 67 deletions(-)
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 4f6e6799..0090410e 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -339,7 +339,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan
}
private void resetBandwidthStatTextviews() {
- String zero = String.format("%s / %s", formatCount(0), formatTotal(0));
+ String zero = String.format("%s / %s", OrbotService.formatBandwidthCount(this, 0), formatTotal(0));
downloadText.setText(zero);
uploadText.setText(zero);
}
@@ -1026,20 +1026,6 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan
LocalBroadcastManager.getInstance(this).unregisterReceiver(mLocalBroadcastReceiver);
}
- private String formatCount(long count) {
- NumberFormat numberFormat = NumberFormat.getInstance(Locale.getDefault());
- // Converts the supplied argument into a string.
- // 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.kibibyte_per_second);
- else
- return numberFormat.format(Math
- .round(((float) ((int) (count * 100 / 1024 / 1024)) / 100)))
- + getString(R.string.mebibyte_per_second);
- }
-
private String formatTotal(long count) {
NumberFormat numberFormat = NumberFormat.getInstance(Locale.getDefault());
// Converts the supplied argument into a string.
@@ -1192,8 +1178,8 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan
long download = data.getLong("download");
long totalRead = data.getLong("readTotal");
long totalWrite = data.getLong("writeTotal");
- oma.downloadText.setText(String.format("%s / %s", oma.formatCount(download), oma.formatTotal(totalRead)));
- oma.uploadText.setText(String.format("%s / %s", oma.formatCount(upload), oma.formatTotal(totalWrite)));
+ oma.downloadText.setText(String.format("%s / %s", OrbotService.formatBandwidthCount(oma, download), oma.formatTotal(totalRead)));
+ oma.uploadText.setText(String.format("%s / %s", OrbotService.formatBandwidthCount(oma, upload), oma.formatTotal(totalWrite)));
break;
case MESSAGE_PORTS:
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ce02ae6e..f39279c0 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -191,6 +191,4 @@
<string name="confirm">Bestätigen</string>
<string name="mebibyte">MiB</string>
<string name="kibibyte">KiB</string>
- <string name="mebibyte_per_second">MiB/s</string>
- <string name="kibibyte_per_second">KiB/s</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index ded7bbd1..5f21a884 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -208,8 +208,6 @@
<string name="pref_circuit_padding">Bourrage du circuit</string>
<string name="mebibyte">Mio</string>
<string name="kibibyte">Kio</string>
- <string name="mebibyte_per_second">Mio/s</string>
- <string name="kibibyte_per_second">Kio/s</string>
<string name="get_bridges_email_request">Demander des ponts par courriel</string>
<string name="be_a_snowflake_desc">Autorisez les autres utilisateurs de Tor de se connecter à Tor par votre appareil</string>
<string name="be_a_snowflake_title">Exécuter le mandataire Snowflake</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index da866d6b..3e4d252b 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -209,8 +209,6 @@
<string name="testing_tor_direct">Prófa tengingu við Tor…</string>
<string name="get_bridges_email_request">Biðja um brýr með tölvupósti</string>
<string name="mebibyte">MiB</string>
- <string name="mebibyte_per_second">MiB/sek</string>
- <string name="kibibyte_per_second">KiB/sek</string>
<string name="be_a_snowflake_desc">Leyfa öðrum Tor-notendum að tengjast Tor à gegnum tækið þitt</string>
<string name="be_a_snowflake_title">Keyra Snowflake-milliþjón</string>
<string name="backup_port_exist">Villa: Önnur onion-þjónusta er þegar að nota gátt %s</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index c321c857..2bd99bad 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -209,8 +209,6 @@
<string name="get_bridges_email_request">Forespør broer via e-post</string>
<string name="mebibyte">MiB</string>
<string name="kibibyte">KiB</string>
- <string name="mebibyte_per_second">MiB/s</string>
- <string name="kibibyte_per_second">KiB/s</string>
<string name="confirm">Bekreft</string>
<string name="deny">Nekt</string>
<string name="allow">Tillat</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index e02b7c9d..72de6735 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -209,8 +209,6 @@
<string name="get_bridges_email_request">Solicite Pontes através do E-mail</string>
<string name="mebibyte">MiB</string>
<string name="kibibyte">KiB</string>
- <string name="mebibyte_per_second">MiB/s</string>
- <string name="kibibyte_per_second">KiB/s</string>
<string name="be_a_snowflake_desc">Permita que os outros usuários do Tor se conectem ao Tor através do seu dispositivo</string>
<string name="be_a_snowflake_title">Execute o proxy Snowflake</string>
<string name="confirm">Confirme</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index de30e512..42998eb4 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -225,8 +225,6 @@
<string name="get_bridges_email_request">Solicite Pontes através do E-mail</string>
<string name="mebibyte">MiB</string>
<string name="kibibyte">KiB</string>
- <string name="mebibyte_per_second">MiB/s</string>
- <string name="kibibyte_per_second">KiB/s</string>
<string name="deny">Negue</string>
<string name="allow">Permita</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 663fa605..54971155 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -225,8 +225,6 @@
<string name="get_bridges_email_request">Solicite Pontes através do E-mail</string>
<string name="mebibyte">MiB</string>
<string name="kibibyte">KiB</string>
- <string name="mebibyte_per_second">MiB/s</string>
- <string name="kibibyte_per_second">KiB/s</string>
<string name="deny">Negue</string>
<string name="allow">Permita</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 00448b24..c3aabe43 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -209,8 +209,6 @@
<string name="get_bridges_email_request">Köprüleri E-postayla İste</string>
<string name="mebibyte">MiB</string>
<string name="kibibyte">KiB</string>
- <string name="mebibyte_per_second">MiB/s</string>
- <string name="kibibyte_per_second">KiB/s</string>
<string name="be_a_snowflake_desc">Diğer Tor kullanıcılarının aygıtınız üzerinden Tor\'a bağlanmasına izin verin</string>
<string name="be_a_snowflake_title">Snowflake Vekil Sunucusu Çalıştır</string>
<string name="confirm">Onayla</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 241ddaed..9f8914a1 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -205,8 +205,6 @@
<string name="get_bridges_email_request">Запитувати моÑти електронною поштою</string>
<string name="mebibyte">МіБ</string>
<string name="kibibyte">КіБ</string>
- <string name="mebibyte_per_second">МіБ/Ñ</string>
- <string name="kibibyte_per_second">КіБ/Ñ</string>
<string name="pref_reduced_circuit_padding_summary">ВикориÑÑ‚Ð°Ð½Ð½Ñ Ð½Ð¸Ð¶Ñ‡Ð¸Ñ… накладних алгоритмів Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð´Ð»Ñ ÑÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… Ñ– акумулÑтора</string>
<string name="pref_reduced_circuit_padding">Скорочене Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð»Ð°Ð½Ñ†ÑŽÐ¶ÐºÐ°</string>
<string name="pref_circuit_padding_summary">Увімкнути Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð»Ð°Ð½Ñ†ÑŽÐ¶ÐºÐ° Ð´Ð»Ñ Ð·Ð°Ñ…Ð¸Ñту від деÑких форм аналізу трафіку</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 4b5fb960..3f3ae194 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -204,8 +204,6 @@
<string name="v2_hidden_services">Dịch vụ Onion v2 (Không được hỗ trợ nữa)</string>
<string name="mebibyte">MiB</string>
<string name="kibibyte">KiB</string>
- <string name="mebibyte_per_second">MiB/s</string>
- <string name="kibibyte_per_second">KiB/s</string>
<string name="refresh_apps">Là m mới các ứng dụng</string>
<string name="default_socks_http">SOCKS: - HTTP: -</string>
<string name="app_services">Dịch vụ ứng dụng</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 77153306..ef7253bc 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -209,8 +209,6 @@
<string name="get_bridges_email_request">通过电å邮件请求网桥</string>
<string name="mebibyte">MiB</string>
<string name="kibibyte">KiB</string>
- <string name="mebibyte_per_second">MiB/秒</string>
- <string name="kibibyte_per_second">KiB/秒</string>
<string name="be_a_snowflake_desc">å…许其他 Tor ç”¨æˆ·é€šè¿‡ä½ çš„è®¾å¤‡è¿žæŽ¥åˆ° Tor</string>
<string name="be_a_snowflake_title">è¿è¡Œ Snowflake 代ç†</string>
<string name="confirm">确认</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 55637899..07b7dda1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -144,8 +144,6 @@
<string name="pref_torrc_dialog">Custom Torrc</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>
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 099653ae..3b802aff 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -60,10 +60,12 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintStream;
import java.io.PrintWriter;
+import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Objects;
import java.util.Random;
import java.util.StringTokenizer;
@@ -1188,6 +1190,16 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
return extraLines;
}
+ public static String formatBandwidthCount(Context context, long bitsPerSecond) {
+ NumberFormat nf = NumberFormat.getInstance(Locale.getDefault());
+ if (bitsPerSecond < 1e6)
+ return nf.format(Math.round(((float) ((int) (bitsPerSecond * 10 / 1024)) / 10)))
+ + context.getString(R.string.kibibyte_per_second);
+ else
+ return nf.format(Math.round(((float) ((int) (bitsPerSecond * 100 / 1024 / 1024)) / 100)))
+ + context.getString(R.string.mebibyte_per_second);
+ }
+
private void addV3OnionServicesToTorrc(StringBuffer torrc, ContentResolver contentResolver) {
try {
Cursor onionServices = contentResolver.query(V3_ONION_SERVICES_CONTENT_URI, V3_ONION_SERVICE_PROJECTION, OnionService.ENABLED + "=1", null, null);
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java
index 5d204f70..29af35f7 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java
@@ -1,16 +1,15 @@
package org.torproject.android.service;
import android.text.TextUtils;
+import android.util.Log;
import net.freehaven.tor.control.EventHandler;
import org.torproject.android.service.util.ExternalIPFetcher;
import org.torproject.android.service.util.Prefs;
-import java.text.NumberFormat;
import java.util.HashMap;
import java.util.List;
-import java.util.Locale;
import java.util.StringTokenizer;
/**
@@ -19,18 +18,15 @@ import java.util.StringTokenizer;
public class TorEventHandler implements EventHandler, TorServiceConstants {
private final static int BW_THRESDHOLD = 10000;
- private OrbotService mService;
+ private final OrbotService mService;
private long lastRead = -1;
private long lastWritten = -1;
private long mTotalTrafficWritten = 0;
private long mTotalTrafficRead = 0;
- private NumberFormat mNumberFormat;
- private HashMap<String, Node> hmBuiltNodes = new HashMap<>();
+ private final HashMap<String, Node> hmBuiltNodes = new HashMap<>();
public TorEventHandler(OrbotService service) {
mService = service;
- mNumberFormat = NumberFormat.getInstance(Locale.getDefault()); //localized numbers!
-
}
public HashMap<String, Node> getNodes() {
@@ -39,7 +35,7 @@ public class TorEventHandler implements EventHandler, TorServiceConstants {
@Override
public void message(String severity, String msg) {
-
+ Log.d("bim", "message: " + msg);
if (severity.equalsIgnoreCase("debug"))
mService.debug(severity + ": " + msg);
else
@@ -94,11 +90,12 @@ public class TorEventHandler implements EventHandler, TorServiceConstants {
if (read > 0 || written > 0)
iconId = R.drawable.ic_stat_tor_xfer;
- String sb = formatCount(read) +
+ String sb = OrbotService.formatBandwidthCount(mService, read) +
" \u2193" +
" / " +
- formatCount(written) +
+ OrbotService.formatBandwidthCount(mService, written) +
" \u2191";
+ Log.d("bim", "bandWidthUsed " + read + ", " + written);
mService.showToolbarNotification(sb, OrbotService.NOTIFY_ID, iconId);
mTotalTrafficWritten += written;
@@ -115,22 +112,6 @@ public class TorEventHandler implements EventHandler, TorServiceConstants {
}
- private String formatCount(long count) {
- // Converts the supplied argument into a string.
-
- // Under 2Mb, returns "xxx.xKb"
- // Over 2Mb, returns "xxx.xxMb"
- if (mNumberFormat != null)
- if (count < 1e6)
- return mNumberFormat.format(Math.round((float) ((int) (count * 10 / 1024)) / 10)) + "kbps";
- else
- return mNumberFormat.format(Math.round((float) ((int) (count * 100 / 1024 / 1024)) / 100)) + "mbps";
- else
- return "";
-
- //return count+" kB";
- }
-
public void circuitStatus(String status, String circID, String path) {
/* once the first circuit is complete, then announce that Orbot is on*/
diff --git a/orbotservice/src/main/res/values-de/strings.xml b/orbotservice/src/main/res/values-de/strings.xml
index 42e901f4..821e9dcd 100644
--- a/orbotservice/src/main/res/values-de/strings.xml
+++ b/orbotservice/src/main/res/values-de/strings.xml
@@ -23,4 +23,6 @@
<string name="unable_to_start_tor">Tor kann nicht gestartet werden:</string>
<string name="newnym">Sie haben zu einer neuen Tor-Identität gewechselt!</string>
<string name="updating_settings_in_tor_service">Einstellungen im Tor-Dienst werden aktualisiert</string>
+ <string name="mebibyte_per_second">MiB/s</string>
+ <string name="kibibyte_per_second">KiB/s</string>
</resources>
diff --git a/orbotservice/src/main/res/values-fr-rFR/strings.xml b/orbotservice/src/main/res/values-fr-rFR/strings.xml
index f6031429..8d98d8d8 100644
--- a/orbotservice/src/main/res/values-fr-rFR/strings.xml
+++ b/orbotservice/src/main/res/values-fr-rFR/strings.xml
@@ -23,4 +23,6 @@
<string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
<string name="newnym">Vous avez basculé vers une nouvelle identité Tor !</string>
<string name="updating_settings_in_tor_service">mise à jour des paramètres dans le service Tor</string>
+ <string name="mebibyte_per_second">Mio/s</string>
+ <string name="kibibyte_per_second">Kio/s</string>
</resources>
diff --git a/orbotservice/src/main/res/values-is/strings.xml b/orbotservice/src/main/res/values-is/strings.xml
index 90f75a88..742dffa4 100644
--- a/orbotservice/src/main/res/values-is/strings.xml
+++ b/orbotservice/src/main/res/values-is/strings.xml
@@ -22,4 +22,7 @@
<string name="unable_to_start_tor">Get ekki kveikt á Tor:</string>
<string name="newnym">Þú ert komin með nýtt Tor auðkenni!</string>
<string name="updating_settings_in_tor_service">uppfæri stillingar à Tor þjónustu</string>
+
+ <string name="mebibyte_per_second">MiB/sek</string>
+ <string name="kibibyte_per_second">KiB/sek</string>
</resources>
diff --git a/orbotservice/src/main/res/values-nb/strings.xml b/orbotservice/src/main/res/values-nb/strings.xml
index 0f7d44ae..584a7ba8 100644
--- a/orbotservice/src/main/res/values-nb/strings.xml
+++ b/orbotservice/src/main/res/values-nb/strings.xml
@@ -22,4 +22,6 @@
<string name="unable_to_start_tor">Klarte ikke å starte Tor:</string>
<string name="newnym">Du har byttet til en ny Tor-identitet!</string>
<string name="updating_settings_in_tor_service">Oppdaterer innstillinger i Tor service</string>
+ <string name="mebibyte_per_second">MiB/s</string>
+ <string name="kibibyte_per_second">KiB/s</string>
</resources>
diff --git a/orbotservice/src/main/res/values-pt-rBR/strings.xml b/orbotservice/src/main/res/values-pt-rBR/strings.xml
index 847f7aef..f62530aa 100644
--- a/orbotservice/src/main/res/values-pt-rBR/strings.xml
+++ b/orbotservice/src/main/res/values-pt-rBR/strings.xml
@@ -23,4 +23,6 @@
<string name="unable_to_start_tor">Habilitar iniciar o Tor:</string>
<string name="newnym">Você trocou para uma nova identidade Tor!</string>
<string name="updating_settings_in_tor_service">atualizando configurações no serviço Tor</string>
+ <string name="mebibyte_per_second">MiB/s</string>
+ <string name="kibibyte_per_second">KiB/s</string>
</resources>
diff --git a/orbotservice/src/main/res/values-pt-rPT/strings.xml b/orbotservice/src/main/res/values-pt-rPT/strings.xml
index 2f8e5113..d34f1b24 100644
--- a/orbotservice/src/main/res/values-pt-rPT/strings.xml
+++ b/orbotservice/src/main/res/values-pt-rPT/strings.xml
@@ -9,4 +9,7 @@
<!--Permissions screen-->
<!--TipsAndTricks screen-->
<!--Transparent Proxy screen-->
+
+ <string name="mebibyte_per_second">MiB/s</string>
+ <string name="kibibyte_per_second">KiB/s</string>
</resources>
diff --git a/orbotservice/src/main/res/values-pt/strings.xml b/orbotservice/src/main/res/values-pt/strings.xml
index 9266d81d..f73e0c7d 100644
--- a/orbotservice/src/main/res/values-pt/strings.xml
+++ b/orbotservice/src/main/res/values-pt/strings.xml
@@ -19,4 +19,6 @@
<string name="unable_to_start_tor">Não é possÃvel iniciar o Tor:</string>
<string name="newnym">Mudou para uma nova identidade do Tor!</string>
<string name="updating_settings_in_tor_service">a atualizar as definições no serviço Tor</string>
+ <string name="mebibyte_per_second">MiB/s</string>
+ <string name="kibibyte_per_second">KiB/s</string>
</resources>
diff --git a/orbotservice/src/main/res/values-tr/strings.xml b/orbotservice/src/main/res/values-tr/strings.xml
index 8fdc1085..249b42d5 100644
--- a/orbotservice/src/main/res/values-tr/strings.xml
+++ b/orbotservice/src/main/res/values-tr/strings.xml
@@ -23,4 +23,6 @@
<string name="unable_to_start_tor">Tor başlatılamadı:</string>
<string name="newnym">Yeni bir Tor kimliğine geçiş yaptınız!</string>
<string name="updating_settings_in_tor_service">Tor hizmet ayarları güncellemesi</string>
+ <string name="mebibyte_per_second">MiB/s</string>
+ <string name="kibibyte_per_second">KiB/s</string>
</resources>
diff --git a/orbotservice/src/main/res/values-uk/strings.xml b/orbotservice/src/main/res/values-uk/strings.xml
index da62e234..34860e4c 100644
--- a/orbotservice/src/main/res/values-uk/strings.xml
+++ b/orbotservice/src/main/res/values-uk/strings.xml
@@ -22,4 +22,6 @@
<string name="unable_to_start_tor">Ðеможливо запуÑтити Tor:</string>
<string name="newnym">Ви перемкнулиÑÑŒ на новий ідентифікатор Tor!</string>
<string name="updating_settings_in_tor_service">Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ у ÑервіÑÑ– Tor</string>
+ <string name="mebibyte_per_second">МіБ/Ñ</string>
+ <string name="kibibyte_per_second">КіБ/Ñ</string>
</resources>
diff --git a/orbotservice/src/main/res/values-vi/strings.xml b/orbotservice/src/main/res/values-vi/strings.xml
index e5b39dff..aee8a4f2 100644
--- a/orbotservice/src/main/res/values-vi/strings.xml
+++ b/orbotservice/src/main/res/values-vi/strings.xml
@@ -23,4 +23,6 @@
<string name="unable_to_start_tor">Không thể khởi động Tor được: </string>
<string name="newnym">Bạn đã chuyển sang một mạch Tor mới!</string>
<string name="updating_settings_in_tor_service">Ä‘ang cáºp nháºt cà i đặt dịch vụ Tor</string>
+ <string name="mebibyte_per_second">MiB/s</string>
+ <string name="kibibyte_per_second">KiB/s</string>
</resources>
diff --git a/orbotservice/src/main/res/values-zh-rCN/strings.xml b/orbotservice/src/main/res/values-zh-rCN/strings.xml
index 888444a0..a79da66f 100644
--- a/orbotservice/src/main/res/values-zh-rCN/strings.xml
+++ b/orbotservice/src/main/res/values-zh-rCN/strings.xml
@@ -23,4 +23,6 @@
<string name="unable_to_start_tor">æ— æ³•å¯åŠ¨ Tor：</string>
<string name="newnym">已切æ¢ä¸ºæ–°çš„ Tor æ ‡è¯†ï¼</string>
<string name="updating_settings_in_tor_service">æ£åœ¨æ›´æ–° Tor æœåŠ¡ä¸çš„设置</string>
+ <string name="mebibyte_per_second">MiB/秒</string>
+ <string name="kibibyte_per_second">KiB/秒</string>
</resources>
diff --git a/orbotservice/src/main/res/values/strings.xml b/orbotservice/src/main/res/values/strings.xml
index 4d1a65b9..ed3464ac 100644
--- a/orbotservice/src/main/res/values/strings.xml
+++ b/orbotservice/src/main/res/values/strings.xml
@@ -22,4 +22,9 @@
<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="kibibyte_per_second">KiB/s</string>
+ <string name="mebibyte_per_second">MiB/s</string>
+
</resources>
+
More information about the tor-commits
mailing list