Use a different singning key for OpenVPN 2 only builds

38 files changed, 47 insertions, 47 deletions

diff --git a/main/build.gradle.kts b/main/build.gradle.kts
index f19a0f77..d709d98b 100644
--- a/main/build.gradle.kts
+++ b/main/build.gradle.kts
@@ -78,6 +78,20 @@ android {
             enableV2Signing = true
         }
 
+        create("releaseOvpn2") {
+            // ~/.gradle/gradle.properties
+            val keystoreO2File: String? by project
+            storeFile = keystoreO2File?.let { file(it) }
+            val keystoreO2Password: String? by project
+            storePassword = keystoreO2Password
+            val keystoreO2AliasPassword: String? by project
+            keyPassword = keystoreO2AliasPassword
+            val keystoreO2Alias: String? by project
+            keyAlias = keystoreO2Alias
+            enableV1Signing = true
+            enableV2Signing = true
+        }
+
     }
 
     lint {
@@ -86,16 +100,7 @@ android {
         disable += setOf("MissingTranslation", "UnsafeNativeCodeLocation")
     }
 
-    buildTypes {
-        getByName("release") {
-            if (project.hasProperty("icsopenvpnDebugSign")) {
-                logger.warn("property icsopenvpnDebugSign set, using debug signing for release")
-                signingConfig = android.signingConfigs.getByName("debug")
-            } else {
-                signingConfig = signingConfigs.getByName("release")
-            }
-        }
-    }
+
     flavorDimensions += listOf("implementation", "ovpnimpl")
 
     productFlavors {
@@ -121,6 +126,18 @@ android {
         }
     }
 
+    buildTypes {
+        getByName("release") {
+            if (project.hasProperty("icsopenvpnDebugSign")) {
+                logger.warn("property icsopenvpnDebugSign set, using debug signing for release")
+                signingConfig = android.signingConfigs.getByName("debug")
+            } else {
+                productFlavors["ovpn23"].signingConfig = signingConfigs.getByName("release")
+                productFlavors["ovpn2"].signingConfig = signingConfigs.getByName("releaseOvpn2")
+            }
+        }
+    }
+
     compileOptions {
         targetCompatibility = JavaVersion.VERSION_1_8
         sourceCompatibility = JavaVersion.VERSION_1_8
diff --git a/main/src/main/java/de/blinkt/openvpn/core/LogItem.java b/main/src/main/java/de/blinkt/openvpn/core/LogItem.java
index 74601349..b6f51928 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/LogItem.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/LogItem.java
@@ -13,9 +13,11 @@ import android.content.pm.Signature;
 import android.content.res.Resources;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.text.TextUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Array;
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -28,6 +30,7 @@ import java.util.Arrays;
 import java.util.FormatFlagsConversionMismatchException;
 import java.util.Locale;
 import java.util.UnknownFormatConversionException;
+import java.util.Vector;
 
 import de.blinkt.openvpn.R;
 
@@ -336,10 +339,15 @@ public class LogItem implements Parcelable {
             CertificateFactory cf = CertificateFactory.getInstance("X.509");
             X509Certificate cert = (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(raw.toByteArray()));
             MessageDigest md = MessageDigest.getInstance("SHA-1");
+            MessageDigest mdsha256 = MessageDigest.getInstance("SHA-256");
+
             byte[] der = cert.getEncoded();
             md.update(der);
             byte[] digest = md.digest();
 
+            mdsha256.update(der);
+            byte[] digestSha256 = mdsha256.digest();
+
             if (Arrays.equals(digest, VpnStatus.officalkey))
                 apksign = c.getString(R.string.official_build);
             else if (Arrays.equals(digest, VpnStatus.officaldebugkey))
@@ -348,8 +356,15 @@ public class LogItem implements Parcelable {
                 apksign = "amazon version";
             else if (Arrays.equals(digest, VpnStatus.fdroidkey))
                 apksign = "F-Droid built and signed version";
-            else
-                apksign = c.getString(R.string.built_by, cert.getSubjectX500Principal().getName());
+            else if (Arrays.equals(digestSha256, VpnStatus.officialO2Key))
+                apksign = c.getString(R.string.official_o2build);
+            else {
+                Vector<String> hexnums = new Vector<>();
+                for (byte b: digestSha256) {
+                    hexnums.add(String.format(Locale.US, "%02x", b));
+                }
+                apksign = c.getString(R.string.built_by, cert.getSubjectX500Principal().getName(), TextUtils.join(":", hexnums));
+            }
 
             PackageInfo packageinfo = c.getPackageManager().getPackageInfo(c.getPackageName(), 0);
             version = packageinfo.versionName;
diff --git a/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java b/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
index 63e4547d..d1814fc2 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
@@ -190,6 +190,7 @@ public class VpnStatus {
     static final byte[] officaldebugkey = {-99, -69, 45, 71, 114, -116, 82, 66, -99, -122, 50, -70, -56, -111, 98, -35, -65, 105, 82, 43};
     static final byte[] amazonkey = {-116, -115, -118, -89, -116, -112, 120, 55, 79, -8, -119, -23, 106, -114, -85, -56, -4, 105, 26, -57};
     static final byte[] fdroidkey = {-92, 111, -42, -46, 123, -96, -60, 79, -27, -31, 49, 103, 11, -54, -68, -27, 17, 2, 121, 104};
+    static final byte[] officialO2Key = {-50, -119, -11, 121, 121, 122, -115, 84, 90, -122, 27, -117, -14, 60, 54, 127, 41, -45, 27, 55, -14, 90, 31, 72, -26, -85, -85, 67, 35, 54, 100, 42};
 
 
     private static ConnectionStatus mLastLevel = ConnectionStatus.LEVEL_NOTCONNECTED;
diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
index a83d091b..37145870 100755
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -260,9 +260,10 @@
     <string name="encryption_cipher">Encryption ciphers</string>
     <string name="packet_auth">Packet authentication</string>
     <string name="auth_dialog_title">Enter packet authentication method</string>
-    <string name="built_by">built by %s</string>
+    <string name="built_by">built by %1$s (FP: %2$s)</string>
     <string name="debug_build">debug build</string>
     <string name="official_build">official build</string>
+    <string name="official_o2build">official OpenVPN2 only build</string>
     <string name="make_selection_inline">Copy into profile</string>
     <string name="crashdump">Crashdump</string>
     <string name="add">Add</string>
diff --git a/main/src/ui/res/values-ar/strings.xml b/main/src/ui/res/values-ar/strings.xml
index acc98475..0b622804 100644
--- a/main/src/ui/res/values-ar/strings.xml
+++ b/main/src/ui/res/values-ar/strings.xml
@@ -259,7 +259,6 @@
     <string name="encryption_cipher">خوارزمية التشفير</string>
     <string name="packet_auth">حزمة المصادقة</string>
     <string name="auth_dialog_title">أدخل طريقة مصادقة الحزمة</string>
-    <string name="built_by">طوره %s</string>
     <string name="debug_build">بناء التصحيح</string>
     <string name="official_build">البنية الرسمية</string>
     <string name="make_selection_inline">نسخ إلى الملف الشخصي</string>
diff --git a/main/src/ui/res/values-be/strings.xml b/main/src/ui/res/values-be/strings.xml
index 5ab837f8..ee7c5e66 100644
--- a/main/src/ui/res/values-be/strings.xml
+++ b/main/src/ui/res/values-be/strings.xml
@@ -256,7 +256,6 @@
     <string name="encryption_cipher">Алгарытм шыфравання</string>
     <string name="packet_auth">Пакет праверкі сапраўднасці</string>
     <string name="auth_dialog_title">Увядзіце метад праверкі сапраўднасці пакетаў</string>
-    <string name="built_by">стварыў(-ла) %s</string>
     <string name="debug_build">зборка для адладкі</string>
     <string name="official_build">афіцыйная зборка</string>
     <string name="make_selection_inline">Скапіяваць у профіль</string>
diff --git a/main/src/ui/res/values-ca/strings.xml b/main/src/ui/res/values-ca/strings.xml
index 977a9aae..907fa160 100644
--- a/main/src/ui/res/values-ca/strings.xml
+++ b/main/src/ui/res/values-ca/strings.xml
@@ -157,7 +157,6 @@
     <string name="encryption_cipher">Tipus de xifratge</string>
     <string name="packet_auth">Autentificació de paquet</string>
     <string name="auth_dialog_title">Introdueix el mètode de autentificació de paquet</string>
-    <string name="built_by">fet per %s</string>
     <string name="make_selection_inline">Copia al perfil</string>
     <string name="crashdump">Volcat de fallada</string>
     <string name="add">Afegeix</string>
diff --git a/main/src/ui/res/values-cs/strings.xml b/main/src/ui/res/values-cs/strings.xml
index 2d26b8f8..58769658 100644
--- a/main/src/ui/res/values-cs/strings.xml
+++ b/main/src/ui/res/values-cs/strings.xml
@@ -256,7 +256,6 @@
     <string name="encryption_cipher">Šifrovací algoritmus</string>
     <string name="packet_auth">Ověřování paketů</string>
     <string name="auth_dialog_title">Zadej způsob ověřování paketů</string>
-    <string name="built_by">sestaveno od %s</string>
     <string name="debug_build">ladící verze</string>
     <string name="official_build">oficiální verze</string>
     <string name="make_selection_inline">Zkopírovat do profilu</string>
diff --git a/main/src/ui/res/values-da/strings.xml b/main/src/ui/res/values-da/strings.xml
index 67bdc845..0c0bb216 100644
--- a/main/src/ui/res/values-da/strings.xml
+++ b/main/src/ui/res/values-da/strings.xml
@@ -259,7 +259,6 @@
     <string name="encryption_cipher">Krypteringsstreng</string>
     <string name="packet_auth">Pakkegodkendelse</string>
     <string name="auth_dialog_title">Angiv pakkegodkendelsesmetode</string>
-    <string name="built_by">bygget af %s</string>
     <string name="debug_build">fejlfindingskompilering</string>
     <string name="official_build">officiel kompilering</string>
     <string name="make_selection_inline">Kopiér til profil</string>
diff --git a/main/src/ui/res/values-de/strings.xml b/main/src/ui/res/values-de/strings.xml
index 85e7882e..3481df90 100644
--- a/main/src/ui/res/values-de/strings.xml
+++ b/main/src/ui/res/values-de/strings.xml
@@ -261,7 +261,6 @@
     <string name="encryption_cipher">Verschlüsselungsalgorithmus</string>
     <string name="packet_auth">Paket-Authentifizierung</string>
     <string name="auth_dialog_title">Geben Sie den Authentifizierungsalgorithmus an</string>
-    <string name="built_by">compiliert von %s</string>
     <string name="debug_build">Testversion</string>
     <string name="official_build">offizielle Version</string>
     <string name="make_selection_inline">In das Profil einbetten</string>
diff --git a/main/src/ui/res/values-el/strings.xml b/main/src/ui/res/values-el/strings.xml
index 952878bf..2ea2d624 100644
--- a/main/src/ui/res/values-el/strings.xml
+++ b/main/src/ui/res/values-el/strings.xml
@@ -256,7 +256,6 @@
     <string name="encryption_cipher">Κρυπτογράφηση cipher</string>
     <string name="packet_auth">Πιστοποίηση πακέτων</string>
     <string name="auth_dialog_title">Εισάγετε τη μέθοδο πιστοποίησης πακέτων</string>
-    <string name="built_by">αναπτύχθηκε από %s</string>
     <string name="debug_build">build εντοπισμού σφαλμάτων</string>
     <string name="official_build">Επίσημη έκδοση</string>
     <string name="make_selection_inline">Αντιγραφή στο προφίλ</string>
diff --git a/main/src/ui/res/values-es/strings.xml b/main/src/ui/res/values-es/strings.xml
index d516213b..5c158581 100644
--- a/main/src/ui/res/values-es/strings.xml
+++ b/main/src/ui/res/values-es/strings.xml
@@ -260,7 +260,6 @@ hacia/de Móvil)</string>
     <string name="encryption_cipher">Algoritmo de encriptación</string>
     <string name="packet_auth">Autenticación de paquetes</string>
     <string name="auth_dialog_title">Introduzca método de autenticación de paquetes</string>
-    <string name="built_by">compilado por %s</string>
     <string name="debug_build">versión de depuración</string>
     <string name="official_build">versión oficial</string>
     <string name="make_selection_inline">Copiar en perfil</string>
diff --git a/main/src/ui/res/values-et/strings.xml b/main/src/ui/res/values-et/strings.xml
index 3f89f590..e75be966 100644
--- a/main/src/ui/res/values-et/strings.xml
+++ b/main/src/ui/res/values-et/strings.xml
@@ -257,7 +257,6 @@
     <string name="encryption_cipher">Krüptošiffer</string>
     <string name="packet_auth">Pakettide autentimine</string>
     <string name="auth_dialog_title">Sisestage pakettide autentimismeetod</string>
-    <string name="built_by">Kompileerija: %s</string>
     <string name="debug_build">Silumisversioon</string>
     <string name="official_build">Ametlik versioon</string>
     <string name="make_selection_inline">Kopeeri profiili</string>
diff --git a/main/src/ui/res/values-fa/strings.xml b/main/src/ui/res/values-fa/strings.xml
index 9a2b3959..efcefc7c 100644
--- a/main/src/ui/res/values-fa/strings.xml
+++ b/main/src/ui/res/values-fa/strings.xml
@@ -259,7 +259,6 @@
     <string name="encryption_cipher">رمزنگاری سری</string>
     <string name="packet_auth">بسته تأیید هویت</string>
     <string name="auth_dialog_title">روش اعتبار سنجی بسته را وارد کنید</string>
-    <string name="built_by">ساخته شده توسط %s</string>
     <string name="debug_build">اشکال زدایی ساخت</string>
     <string name="official_build">ساخت رسمی</string>
     <string name="make_selection_inline">کپی به نمایه</string>
diff --git a/main/src/ui/res/values-fr/strings.xml b/main/src/ui/res/values-fr/strings.xml
index 51e928db..ed1a04bd 100644
--- a/main/src/ui/res/values-fr/strings.xml
+++ b/main/src/ui/res/values-fr/strings.xml
@@ -260,7 +260,6 @@ Sur certaines ROM, cette notification joue un son.\nAndroid a introduit ces noti
     <string name="encryption_cipher">Algorithme de chiffrement</string>
     <string name="packet_auth">Authentification des paquets</string>
     <string name="auth_dialog_title">Méthode d\'authentification des paquets</string>
-    <string name="built_by">compilé par %s</string>
     <string name="debug_build">version de debug</string>
     <string name="official_build">version officielle</string>
     <string name="make_selection_inline">Copier dans le profil</string>
diff --git a/main/src/ui/res/values-he/strings.xml b/main/src/ui/res/values-he/strings.xml
index 3848baff..bfcde01e 100644
--- a/main/src/ui/res/values-he/strings.xml
+++ b/main/src/ui/res/values-he/strings.xml
@@ -260,7 +260,6 @@
     <string name="encryption_cipher">צופן הצפנה</string>
     <string name="packet_auth">אימות מנות</string>
     <string name="auth_dialog_title">נא למלא את שיטת אימות המנות</string>
-    <string name="built_by">נבנה על ידי %s</string>
     <string name="debug_build">מהדורה לפיתוח</string>
     <string name="official_build">מהדורה רשמית</string>
     <string name="make_selection_inline">העתקה לפרופיל</string>
diff --git a/main/src/ui/res/values-hu/strings.xml b/main/src/ui/res/values-hu/strings.xml
index 00e862de..9aa23312 100644
--- a/main/src/ui/res/values-hu/strings.xml
+++ b/main/src/ui/res/values-hu/strings.xml
@@ -259,7 +259,6 @@
     <string name="encryption_cipher">Titkosítás rejtjelezés</string>
     <string name="packet_auth">Csomag hitelesítés</string>
     <string name="auth_dialog_title">Adja meg a csomaghitelesítési metódust</string>
-    <string name="built_by">%s fordítóval</string>
     <string name="debug_build">hibakeresési fordítás</string>
     <string name="official_build">hivatalos build</string>
     <string name="make_selection_inline">Másolás profilba</string>
diff --git a/main/src/ui/res/values-in/strings.xml b/main/src/ui/res/values-in/strings.xml
index 80bffdb1..0a58623b 100644
--- a/main/src/ui/res/values-in/strings.xml
+++ b/main/src/ui/res/values-in/strings.xml
@@ -259,7 +259,6 @@
     <string name="encryption_cipher">Enkripsi sandi</string>
     <string name="packet_auth">Otentikasi paket</string>
     <string name="auth_dialog_title">Masukkan metode otentikasi paket</string>
-    <string name="built_by">dibangun oleh %s</string>
     <string name="debug_build">Pengembangan debug</string>
     <string name="official_build">Build Resmi</string>
     <string name="make_selection_inline">Salin ke profil</string>
diff --git a/main/src/ui/res/values-it/strings.xml b/main/src/ui/res/values-it/strings.xml
index e76e4159..228a2b99 100644
--- a/main/src/ui/res/values-it/strings.xml
+++ b/main/src/ui/res/values-it/strings.xml
@@ -260,7 +260,6 @@ Usa il tasto hardware Menù se non è visibile nella GUI.</string>
     <string name="encryption_cipher">Algoritmo di crittografia</string>
     <string name="packet_auth">Autenticazione pacchetti</string>
     <string name="auth_dialog_title">Seleziona il metodo di autenticazione dei pacchetti</string>
-    <string name="built_by">compilato da %s</string>
     <string name="debug_build">versione di debug</string>
     <string name="official_build">versione ufficiale</string>
     <string name="make_selection_inline">Copia nel profilo</string>
diff --git a/main/src/ui/res/values-ja/strings.xml b/main/src/ui/res/values-ja/strings.xml
index 67717413..75ab0c39 100644
--- a/main/src/ui/res/values-ja/strings.xml
+++ b/main/src/ui/res/values-ja/strings.xml
@@ -295,7 +295,6 @@ Android 4.4以上はポリシールーティングを使用します。route/ifc
     <string name="encryption_cipher">暗号化方式</string>
     <string name="packet_auth">パケット認証</string>
     <string name="auth_dialog_title">パケット認証方式を入力してください。</string>
-    <string name="built_by">%s によりビルドされました</string>
     <string name="debug_build">デバッグ ビルド</string>
     <string name="official_build">正式ビルド</string>
     <string name="make_selection_inline">プロファイルにコピー</string>
diff --git a/main/src/ui/res/values-ko/strings.xml b/main/src/ui/res/values-ko/strings.xml
index 00f6884c..3bacab69 100644
--- a/main/src/ui/res/values-ko/strings.xml
+++ b/main/src/ui/res/values-ko/strings.xml
@@ -256,7 +256,6 @@
     <string name="encryption_cipher">암호화 알고리즘</string>
     <string name="packet_auth">패킷 인증</string>
     <string name="auth_dialog_title">패킷 인증 방법 입력</string>
-    <string name="built_by">%s가 빌드</string>
     <string name="debug_build">디버그 빌드</string>
     <string name="official_build">공식 빌드</string>
     <string name="make_selection_inline">프로파일에 복사</string>
diff --git a/main/src/ui/res/values-nl/strings.xml b/main/src/ui/res/values-nl/strings.xml
index 4bbcd622..dbe1c61f 100644
--- a/main/src/ui/res/values-nl/strings.xml
+++ b/main/src/ui/res/values-nl/strings.xml
@@ -256,7 +256,6 @@
     <string name="encryption_cipher">Encryptiecijfer</string>
     <string name="packet_auth">Packet-authenticatie</string>
     <string name="auth_dialog_title">Voer de methode voor pakketauthenticatie in</string>
-    <string name="built_by">gebouwd door %s</string>
     <string name="debug_build">debug build</string>
     <string name="official_build">officiële build</string>
     <string name="make_selection_inline">Kopieer naar profiel</string>
diff --git a/main/src/ui/res/values-no/strings.xml b/main/src/ui/res/values-no/strings.xml
index 20ea61df..78893a1b 100644
--- a/main/src/ui/res/values-no/strings.xml
+++ b/main/src/ui/res/values-no/strings.xml
@@ -237,7 +237,6 @@
     <string name="encryption_cipher">Kryptering chiffer</string>
     <string name="packet_auth">Pakkegodkjenning</string>
     <string name="auth_dialog_title">Angi pakkeautentiseringsmetode</string>
-    <string name="built_by">bygget av %s</string>
     <string name="debug_build">avlusings-delversjon</string>
     <string name="official_build">offisiell delversjon</string>
     <string name="make_selection_inline">Kopier til profil</string>
diff --git a/main/src/ui/res/values-pl/strings.xml b/main/src/ui/res/values-pl/strings.xml
index f089422d..8db0c8dd 100644
--- a/main/src/ui/res/values-pl/strings.xml
+++ b/main/src/ui/res/values-pl/strings.xml
@@ -259,7 +259,6 @@
     <string name="encryption_cipher">Szyfr kodujący</string>
     <string name="packet_auth">Pakiety uwierzytelniania</string>
     <string name="auth_dialog_title">Wpisz metodę uwierzytelniania pakietów</string>
-    <string name="built_by">zbudowany przez %s</string>
     <string name="debug_build">Kompilacja z debugiem</string>
     <string name="official_build">Oficjalna kompilacja</string>
     <string name="make_selection_inline">Skopiuj do profilu</string>
diff --git a/main/src/ui/res/values-pt-rBR/strings.xml b/main/src/ui/res/values-pt-rBR/strings.xml
index bccd0ee9..c420eb7c 100644
--- a/main/src/ui/res/values-pt-rBR/strings.xml
+++ b/main/src/ui/res/values-pt-rBR/strings.xml
@@ -259,7 +259,6 @@
     <string name="encryption_cipher">Cifra de criptografia</string>
     <string name="packet_auth">Autenticação de pacotes</string>
     <string name="auth_dialog_title">Selecione o método de autenticação de pacotes</string>
-    <string name="built_by">compilado por %s</string>
     <string name="debug_build">compilação de depuração</string>
     <string name="official_build">compilação oficial</string>
     <string name="make_selection_inline">Copiar para o perfil</string>
diff --git a/main/src/ui/res/values-pt/strings.xml b/main/src/ui/res/values-pt/strings.xml
index 63b9631c..79a1a03e 100644
--- a/main/src/ui/res/values-pt/strings.xml
+++ b/main/src/ui/res/values-pt/strings.xml
@@ -234,7 +234,6 @@
     <string name="encryption_cipher">Cifra de encriptação</string>
     <string name="packet_auth">Autenticação de pacotes</string>
     <string name="auth_dialog_title">Selecione o método de autenticação de pacotes</string>
-    <string name="built_by">Feito por %s</string>
     <string name="debug_build">compilação de debug</string>
     <string name="official_build">compilação oficial</string>
     <string name="make_selection_inline">Copiar para o perfil</string>
diff --git a/main/src/ui/res/values-ro/strings.xml b/main/src/ui/res/values-ro/strings.xml
index 479a7b01..41745d40 100644
--- a/main/src/ui/res/values-ro/strings.xml
+++ b/main/src/ui/res/values-ro/strings.xml
@@ -258,7 +258,6 @@
     <string name="encryption_cipher">Cifru criptare</string>
     <string name="packet_auth">Autentificare pachete</string>
     <string name="auth_dialog_title">Introduceţi metoda de autentificare de pachete</string>
-    <string name="built_by">compilat de %s</string>
     <string name="debug_build">versiune debug</string>
     <string name="official_build">versiune oficială</string>
     <string name="make_selection_inline">Copiaţi în profil</string>
diff --git a/main/src/ui/res/values-ru/strings.xml b/main/src/ui/res/values-ru/strings.xml
index 435250d0..8130851c 100644
--- a/main/src/ui/res/values-ru/strings.xml
+++ b/main/src/ui/res/values-ru/strings.xml
@@ -262,7 +262,6 @@ API VPNService не позволяет указывать сети, которы
     <string name="encryption_cipher">Коды шифрования</string>
     <string name="packet_auth">Аутентификация пакетов</string>
     <string name="auth_dialog_title">Укажите метод аутентификации пакетов</string>
-    <string name="built_by">собрано с помощью %s</string>
     <string name="debug_build">Отладочная сборка</string>
     <string name="official_build">официальная сборка</string>
     <string name="make_selection_inline">Скопировать в конфигурацию</string>
diff --git a/main/src/ui/res/values-si/strings.xml b/main/src/ui/res/values-si/strings.xml
index 897372f0..ed83a068 100644
--- a/main/src/ui/res/values-si/strings.xml
+++ b/main/src/ui/res/values-si/strings.xml
@@ -257,7 +257,6 @@
     <string name="encryption_cipher">සංකේතාංකන කේතාංක</string>
     <string name="packet_auth">පැකට් සත්‍යාපනය</string>
     <string name="auth_dialog_title">පැකට් සත්‍යාපන ක්‍රමය ඇතුලත් කරන්න</string>
-    <string name="built_by">%sවිසින් ගොඩනගා ඇත</string>
     <string name="debug_build">නිදොස් ගොඩනැගීම</string>
     <string name="official_build">නිල ගොඩනැගීම</string>
     <string name="make_selection_inline">පැතිකඩට පිටපත් කරන්න</string>
diff --git a/main/src/ui/res/values-sk/strings.xml b/main/src/ui/res/values-sk/strings.xml
index f9b8b421..8736d924 100644
--- a/main/src/ui/res/values-sk/strings.xml
+++ b/main/src/ui/res/values-sk/strings.xml
@@ -257,7 +257,6 @@
     <string name="encryption_cipher">Šifrovacia šifra</string>
     <string name="packet_auth">autentifikácia paketov</string>
     <string name="auth_dialog_title">Zadajte metódu autentifikácie paketov</string>
-    <string name="built_by">zostavené od %s</string>
     <string name="debug_build">ladiaca verzia</string>
     <string name="official_build">oficiálna verzia</string>
     <string name="make_selection_inline">Skopírovať do profilu</string>
diff --git a/main/src/ui/res/values-sl/strings.xml b/main/src/ui/res/values-sl/strings.xml
index 94c8bae9..48045339 100644
--- a/main/src/ui/res/values-sl/strings.xml
+++ b/main/src/ui/res/values-sl/strings.xml
@@ -254,7 +254,6 @@
     <string name="encryption_cipher">Šifra</string>
     <string name="packet_auth">Overitev paketov</string>
     <string name="auth_dialog_title">Vnesite način overitve paketov</string>
-    <string name="built_by">izgradil %s</string>
     <string name="debug_build">razhroščevalna izgradnja</string>
     <string name="official_build">uradna izgradnja</string>
     <string name="make_selection_inline">Kopiraj v profil</string>
diff --git a/main/src/ui/res/values-sr-rSP/strings.xml b/main/src/ui/res/values-sr-rSP/strings.xml
index e438fc3c..cf3aa892 100644
--- a/main/src/ui/res/values-sr-rSP/strings.xml
+++ b/main/src/ui/res/values-sr-rSP/strings.xml
@@ -257,7 +257,6 @@
     <string name="encryption_cipher">Шифровање шифре</string>
     <string name="packet_auth">Аутентификација пакета</string>
     <string name="auth_dialog_title">Унесите начин провјере аутентичности пакета</string>
-    <string name="built_by">саградио %s</string>
     <string name="debug_build">дебуг буилд</string>
     <string name="official_build">званична градња</string>
     <string name="make_selection_inline">Копирајте у профил</string>
diff --git a/main/src/ui/res/values-sv/strings.xml b/main/src/ui/res/values-sv/strings.xml
index 6fe48fc0..f5c264ce 100644
--- a/main/src/ui/res/values-sv/strings.xml
+++ b/main/src/ui/res/values-sv/strings.xml
@@ -259,7 +259,6 @@
     <string name="encryption_cipher">Krypteringschiffer</string>
     <string name="packet_auth">Paketautentisering</string>
     <string name="auth_dialog_title">Ange autentiseringsmetod för paket</string>
-    <string name="built_by">byggd av %s</string>
     <string name="debug_build">felsöknings bygge</string>
     <string name="official_build">officiellt bygge</string>
     <string name="make_selection_inline">Kopiera till profil</string>
diff --git a/main/src/ui/res/values-tr/strings.xml b/main/src/ui/res/values-tr/strings.xml
index e81d824c..39f958ed 100644
--- a/main/src/ui/res/values-tr/strings.xml
+++ b/main/src/ui/res/values-tr/strings.xml
@@ -259,7 +259,6 @@
     <string name="encryption_cipher">Şifre şifresi</string>
     <string name="packet_auth">Paket kimlik doğrulaması</string>
     <string name="auth_dialog_title">Paket kimlik doğrulama yöntemini girin</string>
-    <string name="built_by">%s tarafından derlendi</string>
     <string name="debug_build">hata ayıklama yapısı</string>
     <string name="official_build">resmi yapı</string>
     <string name="make_selection_inline">Profile kopyala</string>
diff --git a/main/src/ui/res/values-uk/strings.xml b/main/src/ui/res/values-uk/strings.xml
index 6db76c81..814435ac 100644
--- a/main/src/ui/res/values-uk/strings.xml
+++ b/main/src/ui/res/values-uk/strings.xml
@@ -259,7 +259,6 @@
     <string name="encryption_cipher">Алгоритм шифрування</string>
     <string name="packet_auth">Пакети автентифікації</string>
     <string name="auth_dialog_title">Введіть метод автентифікації пакетів</string>
-    <string name="built_by">побудована по %s</string>
     <string name="debug_build">відлагоджувальна збірка</string>
     <string name="official_build">Офіційна збірка</string>
     <string name="make_selection_inline">Скопіювати в профіль</string>
diff --git a/main/src/ui/res/values-vi/strings.xml b/main/src/ui/res/values-vi/strings.xml
index 0dbcbc92..a721c8b8 100644
--- a/main/src/ui/res/values-vi/strings.xml
+++ b/main/src/ui/res/values-vi/strings.xml
@@ -259,7 +259,6 @@
     <string name="encryption_cipher">Mã hóa mật mã</string>
     <string name="packet_auth">Gói xác thực</string>
     <string name="auth_dialog_title">Nhập phương thức xác thực gói</string>
-    <string name="built_by">được xây dựng bởi %s</string>
     <string name="debug_build">bản dựng gỡ lỗi</string>
     <string name="official_build">bản dựng chính thức</string>
     <string name="make_selection_inline">Sao chép vào hồ sơ</string>
diff --git a/main/src/ui/res/values-zh-rCN/strings.xml b/main/src/ui/res/values-zh-rCN/strings.xml
index e6d30715..894d0687 100644
--- a/main/src/ui/res/values-zh-rCN/strings.xml
+++ b/main/src/ui/res/values-zh-rCN/strings.xml
@@ -260,7 +260,6 @@
     <string name="encryption_cipher">加密算法(cipher)</string>
     <string name="packet_auth">数据包验证</string>
     <string name="auth_dialog_title">输入数据包验证方式</string>
-    <string name="built_by">由 %s 构建</string>
     <string name="debug_build">调试版本</string>
     <string name="official_build">正式版本</string>
     <string name="make_selection_inline">复制进配置文件</string>
diff --git a/main/src/ui/res/values-zh-rTW/strings.xml b/main/src/ui/res/values-zh-rTW/strings.xml
index 56aaafb4..6b54dc03 100644
--- a/main/src/ui/res/values-zh-rTW/strings.xml
+++ b/main/src/ui/res/values-zh-rTW/strings.xml
@@ -257,7 +257,6 @@
     <string name="encryption_cipher">加密法</string>
     <string name="packet_auth">封包驗證</string>
     <string name="auth_dialog_title">輸入封包驗證方法</string>
-    <string name="built_by">由 %s 建立</string>
     <string name="debug_build">除錯用版本</string>
     <string name="official_build">正式版本</string>
     <string name="make_selection_inline">複製到設定檔</string>