From c6e3ab1dde77fcee40f8d4eb36b413973ee62c2b Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 13 Feb 2021 16:17:02 -0500 Subject: [PATCH] More German string translations, credit Petra Mirelli https://gitlab.com/divested-mobile/hypatia/-/issues/1#note_508460677 --- .idea/caches/build_file_checksums.ser | Bin 532 -> 532 bytes app/build.gradle | 6 ++--- .../us/spotco/malwarescanner/Database.java | 6 ++--- .../spotco/malwarescanner/MainActivity.java | 9 +++---- .../malwarescanner/MalwareScannerService.java | 2 +- app/src/main/res/values-de/strings.xml | 22 +++++++++++++++++- app/src/main/res/values/strings.xml | 12 +++++++++- build.gradle | 2 +- 8 files changed, 45 insertions(+), 14 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 780a91a0fd66dd992e81d8b23d407ccf061a2e6e..4e93636843331cc27f4d6c4e2758bb87e4e1c7de 100644 GIT binary patch delta 53 zcmV-50LuTA1e64jm;{|oli-n@pAhYmhWOxBd4G^1!Lw?ZSi6%;0k{!(%R3zgwf6cY LX^3^qhM8V?yUrRl delta 53 zcmV-50LuTA1e64jm;_@sDcO;npAf;hh}G4!96iZ)DDDLpP0^D}0k{zXvg`}{d7Vq+ L)U5MyrprorhkhBv diff --git a/app/build.gradle b/app/build.gradle index 4f8f361..ddec3bd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "us.spotco.malwarescanner" minSdkVersion 16 targetSdkVersion 29 - versionCode 51 - versionName "2.12" + versionCode 53 + versionName "2.13" resConfigs "en", "de" } buildTypes { @@ -30,5 +30,5 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.2.1' + implementation 'com.google.android.material:material:1.3.0' } diff --git a/app/src/main/java/us/spotco/malwarescanner/Database.java b/app/src/main/java/us/spotco/malwarescanner/Database.java index e5b6b0e..5414b06 100644 --- a/app/src/main/java/us/spotco/malwarescanner/Database.java +++ b/app/src/main/java/us/spotco/malwarescanner/Database.java @@ -56,7 +56,7 @@ class Database { public final static HashMap signaturesSHA1 = new HashMap<>(); public final static HashMap signaturesSHA256 = new HashMap<>(); - private static final DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd"); + private static final DateFormat dateFormat = new SimpleDateFormat(Utils.getContext().getString(R.string.simple_date_format_short)); public Database(TextView log) { Database.log = log; @@ -184,7 +184,7 @@ class Database { String lastModifiedLocal = ""; if (out.exists()) { connection.setIfModifiedSince(out.lastModified()); - lastModifiedLocal = " since " + dateFormat.format(new Date(out.lastModified())); //TODO: Move to strings.xml + lastModifiedLocal = Utils.getContext().getString(R.string.main_database_not_modified_since, dateFormat.format(new Date(out.lastModified()))); } connection.connect(); String lastModifiedServer = dateFormat.format(new Date(connection.getLastModified())); @@ -205,7 +205,7 @@ class Database { fileOutputStream.close(); publishProgress(url.replaceAll(baseURL, "") + "\n\t" + Utils.getContext().getString(R.string.main_database_download_success) - + "\n\tReleased on " + lastModifiedServer + "\n"); //TODO: Move to strings.xml + + "\n\t" + Utils.getContext().getString(R.string.main_database_released_on, lastModifiedServer) + "\n"); } else { publishProgress(url.replaceAll(baseURL, "") + "\n\t" + Utils.getContext().getString(R.string.main_database_download_error, res + "") + "\n"); diff --git a/app/src/main/java/us/spotco/malwarescanner/MainActivity.java b/app/src/main/java/us/spotco/malwarescanner/MainActivity.java index ea8db10..bb85dcb 100644 --- a/app/src/main/java/us/spotco/malwarescanner/MainActivity.java +++ b/app/src/main/java/us/spotco/malwarescanner/MainActivity.java @@ -75,9 +75,9 @@ public class MainActivity extends AppCompatActivity { logView = findViewById(R.id.txtLogOutput); logView.setMovementMethod(new ScrollingMovementMethod()); - logView.append("Copyright 2017-2021 Divested Computing Group\n"); //TODO: Move to strings.xml - logView.append("License: GPLv3\n"); - logView.append("Powered by ClamAV signatures\n\n"); + logView.append(getString(R.string.app_copyright) + "\n"); + logView.append(getString(R.string.app_license) + "\n"); + logView.append(getString(R.string.app_db_type_clamav) + "\n\n"); malwareScanner = new MalwareScanner(this, this, true); @@ -91,6 +91,7 @@ public class MainActivity extends AppCompatActivity { startScanner(); } else { malwareScanner.cancel(true); + logView.append(getString(R.string.app_db_type_clamav) + "\n\n"); } } }); @@ -169,7 +170,7 @@ public class MainActivity extends AppCompatActivity { case R.id.mnuUpdateDatabase: if (prefs.getBoolean("ONION_ROUTING", false)) { Utils.requestStartOrbot(this); - logView.append("Downloading over Tor, this may take a while...\n"); //TODO: Move to strings.xml + logView.append(getString(R.string.lblOnionRoutingEnabledHint) + "\n"); } updateDatabase(); break; diff --git a/app/src/main/java/us/spotco/malwarescanner/MalwareScannerService.java b/app/src/main/java/us/spotco/malwarescanner/MalwareScannerService.java index 5ad2348..f053e32 100644 --- a/app/src/main/java/us/spotco/malwarescanner/MalwareScannerService.java +++ b/app/src/main/java/us/spotco/malwarescanner/MalwareScannerService.java @@ -127,7 +127,7 @@ public class MalwareScannerService extends Service { } private void updateForegroundNotification() { - foregroundNotification.setSubText(Utils.FILES_SCANNED + " files scanned"); //TODO: Move to strings.xml + foregroundNotification.setSubText(getString(R.string.main_files_scanned_count, Utils.FILES_SCANNED) + ""); notificationManager.notify(-1, foregroundNotification.build()); } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 327317a..77ef0c9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,18 +1,37 @@ Hypatia + Copyright 2017-2021 Divested Computing Group + Lizenz: GPLv3 + Basierend auf ClamAV-Signaturen + + Download über Tor + Download über Tor wurde ausgewählt, das kann etwas länger dauern. Bitte haben sie Geduld... + Orbot ist nicht installiert! + Orbot läuft nicht! + Datenbanken aktualisieren + Datenbanken auswählen + Bitte gewünschte Datenbanken auswählen + /system scannen + APK-Dateien scannen + Internen Speicher scannen + Externen Speicher scannen Malware-Erkennung Dient zur Warnung in Echtzeit wenn Malware erkannt wird Echtzeit-Scanner Bekannte Malware wird in Echtzeit erkannt Echtzeit-Scanner - Update der %s Datenbank... + dd.MM.yyyy + + Update von %s Datenbank(en) ... Download von %s Erfolgreich heruntergeladen Datei wurde nicht heruntergeladen. Fehlercode %s Keine Datenbank verfügbar. Scan wird abgebrochen... + Veröffentlicht am %s Datei wurde nicht geändert + seit %s Download ist fehlgeschlagen. Für weitere Details bitte in logcat nachsehen Scan startet... @@ -23,4 +42,5 @@ Alle %s Hashes wurden mit den Signatur-Datenbanken abgeglichen Keine %s Hash-Signaturen verfügbar Scan nach %s Sekunden abgeschlossen! + % Datei(en) gescannt diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7f3bbad..d348fa0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,11 @@ Hypatia + Copyright 2017-2021 Divested Computing Group + License: GPLv3 + Powered by ClamAV signatures + Download over Tor + Downloading over Tor, this may take a while... Orbot is not installed! Orbot is not running! Update databases @@ -18,12 +23,16 @@ Malware Detected: Realtime Scanner + yyyy/MM/dd + Updating %s databases... Downloading %s Successfully downloaded File not downloaded, response code %s No database available, not scanning... + Released on %s File not changed + since %s Failed to download, check logcat Starting scan... @@ -34,4 +43,5 @@ Checked all %s hashes against signature databases No %s hashes signatures available Scan completed in %s seconds! - \ No newline at end of file + % files scanned + diff --git a/build.gradle b/build.gradle index e18f583..78f7a34 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:4.1.2' // NOTE: Do not place your application dependencies here; they belong