Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit 8bfd4e5

Browse files
haosaphaosap
authored
Merge pull request #304 from corona-warn-app/development
0.8.2 1250
2 parents 1705683 + bea58f0 commit 8bfd4e5

File tree

44 files changed

+1872
-268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1872
-268
lines changed

‎cfg/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.8.2.1226
1+
0.8.2.1250

‎src/xcode/ENA/ENA.xcodeproj/project.pbxproj

Lines changed: 38 additions & 8 deletions
Large diffs are not rendered by default.

‎src/xcode/ENA/ENA/Resources/Assets/ena-colors.xcassets/Miscellaneous Colors/ENA Chevron Color.colorset/Contents.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "0.300",
8+
"blue" : "0x43",
9+
"green" : "0x3C",
10+
"red" : "0x3C"
11+
}
12+
},
13+
"idiom" : "universal"
14+
},
15+
{
16+
"appearances" : [
17+
{
18+
"appearance" : "luminosity",
19+
"value" : "dark"
20+
}
21+
],
22+
"color" : {
23+
"color-space" : "srgb",
24+
"components" : {
25+
"alpha" : "0.300",
26+
"blue" : "0xF5",
27+
"green" : "0xEB",
28+
"red" : "0xEB"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

‎src/xcode/ENA/ENA/Resources/Assets/ena-colors.xcassets/Miscellaneous Colors/ENA Shadow Color.colorset/Contents.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "0.150",
8+
"blue" : "0.000",
9+
"green" : "0.000",
10+
"red" : "0.000"
11+
}
12+
},
13+
"idiom" : "universal"
14+
},
15+
{
16+
"appearances" : [
17+
{
18+
"appearance" : "luminosity",
19+
"value" : "dark"
20+
}
21+
],
22+
"color" : {
23+
"color-space" : "srgb",
24+
"components" : {
25+
"alpha" : "0.000",
26+
"blue" : "1.000",
27+
"green" : "1.000",
28+
"red" : "1.000"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

‎src/xcode/ENA/ENA/Resources/Localization/de.lproj/Localizable.strings

Lines changed: 63 additions & 28 deletions
Large diffs are not rendered by default.

‎src/xcode/ENA/ENA/Resources/Localization/de.lproj/usage.html

Lines changed: 448 additions & 0 deletions
Large diffs are not rendered by default.

‎src/xcode/ENA/ENA/Resources/Localization/en.lproj/Localizable.strings

Lines changed: 78 additions & 33 deletions
Large diffs are not rendered by default.

‎src/xcode/ENA/ENA/Resources/Localization/en.lproj/Localizable.stringsdict

Lines changed: 48 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
1+
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
32
<plist version="1.0">
43
<dict>
54
<key>ExposureDetection_Refreshed_Format</key>
@@ -13,10 +12,13 @@
1312
<key>NSStringFormatValueTypeKey</key>
1413
<string>u</string>
1514
<key>zero</key>
15+
<!-- XFLD: Plural form for Zero -->
1616
<string>Today, %%1$@</string>
1717
<key>one</key>
18+
<!-- XFLD: Plural form for One -->
1819
<string>Yesterday, %%1$@</string>
1920
<key>other</key>
21+
<!-- XFLD: Plural form for Other -->
2022
<string>%%2$@, %%1$@</string>
2123
</dict>
2224
</dict>
@@ -62,6 +64,48 @@
6264
<string>%u days since last encounter</string>
6365
</dict>
6466
</dict>
67+
<key>Home_Risk_Number_Contacts_Item_Title</key>
68+
<dict>
69+
<key>NSStringLocalizedFormatKey</key>
70+
<string>%#@VARIABLE@</string>
71+
<key>VARIABLE</key>
72+
<dict>
73+
<key>NSStringFormatSpecTypeKey</key>
74+
<string>NSStringPluralRuleType</string>
75+
<key>NSStringFormatValueTypeKey</key>
76+
<string>u</string>
77+
<key>zero</key>
78+
<!-- XFLD: Plural form for Zero -->
79+
<string>No exposure up to now</string>
80+
<key>one</key>
81+
<!-- XFLD: Plural form for One -->
82+
<string>%u exposure</string>
83+
<key>other</key>
84+
<!-- XFLD: Plural form for Other -->
85+
<string>%u exposures</string>
86+
</dict>
87+
</dict>
88+
<key>Home_Risk_Last_Contact_Item_Title</key>
89+
<dict>
90+
<key>NSStringLocalizedFormatKey</key>
91+
<string>%#@VARIABLE@</string>
92+
<key>VARIABLE</key>
93+
<dict>
94+
<key>NSStringFormatSpecTypeKey</key>
95+
<string>NSStringPluralRuleType</string>
96+
<key>NSStringFormatValueTypeKey</key>
97+
<string>u</string>
98+
<key>zero</key>
99+
<!-- XFLD: Plural form for Zero -->
100+
<string>Less than one day since last exposure</string>
101+
<key>one</key>
102+
<!-- XFLD: Plural form for One -->
103+
<string>%u day since last exposure</string>
104+
<key>other</key>
105+
<!-- XFLD: Plural form for Other -->
106+
<string>%u days since last exposure</string>
107+
</dict>
108+
</dict>
65109
<key>Home_Risk_Status_Counter_Label</key>
66110
<dict>
67111
<key>NSStringLocalizedFormatKey</key>
@@ -93,75 +137,6 @@
93137
<string>%02u</string>
94138
</dict>
95139
</dict>
96-
<key>Home_Risk_High_Number_Contacts_Item_Title</key>
97-
<dict>
98-
<key>NSStringLocalizedFormatKey</key>
99-
<string>%#@VARIABLE@</string>
100-
<key>VARIABLE</key>
101-
<dict>
102-
<key>NSStringFormatSpecTypeKey</key>
103-
<string>NSStringPluralRuleType</string>
104-
<key>NSStringFormatValueTypeKey</key>
105-
<string>u</string>
106-
<key>zero</key>
107-
<!-- XFLD: Plural form for Zero -->
108-
<string>No exposure up to now</string>
109-
<key>one</key>
110-
<!-- XFLD: Plural form for One -->
111-
<string>%u exposure</string>
112-
<key>other</key>
113-
<!-- XFLD: Plural form for Other -->
114-
<string>%u exposures</string>
115-
</dict>
116-
</dict>
117-
<key>Home_Risk_Last_Contact_Item_Title</key>
118-
<dict>
119-
<key>NSStringLocalizedFormatKey</key>
120-
<string>%#@VARIABLE@</string>
121-
<key>VARIABLE</key>
122-
<dict>
123-
<key>NSStringFormatSpecTypeKey</key>
124-
<string>NSStringPluralRuleType</string>
125-
<key>NSStringFormatValueTypeKey</key>
126-
<string>u</string>
127-
<key>zero</key>
128-
<!-- XFLD: Plural form for Zero -->
129-
<string>Less than one day since the last encounter</string>
130-
<key>one</key>
131-
<!-- XFLD: Plural form for One -->
132-
<string>%u day since the last encounter</string>
133-
<key>other</key>
134-
<!-- XFLD: Plural form for Other -->
135-
<string>%u days since the last encounter</string>
136-
</dict>
137-
</dict>
138-
<key>Home_Risk_Status_Counter_Label</key>
139-
<dict>
140-
<key>NSStringLocalizedFormatKey</key>
141-
<string>%#@minutes@%#</string>
142-
<key>minutes</key>
143-
<dict>
144-
<key>NSStringFormatSpecTypeKey</key>
145-
<string>NSStringPluralRuleType</string>
146-
<key>NSStringFormatValueTypeKey</key>
147-
<string>u</string>
148-
<key>zero</key>
149-
<string>Update in %02u:%2$#@seconds@ seconds</string>
150-
<key>one</key>
151-
<string>Update in %02u:%2$#@seconds@ minute</string>
152-
<key>other</key>
153-
<string>Update in %02u:%2$#@seconds@ minutes</string>
154-
</dict>
155-
<key>seconds</key>
156-
<dict>
157-
<key>NSStringFormatSpecTypeKey</key>
158-
<string>NSStringPluralRuleType</string>
159-
<key>NSStringFormatValueTypeKey</key>
160-
<string>u</string>
161-
<key>other</key>
162-
<string>%02u</string>
163-
</dict>
164-
</dict>
165140
<key>ENSetting_Tracing_History</key>
166141
<dict>
167142
<key>NSStringLocalizedFormatKey</key>
@@ -177,10 +152,10 @@
177152
<string>Exposure logging has been active for less than one day. An exposure check can only be reliable if exposure logging is permanently activated.</string>
178153
<key>one</key>
179154
<!-- XFLD: Plural form for One -->
180-
<string>Exposure logging has been active for less than %u day. An exposure check can only be reliable if exposure logging is permanently activated.</string>
155+
<string>Exposure logging has been active for %u day. The exposure check is only reliable if exposure logging is permanently activated.</string>
181156
<key>other</key>
182157
<!-- XFLD: Plural form for Other -->
183-
<string>Exposure logging has been active for less than %u days. An exposure check can only be reliable if exposure logging is permanently activated.</string>
158+
<string>Exposure logging has been active for %u days. An exposure check can only be reliable if exposure logging is permanently activated.</string>
184159
</dict>
185160
</dict>
186161
</dict>

0 commit comments

Comments
 (0)