diff --git a/controller/app/src/main/java/org/iiab/controller/AdbPairingReceiver.java b/controller/app/src/main/java/org/iiab/controller/AdbPairingReceiver.java index 3d6b061f..cd883236 100644 --- a/controller/app/src/main/java/org/iiab/controller/AdbPairingReceiver.java +++ b/controller/app/src/main/java/org/iiab/controller/AdbPairingReceiver.java @@ -51,7 +51,7 @@ public void onReceive(Context context, Intent intent) { performNativePairing(context.getApplicationContext(), hostIp, pairingPort, pin); } else { - Toast.makeText(context, "Invalid PIN length. Must be 6 digits.", Toast.LENGTH_LONG).show(); + Toast.makeText(context, context.getString(R.string.adb_invalid_pin_length), Toast.LENGTH_LONG).show(); } } } diff --git a/controller/app/src/main/java/org/iiab/controller/DeployFragment.java b/controller/app/src/main/java/org/iiab/controller/DeployFragment.java index def0d15a..e10949d2 100644 --- a/controller/app/src/main/java/org/iiab/controller/DeployFragment.java +++ b/controller/app/src/main/java/org/iiab/controller/DeployFragment.java @@ -545,7 +545,7 @@ private void checkAndHandleSyncFragmentFocus() { android.content.SharedPreferences adbPrefs = requireContext().getSharedPreferences("iiab_adb_prefs", Context.MODE_PRIVATE); if (adbPrefs.getBoolean("pairing_just_succeeded", false)) { adbPrefs.edit().putBoolean("pairing_just_succeeded", false).apply(); - btnAdbAction.setText("Securing connection..."); + btnAdbAction.setText(R.string.securing_connection); new Handler(Looper.getMainLooper()).postDelayed(() -> adbShareController.startAdbPairingFlow(true), 2500); } if (adbPrefs.getBoolean("focus_adb", false)) { diff --git a/controller/app/src/main/java/org/iiab/controller/TerminalController.java b/controller/app/src/main/java/org/iiab/controller/TerminalController.java index 3246dc22..1a74ef9b 100644 --- a/controller/app/src/main/java/org/iiab/controller/TerminalController.java +++ b/controller/app/src/main/java/org/iiab/controller/TerminalController.java @@ -195,7 +195,7 @@ public void openFullTerminal() { new androidx.appcompat.app.AlertDialog.Builder(activity) .setTitle(R.string.terminal_crash_title) .setMessage(android.util.Log.getStackTraceString(t)) - .setPositiveButton("OK", null) + .setPositiveButton(android.R.string.ok, null) .show(); } } diff --git a/controller/app/src/main/java/org/iiab/controller/install/presentation/PlannerController.java b/controller/app/src/main/java/org/iiab/controller/install/presentation/PlannerController.java index 21ee13fe..564ffa89 100644 --- a/controller/app/src/main/java/org/iiab/controller/install/presentation/PlannerController.java +++ b/controller/app/src/main/java/org/iiab/controller/install/presentation/PlannerController.java @@ -376,7 +376,7 @@ public void onCalculated(InstallationPlanner.StorageProjection projection) { txtLegendFree.setText(String.format(java.util.Locale.US, "%.1fG", (freeSpaceGb - pTotal))); txtLegendFree.setTextColor(ContextCompat.getColor(fragment.requireContext(), R.color.dash_text_inverted)); } else { - txtLegendFree.setText("OVERLOAD"); + txtLegendFree.setText(R.string.storage_overload); txtLegendFree.setTextColor(ContextCompat.getColor(fragment.requireContext(), R.color.status_danger)); } } @@ -410,7 +410,7 @@ public void onCalculated(InstallationPlanner.StorageProjection projection) { } int centerColor = (host.getSelectedTier() == null || host.isStorageSafe()) ? ContextCompat.getColor(fragment.requireContext(), R.color.dash_text_inverted) : ContextCompat.getColor(fragment.requireContext(), R.color.status_danger); - storageGauge.updateData(segments, String.format(java.util.Locale.US, "%.1fG", pTotal), centerColor, "Projected", "Storage"); + storageGauge.updateData(segments, String.format(java.util.Locale.US, "%.1fG", pTotal), centerColor, fragment.getString(R.string.gauge_projected), fragment.getString(R.string.gauge_storage)); } if (fragment.getActivity() != null) @@ -419,7 +419,7 @@ public void onCalculated(InstallationPlanner.StorageProjection projection) { @Override public void onError(String error) { - if (fragment.isAdded() && txtLegendFree != null) txtLegendFree.setText("Error"); + if (fragment.isAdded() && txtLegendFree != null) txtLegendFree.setText(R.string.gauge_error); } }); } diff --git a/controller/app/src/main/java/org/iiab/controller/sync/presentation/ReceiveController.java b/controller/app/src/main/java/org/iiab/controller/sync/presentation/ReceiveController.java index 787a86d6..e7532f22 100644 --- a/controller/app/src/main/java/org/iiab/controller/sync/presentation/ReceiveController.java +++ b/controller/app/src/main/java/org/iiab/controller/sync/presentation/ReceiveController.java @@ -243,7 +243,7 @@ public void renderTransfer(SyncTransferState st) { progressBarTransfer.setIndeterminate(false); progressBarTransfer.setProgress(st.percent); txtTransferSpeed.setText(st.speed); - txtTransferEta.setText("ETA: " + st.eta); + txtTransferEta.setText(fragment.getString(R.string.sync_transfer_eta, st.eta)); if (!st.file.isEmpty()) { String displayFile = st.file.length() > 40 ? "..." + st.file.substring(st.file.length() - 40) : st.file; txtTransferFilename.setText(fragment.getString(R.string.sync_transfer_filename, displayFile)); diff --git a/controller/app/src/main/res/layout/fragment_dashboard.xml b/controller/app/src/main/res/layout/fragment_dashboard.xml index d6cc8859..68c70ff1 100644 --- a/controller/app/src/main/res/layout/fragment_dashboard.xml +++ b/controller/app/src/main/res/layout/fragment_dashboard.xml @@ -124,7 +124,7 @@ @@ -57,7 +57,7 @@ android:layout_height="match_parent" android:background="?android:attr/selectableItemBackgroundBorderless" android:src="@drawable/ic_menu_preferences" - android:contentDescription="Settings" + android:contentDescription="@string/cd_settings" android:padding="12dp" android:scaleType="fitCenter" android:tint="#FFFFFF" /> @@ -69,7 +69,7 @@ android:layout_height="48dp" android:background="?android:attr/selectableItemBackgroundBorderless" android:src="@drawable/ic_theme_system" - android:contentDescription="Toggle Theme" + android:contentDescription="@string/cd_toggle_theme" android:padding="12dp" android:scaleType="fitCenter" android:tint="#FFFFFF" /> diff --git a/controller/app/src/main/res/values-es/strings.xml b/controller/app/src/main/res/values-es/strings.xml index dd3f5607..9165e245 100644 --- a/controller/app/src/main/res/values-es/strings.xml +++ b/controller/app/src/main/res/values-es/strings.xml @@ -570,4 +570,17 @@ DNS personalizado para el servidor. Ver más El contenido de ayuda aún no está instalado. + + + Longitud de PIN inválida. Debe tener 6 dígitos. + Asegurando la conexión… + SOBRECARGA + Proyectado + Almacenamiento + Error + ETA: %1$s + Compartir por QR + Ajustes + Cambiar tema + Tiempo activo: diff --git a/controller/app/src/main/res/values-fr/strings.xml b/controller/app/src/main/res/values-fr/strings.xml index 8e4ce5d1..37019f38 100644 --- a/controller/app/src/main/res/values-fr/strings.xml +++ b/controller/app/src/main/res/values-fr/strings.xml @@ -571,4 +571,17 @@ DNS personnalisé pour le serveur. Voir plus Le contenu d\'aide n\'est pas encore installé. + + + Longueur de code PIN invalide. Doit comporter 6 chiffres. + Sécurisation de la connexion… + SURCHARGE + Projeté + Stockage + Erreur + ETA : %1$s + Partager via QR + Paramètres + Changer de thème + Temps de fonctionnement : diff --git a/controller/app/src/main/res/values-hi/strings.xml b/controller/app/src/main/res/values-hi/strings.xml index 3ee5af66..d4955881 100644 --- a/controller/app/src/main/res/values-hi/strings.xml +++ b/controller/app/src/main/res/values-hi/strings.xml @@ -571,4 +571,17 @@ सर्वर के लिए कस्टम DNS। और देखें सहायता सामग्री अभी इंस्टॉल नहीं है। + + + अमान्य पिन लंबाई। 6 अंक होने चाहिए। + कनेक्शन सुरक्षित किया जा रहा है… + अधिभार + अनुमानित + संग्रहण + त्रुटि + ETA: %1$s + QR से साझा करें + सेटिंग्स + थीम बदलें + अपटाइम: diff --git a/controller/app/src/main/res/values-pt/strings.xml b/controller/app/src/main/res/values-pt/strings.xml index 9f4eae3a..a5604728 100644 --- a/controller/app/src/main/res/values-pt/strings.xml +++ b/controller/app/src/main/res/values-pt/strings.xml @@ -573,4 +573,17 @@ DNS personalizado para o servidor. Ver mais O conteúdo de ajuda ainda não está instalado. + + + Comprimento de PIN inválido. Deve ter 6 dígitos. + Protegendo a conexão… + SOBRECARGA + Projetado + Armazenamento + Erro + ETA: %1$s + Compartilhar via QR + Configurações + Alternar tema + Tempo ativo: diff --git a/controller/app/src/main/res/values-ru-rRU/strings.xml b/controller/app/src/main/res/values-ru-rRU/strings.xml index 65adfaa0..936012b7 100644 --- a/controller/app/src/main/res/values-ru-rRU/strings.xml +++ b/controller/app/src/main/res/values-ru-rRU/strings.xml @@ -570,4 +570,17 @@ Пользовательский DNS для сервера. Подробнее Справочные материалы ещё не установлены. + + + Неверная длина PIN-кода. Должно быть 6 цифр. + Установка защищённого соединения… + ПЕРЕГРУЗКА + Прогноз + Хранилище + Ошибка + ETA: %1$s + Поделиться через QR + Настройки + Сменить тему + Время работы: diff --git a/controller/app/src/main/res/values/strings.xml b/controller/app/src/main/res/values/strings.xml index 3d65193f..ac00aee9 100644 --- a/controller/app/src/main/res/values/strings.xml +++ b/controller/app/src/main/res/values/strings.xml @@ -587,4 +587,17 @@ Custom DNS for the server. See more Help content is not installed yet. + + + Invalid PIN length. Must be 6 digits. + Securing connection… + OVERLOAD + Projected + Storage + Error + ETA: %1$s + Share via QR + Settings + Toggle Theme + Uptime: