Skip to content

Commit 9258263

Browse files
committed
minor fixes after resolving merge conflict
1 parent 5a21916 commit 9258263

10 files changed

Lines changed: 48 additions & 2 deletions

File tree

src/languages/de.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9150,6 +9150,12 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`,
91509150
groups: {
91519151
title: 'Gruppen',
91529152
memberCount: () => ({one: '1 Mitglied', other: (count: number) => `${count} Mitglieder`}),
9153+
permissions: 'Gruppenberechtigungen',
9154+
deleteGroup: 'Gruppe löschen',
9155+
deleteGroupDangerConfirmationModal: 'Gruppe löschen',
9156+
deleteGroupDangerConfirmationModalDescription: (defaultGroupName: string) =>
9157+
`Bist du sicher? Dadurch werden alle Mitglieder der Standardgruppe (${defaultGroupName}) neu zugewiesen und dies kann nicht rückgängig gemacht werden.`,
9158+
neverMind: 'Vergiss es',
91539159
},
91549160
},
91559161
proactiveAppReview: {

src/languages/fr.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9173,6 +9173,12 @@ Voici un *reçu test* pour vous montrer comment ça fonctionne :`,
91739173
groups: {
91749174
title: 'Groupes',
91759175
memberCount: () => ({one: '1 membre', other: (count: number) => `${count} membres`}),
9176+
permissions: 'Autorisations du groupe',
9177+
deleteGroup: 'Supprimer le groupe',
9178+
deleteGroupDangerConfirmationModal: 'Supprimer le groupe',
9179+
deleteGroupDangerConfirmationModalDescription: (defaultGroupName: string) =>
9180+
`Êtes-vous sûr ? Cela réaffectera tous les membres au groupe par défaut (${defaultGroupName}) et ne pourra pas être annulé.`,
9181+
neverMind: 'Laissez tomber',
91769182
},
91779183
},
91789184
proactiveAppReview: {

src/languages/it.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9140,6 +9140,12 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`,
91409140
groups: {
91419141
title: 'Gruppi',
91429142
memberCount: () => ({one: '1 membro', other: (count: number) => `${count} membri`}),
9143+
permissions: 'Autorizzazioni del gruppo',
9144+
deleteGroup: 'Elimina gruppo',
9145+
deleteGroupDangerConfirmationModal: 'Elimina gruppo',
9146+
deleteGroupDangerConfirmationModalDescription: (defaultGroupName: string) =>
9147+
`Sei sicuro? Questo riassegnerà tutti i membri al gruppo predefinito (${defaultGroupName}) e non potrà essere annullato.`,
9148+
neverMind: 'Lascia perdere',
91439149
},
91449150
},
91459151
proactiveAppReview: {

src/languages/ja.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9026,6 +9026,12 @@ ${reportName}
90269026
groups: {
90279027
title: 'グループ',
90289028
memberCount: () => ({one: 'メンバー 1 人', other: (count: number) => `${count}名のメンバー`}),
9029+
permissions: 'グループ権限',
9030+
deleteGroup: 'グループを削除',
9031+
deleteGroupDangerConfirmationModal: 'グループを削除',
9032+
deleteGroupDangerConfirmationModalDescription: (defaultGroupName: string) =>
9033+
`本当によろしいですか?これにより、すべてのメンバーがデフォルトグループ(${defaultGroupName})に再割り当てされ、元に戻すことはできません。`,
9034+
neverMind: 'やめておく',
90299035
},
90309036
},
90319037
proactiveAppReview: {

src/languages/nl.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9113,6 +9113,12 @@ Hier is een *proefbon* om je te laten zien hoe het werkt:`,
91139113
groups: {
91149114
title: 'Groepen',
91159115
memberCount: () => ({one: '1 lid', other: (count: number) => `${count} leden`}),
9116+
permissions: 'Groepsmachtigingen',
9117+
deleteGroup: 'Groep verwijderen',
9118+
deleteGroupDangerConfirmationModal: 'Groep verwijderen',
9119+
deleteGroupDangerConfirmationModalDescription: (defaultGroupName: string) =>
9120+
`Weet je het zeker? Dit wijst alle leden opnieuw toe aan de standaardgroep (${defaultGroupName}) en kan niet ongedaan worden gemaakt.`,
9121+
neverMind: 'Laat maar',
91169122
},
91179123
},
91189124
proactiveAppReview: {

src/languages/pl.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9094,6 +9094,12 @@ Oto *paragon testowy*, żeby pokazać Ci, jak to działa:`,
90949094
groups: {
90959095
title: 'Grupy',
90969096
memberCount: () => ({one: '1 członek', other: (count: number) => `${count} członków`}),
9097+
permissions: 'Uprawnienia grupy',
9098+
deleteGroup: 'Usuń grupę',
9099+
deleteGroupDangerConfirmationModal: 'Usuń grupę',
9100+
deleteGroupDangerConfirmationModalDescription: (defaultGroupName: string) =>
9101+
`Czy na pewno? Spowoduje to ponowne przypisanie wszystkich członków do domyślnej grupy (${defaultGroupName}) i nie można tego cofnąć.`,
9102+
neverMind: 'Nieważne',
90979103
},
90989104
},
90999105
proactiveAppReview: {

src/languages/pt-BR.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9102,6 +9102,12 @@ Aqui está um *comprovante de teste* para mostrar como funciona:`,
91029102
groups: {
91039103
title: 'Grupos',
91049104
memberCount: () => ({one: '1 membro', other: (count: number) => `${count} membros`}),
9105+
permissions: 'Permissões do grupo',
9106+
deleteGroup: 'Excluir grupo',
9107+
deleteGroupDangerConfirmationModal: 'Excluir grupo',
9108+
deleteGroupDangerConfirmationModalDescription: (defaultGroupName: string) =>
9109+
`Tem certeza? Isso reatribuirá todos os membros ao grupo padrão (${defaultGroupName}) e não poderá ser desfeito.`,
9110+
neverMind: 'Deixa pra lá',
91059111
},
91069112
},
91079113
proactiveAppReview: {

src/languages/zh-hans.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8868,6 +8868,11 @@ ${reportName}
88688868
groups: {
88698869
title: '群组',
88708870
memberCount: () => ({one: '1 名成员', other: (count: number) => `${count} 名成员`}),
8871+
permissions: '群组权限',
8872+
deleteGroup: '删除群组',
8873+
deleteGroupDangerConfirmationModal: '删除群组',
8874+
deleteGroupDangerConfirmationModalDescription: (defaultGroupName: string) => `您确定吗?这将把所有成员重新分配到默认群组(${defaultGroupName}),并且无法撤销。`,
8875+
neverMind: '算了',
88718876
},
88728877
},
88738878
proactiveAppReview: {title: '喜欢全新的 Expensify 吗?', description: '请告诉我们,这样我们就能帮助您让报销体验变得更好。', positiveButton: '太棒了!', negativeButton: '不太是'},

src/pages/domain/Groups/DeleteGroupRow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function DeleteGroupRow({domainAccountID, groupID}: DeleteGroupRowProps) {
3939
title: translate('domain.groups.deleteGroupDangerConfirmationModal'),
4040
prompt: translate('domain.groups.deleteGroupDangerConfirmationModalDescription', defaultSecurityGroup?.name ?? ''),
4141
confirmText: translate('domain.groups.deleteGroup'),
42-
cancelText: translate('domain.groups.nevermind'),
42+
cancelText: translate('domain.groups.neverMind'),
4343
shouldShowCancelButton: true,
4444
danger: true,
4545
});

src/pages/domain/Groups/DomainGroupDetailsPage.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ function DomainGroupDetailsPage({route}: DomainGroupDetailsPageProps) {
2727
const {domainAccountID, groupID} = route.params;
2828

2929
const {translate} = useLocalize();
30-
const styles = useThemeStyles();
3130

3231
const [group] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
3332
selector: selectGroupByID(groupID),

0 commit comments

Comments
 (0)