From 705a4d73641232b99be10f4a17cde1baaf223186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Colomb?= Date: Mon, 13 Nov 2023 10:27:35 +0100 Subject: [PATCH 1/3] Add translation comment referring to "all files access" docs (#2003) --- app/src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1fe48c6ef..f8b512396 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,6 +21,7 @@ Storage Permission Syncthing needs to access your storage to do file synchronization. + Your device does not support all files access From 57c79257d1e619bfcce6b3bc6cd5df82500f74ef Mon Sep 17 00:00:00 2001 From: zanovis <32601911+zanovis@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:34:32 -0700 Subject: [PATCH 2/3] Clarified error message for restricted location permissions (#1974) This error message is slightly misleading (related to #1778) currently, the user will get this error even if they have whitelisted the SSID. Co-authored-by: Simon Frei --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f8b512396..d1124c8bd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -685,7 +685,7 @@ Device is running on charger Device is in power-saving mode Global Synchronization is disabled - Current WiFi SSID is not whitelisted + Current WiFi SSID is not whitelisted or location permissions are restricted Current WiFi is metered No network connection or airplane mode enabled Not connected to mobile data From 24fa7c3620d1de42ed83112639ad681ee26257f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Colomb?= Date: Mon, 13 Nov 2023 20:51:36 +0100 Subject: [PATCH 3/3] Remove outdated drawer entry for CPU usage (#2004) The code to calculate this metric has long been removed from the backend upstream, in commit https://github.com/syncthing/syncthing/commit/c7d6a6d78042876d9a27b13df2ae45783dca7c37. Thus the GUI element should go away as well, currently always displaying 0 percent anyways. Ref https://github.com/syncthing/syncthing/pull/6393 --- .../fragments/DrawerFragment.java | 3 --- app/src/main/res/layout/fragment_drawer.xml | 23 ------------------- app/src/main/res/values-bg/strings.xml | 2 -- app/src/main/res/values-ca-rES/strings.xml | 2 -- app/src/main/res/values-cs/strings.xml | 2 -- app/src/main/res/values-da/strings.xml | 2 -- app/src/main/res/values-de/strings.xml | 2 -- app/src/main/res/values-el/strings.xml | 2 -- app/src/main/res/values-es-rMX/strings.xml | 2 -- app/src/main/res/values-es/strings.xml | 2 -- app/src/main/res/values-eu/strings.xml | 2 -- app/src/main/res/values-fi/strings.xml | 2 -- app/src/main/res/values-fr/strings.xml | 2 -- app/src/main/res/values-hu/strings.xml | 2 -- app/src/main/res/values-in/strings.xml | 2 -- app/src/main/res/values-it/strings.xml | 2 -- app/src/main/res/values-ja/strings.xml | 2 -- app/src/main/res/values-ko/strings.xml | 2 -- app/src/main/res/values-nb/strings.xml | 2 -- app/src/main/res/values-nl/strings.xml | 2 -- app/src/main/res/values-nn/strings.xml | 2 -- app/src/main/res/values-pl/strings.xml | 2 -- app/src/main/res/values-pt-rBR/strings.xml | 2 -- app/src/main/res/values-pt/strings.xml | 2 -- app/src/main/res/values-ro/strings.xml | 2 -- app/src/main/res/values-ru/strings.xml | 2 -- app/src/main/res/values-si/strings.xml | 2 -- app/src/main/res/values-sk/strings.xml | 2 -- app/src/main/res/values-sv/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-zh-rHK/strings.xml | 2 -- app/src/main/res/values-zh-rTW/strings.xml | 2 -- app/src/main/res/values/strings.xml | 3 --- 36 files changed, 95 deletions(-) diff --git a/app/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java b/app/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java index c0c822603..641c981e6 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java @@ -43,7 +43,6 @@ public class DrawerFragment extends Fragment implements View.OnClickListener { private static final String TAG = "DrawerFragment"; - private TextView mCpuUsage; private TextView mRamUsage; private TextView mDownload; private TextView mUpload; @@ -99,7 +98,6 @@ public void onViewCreated(View view, Bundle savedInstanceState) { mActivity = (MainActivity) getActivity(); sharedPreferences = PreferenceManager.getDefaultSharedPreferences(mActivity); - mCpuUsage = view.findViewById(R.id.cpu_usage); mRamUsage = view.findViewById(R.id.ram_usage); mDownload = view.findViewById(R.id.download); mUpload = view.findViewById(R.id.upload); @@ -178,7 +176,6 @@ private void onReceiveSystemInfo(SystemInfo info) { return; NumberFormat percentFormat = NumberFormat.getPercentInstance(); percentFormat.setMaximumFractionDigits(2); - mCpuUsage.setText(percentFormat.format(info.cpuPercent / 100)); mRamUsage.setText(Util.readableFileSize(mActivity, info.sys)); int announceTotal = info.discoveryMethods; int announceConnected = diff --git a/app/src/main/res/layout/fragment_drawer.xml b/app/src/main/res/layout/fragment_drawer.xml index d3eb36934..b4fa459bf 100644 --- a/app/src/main/res/layout/fragment_drawer.xml +++ b/app/src/main/res/layout/fragment_drawer.xml @@ -61,29 +61,6 @@ android:layout_marginBottom="4dp" android:background="@drawable/list_divider" /> - - - - - - - "Изтегляне: " "Качване: " - - Използване на CPU Използване на RAM diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml index 9062cb318..4bf893457 100644 --- a/app/src/main/res/values-ca-rES/strings.xml +++ b/app/src/main/res/values-ca-rES/strings.xml @@ -105,8 +105,6 @@ "Descàrrega: " "Pujada: " - - Ús de CPU Ús de RAM diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b7c6a85fa..7b126c4dc 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -107,8 +107,6 @@ "Rychlost stahování: " "Rychlost odesílání: " - - Využití CPU Využití RAM diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 9a5fa9d6c..e8d614c82 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -105,8 +105,6 @@ "Download: " "Upload: " - - CPU forbrug RAM forbrug diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f5fef58a0..cd0b29d76 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -103,8 +103,6 @@ "Herunterladen: " "Hochladen: " - - Prozessorauslastung RAM-Auslastung diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index d44b337f9..d1ade16f1 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -80,8 +80,6 @@ "Λήψη: " "Αποστολή: " - - Χρήση CPU Χρήση RAM diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml index f2d0d8967..b1ecd647f 100644 --- a/app/src/main/res/values-es-rMX/strings.xml +++ b/app/src/main/res/values-es-rMX/strings.xml @@ -84,8 +84,6 @@ "Descarga: " "Subida: " - - Uso de CPU Uso de RAM diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 45fe5e730..cfd1593e7 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -106,8 +106,6 @@ "Descarga: " "Subida: " - - Uso de CPU Uso de RAM diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 8fe968e64..0480d0d50 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -112,8 +112,6 @@ "Deskarga: " "Igo: " - - CPU Erabilera RAM erabilera diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 6f6a168e3..b4e451b98 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -84,8 +84,6 @@ "Lataus: " "Lähetys: " - - Suorittimen käyttö Muistin käyttö diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d5ffdc5a2..a9ac32bb4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -106,8 +106,6 @@ "Réception: " "Émission: " - - Utilisation du CPU Utilisation de la RAM diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 03e8aa385..1c2515d60 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -105,8 +105,6 @@ "Letöltve: " "Feltöltve: " - - CPU használat Memória használat diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 16e7ab5a1..74a8ff71b 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -87,8 +87,6 @@ "Unduhan: " "Unggah: " - - Penggunaan CPU Penggunaan RAM diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 3e3491f00..7deb83da3 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -106,8 +106,6 @@ "Download: " "Upload: " - - Utilizzo CPU Utilizzo RAM diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 700cefe49..8caedbf4e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -100,8 +100,6 @@ "ダウンロード: " "アップロード: " - - CPU 使用率 メモリ使用量 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 682e3be4f..75c08c010 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -100,8 +100,6 @@ "수신: " "송신: " - - CPU 사용량 RAM 사용량 diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index b2ddf3c55..299764447 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -62,8 +62,6 @@ "Nedlasting: " "Opplasting: " - - CPU-forbruk RAM-forbruk diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 975275a0c..9001bfb1d 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -105,8 +105,6 @@ "Download: " "Upload: " - - CPU-gebruik RAM-gebruik diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml index 0f60b3ad2..a4be1ca25 100644 --- a/app/src/main/res/values-nn/strings.xml +++ b/app/src/main/res/values-nn/strings.xml @@ -81,8 +81,6 @@ "Nedlasting: " "Opplasting: " - - Prosessorbruk Minnebruk diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b03ca5454..10fb4ad5a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -114,8 +114,6 @@ "Pobieranie: " "Wysyłanie: " - - Użycie procesora Użycie pamięci RAM diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index c8f0761b4..4d14c3353 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -106,8 +106,6 @@ "Recepção: " "Envio: " - - Uso de CPU Uso de RAM diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 16bd17477..58ca752c3 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -106,8 +106,6 @@ "Recepção: " "Envio: " - - Utilização da CPU Utilização da RAM diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 192551fe3..6366a866d 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -113,8 +113,6 @@ "Descărcare: " "Încărcare: " - - Utilizare CPU Utilizare RAM diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index dab45d274..4391926a4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -107,8 +107,6 @@ "Скачивание: " "Отдача: " - - Использование ЦП Использование ОЗУ diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index 8ad78a00c..3345f7d14 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -70,8 +70,6 @@ - - CPU භාවිතය RAM භාවිතය diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index fddbc3480..d9f67cdba 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -107,8 +107,6 @@ "Sťahovanie: " "Odosielanie: " - - Vyťaženie procesora Využitie RAM diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index d9de3a174..3d23a46ea 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -105,8 +105,6 @@ "Tar emot: " "Skickar: " - - CPU användning RAM användning diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 037945335..116ec3d72 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -112,8 +112,6 @@ "İndirme: " "Gönderme: " - - İşlemci Kullanımı Bellek Kullanımı diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 219cec2d7..bc6e7117b 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -107,8 +107,6 @@ "Завантаження: " "Вивантаження: " - - Використання ЦП Використання ОЗП diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index ee0bf0116..ec9b644e7 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -104,8 +104,6 @@ "Tải xuống: " "Tải lên: " - - Mức s.dụng CPU Mức s.dụng RAM diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 5981f24db..c21fc8046 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -104,8 +104,6 @@ "下载: " "上传: " - - CPU 使用率 内存使用 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 77db77aed..ab064e53a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -104,8 +104,6 @@ "下載: " "上載: " - - CPU 使用率 記憶體使用率 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 4c2c699cb..7f7136102 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -104,8 +104,6 @@ "下載: " "上傳: " - - CPU 使用率 記憶體使用率 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d1124c8bd..04c5155ab 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -172,9 +172,6 @@ Upload:\u0020 - - CPU Usage - RAM Usage