瀏覽代碼

Merge branch 'Crowdin' into dev_merged_with_XPM

Jon B.M 4 年之前
父節點
當前提交
28d0c2dbfe
共有 42 個文件被更改,包括 2227 次插入25 次删除
  1. 6 0
      FreeAPS.xcodeproj/project.pbxproj
  2. 32 3
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
  3. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/100.png
  4. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/1024.png
  5. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/114.png
  6. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/120.png
  7. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/128.png
  8. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/144.png
  9. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/152.png
  10. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/16.png
  11. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/167.png
  12. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/172.png
  13. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/180.png
  14. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/196.png
  15. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/20.png
  16. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/216.png
  17. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/256.png
  18. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/29.png
  19. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/32.png
  20. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/40.png
  21. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/48.png
  22. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/50.png
  23. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/512.png
  24. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/55.png
  25. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/57.png
  26. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/58.png
  27. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/60.png
  28. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/64.png
  29. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/72.png
  30. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/76.png
  31. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/80.png
  32. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/87.png
  33. 二進制
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/88.png
  34. 1 1
      FreeAPS/Sources/Localizations/Main/fr.lproj/Localizable.strings
  35. 20 20
      FreeAPS/Sources/Localizations/Main/it.lproj/Localizable.strings
  36. 1 1
      FreeAPS/Sources/Localizations/Main/nb.lproj/Localizable.strings
  37. 540 0
      FreeAPS/Sources/Localizations/Main/pt-BR.lproj/Localizable.strings
  38. 540 0
      FreeAPS/Sources/Localizations/Main/pt-PT.lproj/Localizable.strings
  39. 540 0
      FreeAPS/Sources/Localizations/Main/pt.lproj/Localizable.strings
  40. 540 0
      FreeAPS/Sources/Localizations/Main/pt_BR.lproj/Localizable.strings
  41. 5 0
      FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift
  42. 2 0
      crowdin.yml

+ 6 - 0
FreeAPS.xcodeproj/project.pbxproj

@@ -346,6 +346,8 @@
 		198377E2266C0AC8004DE65E /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
 		198377E2266C0AC8004DE65E /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
 		198377E3266C0ADC004DE65E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = "<group>"; };
 		198377E3266C0ADC004DE65E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = "<group>"; };
 		198377E4266C13D2004DE65E /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
 		198377E4266C13D2004DE65E /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
+		199732B4271B72DD00129A3F /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		199732B5271B9EE900129A3F /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		223EC0494F55A91E3EA69EF4 /* BolusViewModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BolusViewModel.swift; sourceTree = "<group>"; };
 		223EC0494F55A91E3EA69EF4 /* BolusViewModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BolusViewModel.swift; sourceTree = "<group>"; };
 		2AD22C985B79A2F0D2EA3D9D /* PumpConfigRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PumpConfigRootView.swift; sourceTree = "<group>"; };
 		2AD22C985B79A2F0D2EA3D9D /* PumpConfigRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PumpConfigRootView.swift; sourceTree = "<group>"; };
 		2F2A13DF0EDEEEDC4106AA2A /* NightscoutConfigDataFlow.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NightscoutConfigDataFlow.swift; sourceTree = "<group>"; };
 		2F2A13DF0EDEEEDC4106AA2A /* NightscoutConfigDataFlow.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NightscoutConfigDataFlow.swift; sourceTree = "<group>"; };
@@ -1684,6 +1686,8 @@
 				tr,
 				tr,
 				uk,
 				uk,
 				fi,
 				fi,
+				"pt-PT",
+				"pt-BR",
 			);
 			);
 			mainGroup = 388E594F25AD948C0019842D;
 			mainGroup = 388E594F25AD948C0019842D;
 			packageReferences = (
 			packageReferences = (
@@ -2034,6 +2038,8 @@
 				198377E3266C0ADC004DE65E /* tr */,
 				198377E3266C0ADC004DE65E /* tr */,
 				198377E4266C13D2004DE65E /* uk */,
 				198377E4266C13D2004DE65E /* uk */,
 				1918333A26ADA46800F45722 /* fi */,
 				1918333A26ADA46800F45722 /* fi */,
+				199732B4271B72DD00129A3F /* pt-PT */,
+				199732B5271B9EE900129A3F /* pt-BR */,
 			);
 			);
 			name = Localizable.strings;
 			name = Localizable.strings;
 			sourceTree = "<group>";
 			sourceTree = "<group>";

+ 32 - 3
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -139,7 +139,14 @@
       "scale" : "3x"
       "scale" : "3x"
     },
     },
     {
     {
-      "size" : "40x40",
+      "idiom" : "watch",
+      "role" : "notificationCenter",
+      "scale" : "2x",
+      "size" : "33x33",
+      "subtype" : "45mm"
+    },
+    {
+      "filename" : "80.png",
       "idiom" : "watch",
       "idiom" : "watch",
       "filename" : "1024_-40@2x.png",
       "filename" : "1024_-40@2x.png",
       "scale" : "2x",
       "scale" : "2x",
@@ -155,7 +162,14 @@
       "subtype" : "40mm"
       "subtype" : "40mm"
     },
     },
     {
     {
-      "size" : "50x50",
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "46x46",
+      "subtype" : "41mm"
+    },
+    {
+      "filename" : "100.png",
       "idiom" : "watch",
       "idiom" : "watch",
       "filename" : "1024_-50@2x.png",
       "filename" : "1024_-50@2x.png",
       "scale" : "2x",
       "scale" : "2x",
@@ -163,7 +177,14 @@
       "subtype" : "44mm"
       "subtype" : "44mm"
     },
     },
     {
     {
-      "size" : "86x86",
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "51x51",
+      "subtype" : "45mm"
+    },
+    {
+      "filename" : "172.png",
       "idiom" : "watch",
       "idiom" : "watch",
       "filename" : "1024_-86@2x.png",
       "filename" : "1024_-86@2x.png",
       "scale" : "2x",
       "scale" : "2x",
@@ -187,6 +208,14 @@
       "subtype" : "44mm"
       "subtype" : "44mm"
     },
     },
     {
     {
+      "idiom" : "watch",
+      "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "117x117",
+      "subtype" : "45mm"
+    },
+    {
+      "filename" : "1024.png",
       "idiom" : "watch-marketing",
       "idiom" : "watch-marketing",
       "filename" : "1024_-1024@1x.png",
       "filename" : "1024_-1024@1x.png",
       "size" : "1024x1024",
       "size" : "1024x1024",

二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/100.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/1024.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/114.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/120.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/128.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/144.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/152.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/16.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/167.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/172.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/180.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/196.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/20.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/216.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/256.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/29.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/32.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/40.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/48.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/50.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/512.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/55.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/57.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/58.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/60.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/64.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/72.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/76.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/80.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/87.png


二進制
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/88.png


文件差異過大導致無法顯示
+ 1 - 1
FreeAPS/Sources/Localizations/Main/fr.lproj/Localizable.strings


文件差異過大導致無法顯示
+ 20 - 20
FreeAPS/Sources/Localizations/Main/it.lproj/Localizable.strings


+ 1 - 1
FreeAPS/Sources/Localizations/Main/nb.lproj/Localizable.strings

@@ -149,7 +149,7 @@
 "Run now" = "Kjør nå";
 "Run now" = "Kjør nå";
 
 
 /*  */
 /*  */
-"Last run" = "Last run";
+"Last run" = "Siste kjøring";
 
 
 /*  */
 /*  */
 "Sensitivity" = "Insulinfølsomhet";
 "Sensitivity" = "Insulinfølsomhet";

文件差異過大導致無法顯示
+ 540 - 0
FreeAPS/Sources/Localizations/Main/pt-BR.lproj/Localizable.strings


文件差異過大導致無法顯示
+ 540 - 0
FreeAPS/Sources/Localizations/Main/pt-PT.lproj/Localizable.strings


文件差異過大導致無法顯示
+ 540 - 0
FreeAPS/Sources/Localizations/Main/pt.lproj/Localizable.strings


文件差異過大導致無法顯示
+ 540 - 0
FreeAPS/Sources/Localizations/Main/pt_BR.lproj/Localizable.strings


+ 5 - 0
FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift

@@ -849,6 +849,11 @@ extension MainChartView {
             minValue = min(minValue, minTargetValue)
             minValue = min(minValue, minTargetValue)
         }
         }
 
 
+        if minValue == maxValue {
+            minValue = Config.minGlucose
+            maxValue = Config.maxGlucose
+        }
+
         return (min: minValue, max: maxValue)
         return (min: minValue, max: maxValue)
     }
     }
 
 

+ 2 - 0
crowdin.yml

@@ -16,6 +16,8 @@ export_languages:
   - tr
   - tr
   - uk
   - uk
   - zh-CN
   - zh-CN
+  - pt-PT
+  - pt-BR
 files:
 files:
   - source: /FreeAPS/Sources/Localizations/Main/en.lproj/Localizable.strings
   - source: /FreeAPS/Sources/Localizations/Main/en.lproj/Localizable.strings
     translation: /FreeAPS/Sources/Localizations/Main/%osx_locale%.lproj/Localizable.strings
     translation: /FreeAPS/Sources/Localizations/Main/%osx_locale%.lproj/Localizable.strings