Skip to content

Commit

Permalink
fix: replace Instance Settings with Default Settings in i18n and docs (
Browse files Browse the repository at this point in the history
…zitadel#8143)

# Which Problems Are Solved

- The console shows the Instance Settings title and a description.
Instance settings should be replaced with Default settings

# How the Problems Are Solved

- The DESCRIPTIONS.SETTINGS.INSTANCE.TITLE and
DESCRIPTIONS.SETTINGS.INSTANCE.DESCRIPTION have been replaced with
Default Settings and in the corresponding translation files.

Here's a screenshot:


![image](https://github.com/zitadel/zitadel/assets/30386061/b404f209-2043-414c-b06d-3291771d54fb)

# Additional Changes

- The docs have been updated to replace remaining texts mentioning
Instance Settings with Default Settings
- Two unused texts have been deleted from the translation files
- VSCode with Prettier have applied some markdown changes

# Additional Context

- Closes zitadel#7632

---------

Co-authored-by: Fabi <[email protected]>
  • Loading branch information
doncicuto and hifabienne authored Jun 25, 2024
1 parent dc170dc commit 88182f9
Show file tree
Hide file tree
Showing 22 changed files with 146 additions and 200 deletions.
8 changes: 2 additions & 6 deletions console/src/assets/i18n/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Настройки на инстанцията",
"DESCRIPTION": "Настройките на инстанцията са настройките по подразбиране за всички организации. С правилните разрешения, някои от тях могат да бъдат пренаписани в настройките на организацията."
"TITLE": "Настройките по подразбиране",
"DESCRIPTION": "Настройки по подразбиране за всички организации. С правилните разрешения някои от тях могат да бъдат отменени в настройките на организацията."
},
"ORG": {
"TITLE": "Настройки на организацията",
Expand Down Expand Up @@ -1316,10 +1316,6 @@
}
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Настройки на екземпляра",
"DESCRIPTION": "Тези настройки ще се прилагат за всички ваши организации, освен ако не са били заменени."
},
"LIST": {
"ORGS": "Организации",
"FEATURESETTINGS": "Настройки на функциите",
Expand Down
8 changes: 2 additions & 6 deletions console/src/assets/i18n/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Nastavení instance",
"DESCRIPTION": "Nastavení instance jsou výchozí nastavení pro všechny organizace. S odpovídajícími oprávněními jsou některá z nich přepisovatelná v nastavení organizace."
"TITLE": "Výchozí nastavení",
"DESCRIPTION": "Výchozí nastavení pro všechny organizace. Se správnými oprávněními lze některá z nich přepsat v nastavení organizace."
},
"ORG": {
"TITLE": "Nastavení organizace",
Expand Down Expand Up @@ -1317,10 +1317,6 @@
}
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Nastavení instance",
"DESCRIPTION": "Tato nastavení se budou aplikovat na všechny vaše organizace, pokud nebyla přepsána."
},
"LIST": {
"ORGS": "Organizace",
"FEATURESETTINGS": "Nastavení funkcí",
Expand Down
8 changes: 2 additions & 6 deletions console/src/assets/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Instanzeinstellungen",
"DESCRIPTION": "Die Instanzeinstellungen sind die Standardeinstellungen für alle Organisationen. Mit den richtigen Berechtigungen sind einige davon in den Organisationseinstellungen überschreibbar."
"TITLE": "Standardeinstellungen",
"DESCRIPTION": "Standardeinstellungen für alle Organisationen. Mit den richtigen Berechtigungen können einige davon in den Organisationseinstellungen überschrieben werden."
},
"ORG": {
"TITLE": "Organisationseinstellungen",
Expand Down Expand Up @@ -1317,10 +1317,6 @@
}
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Instanz Einstellungen",
"DESCRIPTION": "Diese Einstellungen werden auf all Ihren Organisationen angewandt sofern die Einstellung nicht überschrieben wurde."
},
"LIST": {
"ORGS": "Organisationen",
"FEATURESETTINGS": "Features",
Expand Down
10 changes: 3 additions & 7 deletions console/src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Instance Settings",
"DESCRIPTION": "The instance settings are the default settings for all organizations. With the right permissions, some of them are overridable in organization settings."
"TITLE": "Default Settings",
"DESCRIPTION": "Default settings for all organizations. With the right permissions, some of them are overridable in organization settings."
},
"ORG": {
"TITLE": "Organization Settings",
Expand Down Expand Up @@ -527,7 +527,7 @@
"TEXT": "All organization settings and tables in console are based on a selected organization. Click this button to switch organization or create a new one."
},
"INSTANCE": {
"TEXT": "Click here to get to the instance settings. Note that you have only access to this button if you have enhanced permissions."
"TEXT": "Click here to get to the default settings. Note that you have only access to this button if you have enhanced permissions."
},
"PROFILE": {
"TEXT": "Here you can switch between your user accounts and manage your sessions and profile."
Expand Down Expand Up @@ -1317,10 +1317,6 @@
}
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Instance Settings",
"DESCRIPTION": "These settings will apply to all your organizations unless they have been overridden."
},
"LIST": {
"ORGS": "Organizations",
"FEATURESETTINGS": "Features",
Expand Down
8 changes: 2 additions & 6 deletions console/src/assets/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Configuración de la Instancia",
"DESCRIPTION": "Las configuraciones de la instancia son las configuraciones predeterminadas para todas las organizaciones. Con los permisos adecuados, algunas de ellas pueden ser sobrescritas en la configuración de la organización."
"TITLE": "Configuración por defecto",
"DESCRIPTION": "Configuraciones predeterminadas para todas las organizaciones. Con los permisos adecuados, algunas de ellas se pueden anular en la configuración de la organización."
},
"ORG": {
"TITLE": "Configuración de la Organización",
Expand Down Expand Up @@ -1318,10 +1318,6 @@
}
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Ajustes de instancia",
"DESCRIPTION": "Estos ajustes se aplicará a todas tus organizaciones a menos que éstas los sobrescriban."
},
"LIST": {
"ORGS": "Organizaciones",
"FEATURESETTINGS": "Ajustes de funcionalidades",
Expand Down
8 changes: 2 additions & 6 deletions console/src/assets/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Paramètres de l'Instance",
"DESCRIPTION": "Les paramètres de l'instance sont les paramètres par défaut pour toutes les organisations. Avec les bonnes permissions, certains d'entre eux peuvent être remplacés dans les paramètres de l'organisation."
"TITLE": "Paramètres par défaut",
"DESCRIPTION": "Paramètres par défaut pour toutes les organisations. Avec les autorisations appropriées, certaines d’entre elles peuvent être remplacées dans les paramètres de lorganisation."
},
"ORG": {
"TITLE": "Paramètres de l'Organisation",
Expand Down Expand Up @@ -1317,10 +1317,6 @@
}
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Paramètres de l'instance",
"DESCRIPTION": "Ces paramètres s'appliqueront à toutes vos organisations, sauf s'ils ont été remplacés."
},
"LIST": {
"ORGS": "Organisations",
"FEATURESETTINGS": "Paramètres de fonctionnalité",
Expand Down
8 changes: 2 additions & 6 deletions console/src/assets/i18n/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Impostazioni dell'Istanza",
"DESCRIPTION": "Le impostazioni dell'istanza sono le impostazioni predefinite per tutte le organizzazioni. Con i permessi adeguati, alcune di esse possono essere sovrascritte nelle impostazioni dell'organizzazione."
"TITLE": "Impostazioni predefinite",
"DESCRIPTION": "Impostazioni predefinite per tutte le organizzazioni. Con le giuste autorizzazioni, alcuni di essi sono sovrascrivibili nelle impostazioni dell'organizzazione."
},
"ORG": {
"TITLE": "Impostazioni dell'Organizzazione",
Expand Down Expand Up @@ -1317,10 +1317,6 @@
}
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Impostazioni dell'istanza",
"DESCRIPTION": "Queste impostazioni si applicheranno a tutte le tue organizzazioni a meno che l'impostazione non venga sovrascritta."
},
"LIST": {
"ORGS": "Organizzazioni",
"FEATURESETTINGS": "Impostazioni delle funzionalità",
Expand Down
8 changes: 2 additions & 6 deletions console/src/assets/i18n/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "インスタンス設定",
"DESCRIPTION": "インスタンス設定は、すべての組織のデフォルト設定です。適切な権限があれば、いくつかは組織の設定で上書き可能です"
"TITLE": "デフォルトの設定",
"DESCRIPTION": "すべての組織のデフォルト設定。適切な権限があれば、一部の権限は組織設定で上書きできます"
},
"ORG": {
"TITLE": "組織設定",
Expand Down Expand Up @@ -1317,10 +1317,6 @@
}
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "インスタンス設定",
"DESCRIPTION": "これらの設定は上書きされていない限り、すべての組織に適用されます。"
},
"LIST": {
"ORGS": "組織",
"FEATURESETTINGS": "機能設定",
Expand Down
8 changes: 2 additions & 6 deletions console/src/assets/i18n/mk.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Поставки на инстанцата",
"DESCRIPTION": "Поставките на инстанцата се стандардни поставки за сите организации. Со соодветни дозволи, некои од нив може да се променат во поставките на организацијата."
"TITLE": "Стандардни поставки",
"DESCRIPTION": "Стандардни поставки за сите организации. Со вистинските дозволи, некои од нив може да се надминат во поставките на организацијата."
},
"ORG": {
"TITLE": "Поставки за организацијата",
Expand Down Expand Up @@ -1318,10 +1318,6 @@
}
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Подесувања за инстанца",
"DESCRIPTION": "Овие подесувања ќе се применуваат на сите ваши организации, освен ако не се пребришани."
},
"LIST": {
"ORGS": "Организации",
"FEATURESETTINGS": "Подесувања на функцијата",
Expand Down
8 changes: 2 additions & 6 deletions console/src/assets/i18n/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Instellingsinstellingen",
"DESCRIPTION": "De instellingsinstellingen zijn de standaardinstellingen voor alle organisaties. Met de juiste toestemmingen kunnen sommige hiervan worden overschreven in organisatie-instellingen."
"TITLE": "Standaard instellingen",
"DESCRIPTION": "Standaardinstellingen voor alle organisaties. Met de juiste machtigingen kunnen sommige ervan worden overschreven in de organisatie-instellingen."
},
"ORG": {
"TITLE": "Organisatie-instellingen",
Expand Down Expand Up @@ -1317,10 +1317,6 @@
}
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Instantie Instellingen",
"DESCRIPTION": "Deze instellingen zijn van toepassing op al uw organisaties, tenzij ze zijn overschreven."
},
"LIST": {
"ORGS": "Organisaties",
"FEATURESETTINGS": "Functie-instellingen",
Expand Down
8 changes: 2 additions & 6 deletions console/src/assets/i18n/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Ustawienia instancji",
"DESCRIPTION": "Ustawienia instancji są domyślnymi ustawieniami dla wszystkich organizacji. Z odpowiednimi uprawnieniami niektóre z nich mogą być nadpisywane w ustawieniach organizacji."
"TITLE": "Ustawienia domyślne",
"DESCRIPTION": "Ustawienia domyślne dla wszystkich organizacji. Przy odpowiednich uprawnieniach niektóre z nich można zastąpić w ustawieniach organizacji."
},
"ORG": {
"TITLE": "Ustawienia organizacji",
Expand Down Expand Up @@ -1316,10 +1316,6 @@
}
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Ustawienia instancji",
"DESCRIPTION": "Te ustawienia będą dotyczyć wszystkich twoich organizacji, chyba że zostaną zastąpione."
},
"LIST": {
"ORGS": "Organizacje",
"FEATURESETTINGS": "Ustawienia funkcji",
Expand Down
8 changes: 2 additions & 6 deletions console/src/assets/i18n/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Configurações da Instância",
"DESCRIPTION": "As configurações da instância são as configurações padrão para todas as organizações. Com as permissões corretas, algumas delas podem ser sobrescritas nas configurações da organização."
"TITLE": "Configurações padrão",
"DESCRIPTION": "Configurações padrão para todas as organizações. Com as permissões corretas, algumas delas podem ser substituídas nas configurações da organização."
},
"ORG": {
"TITLE": "Configurações da Organização",
Expand Down Expand Up @@ -1318,10 +1318,6 @@
}
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Configurações da Instância",
"DESCRIPTION": "Essas configurações serão aplicadas a todas as suas organizações, a menos que tenham sido substituídas."
},
"LIST": {
"ORGS": "Organizações",
"FEATURESETTINGS": "Configurações de Recursos",
Expand Down
8 changes: 2 additions & 6 deletions console/src/assets/i18n/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Настройки инстанции",
"DESCRIPTION": "Настройки инстанции являются стандартными настройками для всех организаций. С правильными разрешениями, некоторые из них могут быть переопределены в настройках организации."
"TITLE": "Настройки по умолчанию",
"DESCRIPTION": "Настройки по умолчанию для всех организаций. При наличии соответствующих разрешений некоторые из них можно переопределить в настройках организации."
},
"ORG": {
"TITLE": "Настройки организации",
Expand Down Expand Up @@ -1360,10 +1360,6 @@
}
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Настройки экземпляра",
"DESCRIPTION": "Данные настройки будут применяться ко всем вашим организациям, в случае, если они не были переопределены."
},
"ORG": {
"TITLE": "Настройки организации",
"DESCRIPTION": "Данные настройки расширяют и перезаписывают настройки вашего экземпляра."
Expand Down
4 changes: 2 additions & 2 deletions console/src/assets/i18n/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "Instansinställningar",
"DESCRIPTION": "Instansinställningarna är standardinställningarna för alla organisationer. Med rätt behörigheter kan vissa av dem åsidosättas i organisationsinställningarna."
"TITLE": "Standardinställningar",
"DESCRIPTION": "Standardinställningar för alla organisationer. Med rätt behörigheter kan vissa av dem åsidosättas i organisationsinställningar."
},
"ORG": {
"TITLE": "Organisationsinställningar",
Expand Down
8 changes: 2 additions & 6 deletions console/src/assets/i18n/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "实例设置",
"DESCRIPTION": "实例设置是所有组织的默认设置。有适当的权限,其中一些可以在组织设置中被覆盖。"
"TITLE": "默认设置",
"DESCRIPTION": "所有组织的默认设置。有了正确的权限,其中一些权限在组织设置中是可以覆盖的。"
},
"ORG": {
"TITLE": "组织设置",
Expand Down Expand Up @@ -1317,10 +1317,6 @@
}
},
"SETTINGS": {
"INSTANCE": {
"TITLE": "实例设置",
"DESCRIPTION": "这些设置将应用于您的所有组织,除非它们已被覆盖。"
},
"LIST": {
"ORGS": "组织",
"FEATURESETTINGS": "功能设置",
Expand Down
Loading

0 comments on commit 88182f9

Please sign in to comment.