Merge review/slice-7a-wardrobe (phases 29-31)
# Conflicts: # src/HSchool.Client/src/i18n/strings.ts
This commit is contained in:
@@ -178,6 +178,7 @@ const ru = {
|
||||
peopleTabApparel: 'Одежда',
|
||||
peopleTabCarry: 'Ноша',
|
||||
peopleTabNow: 'Сейчас',
|
||||
peopleTabPortrait: 'Портрет',
|
||||
peopleAtHome: 'дома',
|
||||
peopleApparelFit: 'Уместность: {value}',
|
||||
peopleLockerYes: 'Есть шкафчик',
|
||||
@@ -190,7 +191,6 @@ const ru = {
|
||||
peopleLogEvent: 'Событие',
|
||||
peopleLogEmpty: 'Сегодня записей нет.',
|
||||
|
||||
peopleTabPortrait: 'Портрет',
|
||||
peoplePortraitAvatar: 'Аватар',
|
||||
peoplePortraitFull: 'В полный рост',
|
||||
peoplePortraitCustom: 'Свой промпт',
|
||||
@@ -507,6 +507,7 @@ const en: Messages = {
|
||||
peopleTabApparel: 'Clothes',
|
||||
peopleTabCarry: 'Carried',
|
||||
peopleTabNow: 'Now',
|
||||
peopleTabPortrait: 'Portrait',
|
||||
peopleAtHome: 'home',
|
||||
peopleApparelFit: 'Fit: {value}',
|
||||
peopleLockerYes: 'Has a locker',
|
||||
@@ -519,7 +520,6 @@ const en: Messages = {
|
||||
peopleLogEvent: 'Event',
|
||||
peopleLogEmpty: 'Nothing logged today.',
|
||||
|
||||
peopleTabPortrait: 'Portrait',
|
||||
peoplePortraitAvatar: 'Avatar',
|
||||
peoplePortraitFull: 'Full body',
|
||||
peoplePortraitCustom: 'Custom prompt',
|
||||
|
||||
Reference in New Issue
Block a user