Merge branch 'develop' into release/1.0.7

SwissCovid · Jul 16, 2020 · f98768c · f98768c
2 parents aaeae56 + 730a4aa
commit f98768c
Show file tree

Hide file tree

Showing 7 changed files with 315 additions and 316 deletions.
diff --git a/DP3TApp/SharedUI/Base/NSWebViewController.swift b/DP3TApp/SharedUI/Base/NSWebViewController.swift
@@ -123,7 +123,7 @@ extension NSWebViewController: WKNavigationDelegate {
                 return
             }
 
-            if scheme == "http" || scheme == "https" || scheme == "mailto" {
+            if scheme == "http" || scheme == "https" || scheme == "mailto" || scheme == "tel" {
                 UIApplication.shared.open(url, options: [:], completionHandler: nil)
                 decisionHandler(.cancel)
                 return

diff --git a/DP3TApp/SharedUI/Style/NSLabelType.swift b/DP3TApp/SharedUI/Style/NSLabelType.swift
@@ -128,8 +128,7 @@ public enum NSLabelType: UBLabelType {
     }
 
     public var hyphenationFactor: Float {
-        if self == .splashTitle { return 0.0 }
-        return 1.0
+        return 0.0
     }
 
     public var lineBreakMode: NSLineBreakMode {

diff --git a/Translations/fr.lproj/Localizable.strings b/Translations/fr.lproj/Localizable.strings
@@ -682,7 +682,7 @@
 
 /*Text auf der Onboarding Page für die Permission der Exposure-Library, iOS*/
 /*Fuzzy*/
-"onboarding_gaen_text_ios" = "Pour utiliser l'application, les notifications d'exposition au COVID 19 doivent être activée.";
+"onboarding_gaen_text_ios" = "Pour utiliser l'application, les notifications d'exposition au COVID 19 doivent être activées.";
 
 /*Aktivieren-Button auf der Onboarding Page für die Permission der Exposure-Library*/
 "onboarding_gaen_button_activate" = "Activer";
@@ -851,7 +851,7 @@
 "tracing_setting_text_android" = "Notifications d'exposition au COVID 19";
 
 /*Text auf der Onboarding Page für die Permission der Exposure-Library, Android*/
-"onboarding_gaen_text_android" = "Pour utiliser l'application, les notifications d'exposition au COVID 19 doivent être activée.";
+"onboarding_gaen_text_android" = "Pour utiliser l'application, les notifications d'exposition au COVID 19 doivent être activées.";
 
 /*Onboarding Disclaimer Screen: AppName Title*/
 "onboarding_disclaimer_heading" = "SwissCovid";

diff --git a/Translations/it.lproj/Localizable.strings b/Translations/it.lproj/Localizable.strings
@@ -800,7 +800,7 @@
 "onboarding_legal_alert_no" = "No";
 
 /*Erster Onboarding-Screen für Pilot: JA von Popup in dem Nutzer Pilot bestätigen muss*/
-"onboarding_legal_alert_yes" = "Si";
+"onboarding_legal_alert_yes" = "Sì";
 
 /*Erster Onboarding-Screen für Pilot: Blockierendes Popup für Nutzer die nicht im Pilot sind, Titel*/
 "onboarding_legal_blocker_title" = "Fase pilota";

diff --git a/Translations/ti.lproj/Localizable.strings b/Translations/ti.lproj/Localizable.strings
@@ -189,7 +189,7 @@
 "inform_detail_box_subtitle" = "ብኮቪድኮድ";
 
 /*Inform Detai Weisse Box Titel*/
-"inform_detail_box_title" = "Break the chains of infection";
+"inform_detail_box_title" = "ሰንሰለት ለበዳ ሕማም ምቁራጽ";
 
 /*Inform Detail Weisse Box Button*/
 "inform_detail_box_button" = "ኮቪድኮድ ኣእትው";

diff --git a/Translations/tr.lproj/InfoPlist.strings b/Translations/tr.lproj/InfoPlist.strings
@@ -1,3 +1,3 @@
 "CFBundleDisplayName" = "SwissCovid";
-"NSBluetoothPeripheralUsageDescription" = "Encounters will be recognised in the background via low energy Bluetooth.";
-"NSBluetoothAlwaysUsageDescription" = "Encounters will be recognised in the background via low energy Bluetooth.";
+"NSBluetoothPeripheralUsageDescription" = "Temaslar arka planda Bluetooth yoluyla, asgari pil kullanımı ile tespit edilmektedir.";
+"NSBluetoothAlwaysUsageDescription" = "Temaslar arka planda Bluetooth yoluyla, asgari pil kullanımı ile tespit edilmektedir.";