Skip to content

Commit 5409364

Browse files
easydev991easydev991
authored
Merge pull request #101 from OlegEremenko991/bugfix/plurals-update
Поправил локализацию множественных чисел и поднял версию сборки до 3.2.2 (1)
2 parents 8b59759 + 5c142d3 commit 5409364

File tree

3 files changed

+39
-39
lines changed

3 files changed

+39
-39
lines changed

‎SwiftUI-WorkoutApp.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,7 +1216,7 @@
12161216
"$(inherited)",
12171217
"@executable_path/Frameworks",
12181218
);
1219-
MARKETING_VERSION = 3.2.1;
1219+
MARKETING_VERSION = 3.2.2;
12201220
PRODUCT_BUNDLE_IDENTIFIER = com.FGU.WorkOut;
12211221
PRODUCT_NAME = WorkoutApp;
12221222
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1252,7 +1252,7 @@
12521252
"$(inherited)",
12531253
"@executable_path/Frameworks",
12541254
);
1255-
MARKETING_VERSION = 3.2.1;
1255+
MARKETING_VERSION = 3.2.2;
12561256
PRODUCT_BUNDLE_IDENTIFIER = com.FGU.WorkOut;
12571257
PRODUCT_NAME = WorkoutApp;
12581258
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

‎SwiftUI-WorkoutApp/Resources/en.lproj/Localizable.stringsdict‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<key>zero</key>
1616
<string>0 photos</string>
1717
<key>one</key>
18-
<string>1 photo</string>
18+
<string>%d photo</string>
1919
<key>two</key>
20-
<string>2 photos</string>
20+
<string>%d photos</string>
2121
<key>few</key>
2222
<string>%d photos</string>
2323
<key>many</key>
@@ -39,9 +39,9 @@
3939
<key>zero</key>
4040
<string>Photos</string>
4141
<key>one</key>
42-
<string>1 photo</string>
42+
<string>%d photo</string>
4343
<key>two</key>
44-
<string>2 photos</string>
44+
<string>%d photos</string>
4545
<key>few</key>
4646
<string>%d photos</string>
4747
<key>many</key>
@@ -63,9 +63,9 @@
6363
<key>zero</key>
6464
<string>Nobody trains here yet</string>
6565
<key>one</key>
66-
<string>1 person trains here</string>
66+
<string>%d person trains here</string>
6767
<key>two</key>
68-
<string>2 persons train here</string>
68+
<string>%d persons train here</string>
6969
<key>few</key>
7070
<string>%d people train here</string>
7171
<key>many</key>
@@ -87,9 +87,9 @@
8787
<key>zero</key>
8888
<string>0 grounds</string>
8989
<key>one</key>
90-
<string>1 ground</string>
90+
<string>%d ground</string>
9191
<key>two</key>
92-
<string>2 grounds</string>
92+
<string>%d grounds</string>
9393
<key>few</key>
9494
<string>%d grounds</string>
9595
<key>many</key>
@@ -111,9 +111,9 @@
111111
<key>zero</key>
112112
<string>0 journals</string>
113113
<key>one</key>
114-
<string>1 journal</string>
114+
<string>%d journal</string>
115115
<key>two</key>
116-
<string>2 journals</string>
116+
<string>%d journals</string>
117117
<key>few</key>
118118
<string>%d journals</string>
119119
<key>many</key>
@@ -135,9 +135,9 @@
135135
<key>zero</key>
136136
<string>nobody yet</string>
137137
<key>one</key>
138-
<string>1 user</string>
138+
<string>%d user</string>
139139
<key>two</key>
140-
<string>2 users</string>
140+
<string>%d users</string>
141141
<key>few</key>
142142
<string>%d users</string>
143143
<key>many</key>
@@ -159,9 +159,9 @@
159159
<key>zero</key>
160160
<string>nobody yet</string>
161161
<key>one</key>
162-
<string>1 friend</string>
162+
<string>%d friend</string>
163163
<key>two</key>
164-
<string>2 friends</string>
164+
<string>%d friends</string>
165165
<key>few</key>
166166
<string>%d friends</string>
167167
<key>many</key>
@@ -183,9 +183,9 @@
183183
<key>zero</key>
184184
<string>nobody yet</string>
185185
<key>one</key>
186-
<string>1 person</string>
186+
<string>%d person</string>
187187
<key>two</key>
188-
<string>2 persons</string>
188+
<string>%d persons</string>
189189
<key>few</key>
190190
<string>%d people</string>
191191
<key>many</key>
@@ -207,9 +207,9 @@
207207
<key>zero</key>
208208
<string>age not specified</string>
209209
<key>one</key>
210-
<string>1 year</string>
210+
<string>%d year</string>
211211
<key>two</key>
212-
<string>2 years</string>
212+
<string>%d years</string>
213213
<key>few</key>
214214
<string>%d years</string>
215215
<key>many</key>

‎SwiftUI-WorkoutApp/Resources/ru.lproj/Localizable.stringsdict‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>zero</key>
1616
<string>возраст не указан</string>
1717
<key>one</key>
18-
<string>1 год</string>
18+
<string>%d год</string>
1919
<key>two</key>
20-
<string>2 года</string>
20+
<string>%d года</string>
2121
<key>few</key>
22-
<string>%d лет</string>
22+
<string>%d года</string>
2323
<key>many</key>
2424
<string>%d лет</string>
2525
<key>other</key>
@@ -39,9 +39,9 @@
3939
<key>zero</key>
4040
<string>пока никого</string>
4141
<key>one</key>
42-
<string>1 человек</string>
42+
<string>%d человек</string>
4343
<key>two</key>
44-
<string>2 человека</string>
44+
<string>%d человека</string>
4545
<key>few</key>
4646
<string>%d человека</string>
4747
<key>many</key>
@@ -63,9 +63,9 @@
6363
<key>zero</key>
6464
<string>пока никого</string>
6565
<key>one</key>
66-
<string>1 друг</string>
66+
<string>%d друг</string>
6767
<key>two</key>
68-
<string>2 друга</string>
68+
<string>%d друга</string>
6969
<key>few</key>
7070
<string>%d друга</string>
7171
<key>many</key>
@@ -87,9 +87,9 @@
8787
<key>zero</key>
8888
<string>пока никого</string>
8989
<key>one</key>
90-
<string>1 пользователь</string>
90+
<string>%d пользователь</string>
9191
<key>two</key>
92-
<string>2 пользователя</string>
92+
<string>%d пользователя</string>
9393
<key>few</key>
9494
<string>%d пользователя</string>
9595
<key>many</key>
@@ -111,9 +111,9 @@
111111
<key>zero</key>
112112
<string>0 площадок</string>
113113
<key>one</key>
114-
<string>1 площадка</string>
114+
<string>%d площадка</string>
115115
<key>two</key>
116-
<string>2 площадки</string>
116+
<string>%d площадки</string>
117117
<key>few</key>
118118
<string>%d площадки</string>
119119
<key>many</key>
@@ -135,9 +135,9 @@
135135
<key>zero</key>
136136
<string>0 дневников</string>
137137
<key>one</key>
138-
<string>1 дневник</string>
138+
<string>%d дневник</string>
139139
<key>two</key>
140-
<string>2 дневника</string>
140+
<string>%d дневника</string>
141141
<key>few</key>
142142
<string>%d дневника</string>
143143
<key>many</key>
@@ -159,9 +159,9 @@
159159
<key>zero</key>
160160
<string>Здесь пока никто не тренируется</string>
161161
<key>one</key>
162-
<string>Тренируется 1 человек</string>
162+
<string>Тренируется %d человек</string>
163163
<key>two</key>
164-
<string>Тренируются 2 человека</string>
164+
<string>Тренируются %d человека</string>
165165
<key>few</key>
166166
<string>Тренируются %d человека</string>
167167
<key>many</key>
@@ -183,9 +183,9 @@
183183
<key>zero</key>
184184
<string>Фотографии</string>
185185
<key>one</key>
186-
<string>1 фотография</string>
186+
<string>%d фотография</string>
187187
<key>two</key>
188-
<string>2 фотографии</string>
188+
<string>%d фотографии</string>
189189
<key>few</key>
190190
<string>%d фотография</string>
191191
<key>many</key>
@@ -207,9 +207,9 @@
207207
<key>zero</key>
208208
<string>0 фотографий</string>
209209
<key>one</key>
210-
<string>1 фотография</string>
210+
<string>%d фотография</string>
211211
<key>two</key>
212-
<string>2 фотографии</string>
212+
<string>%d фотографии</string>
213213
<key>few</key>
214214
<string>%d фотография</string>
215215
<key>many</key>

0 commit comments

Comments
 (0)