Move all 'Settings' string to same locale group

7 files changed, 8 insertions, 10 deletions

diff --git a/gui/src/renderer/components/Account.tsx b/gui/src/renderer/components/Account.tsx
index 1751906026..2f16a722d6 100644
--- a/gui/src/renderer/components/Account.tsx
+++ b/gui/src/renderer/components/Account.tsx
@@ -31,7 +31,7 @@ export default class Account extends Component<IProps> {
               <NavigationItems>
                 <BackBarItem action={this.props.onClose}>
                   {// TRANSLATORS: Back button in navigation bar
-                  messages.pgettext('account-nav', 'Settings')}
+                  messages.pgettext('navigation-bar', 'Settings')}
                 </BackBarItem>
               </NavigationItems>
             </NavigationBar>
diff --git a/gui/src/renderer/components/AdvancedSettings.tsx b/gui/src/renderer/components/AdvancedSettings.tsx
index 9f09be5340..334da211a8 100644
--- a/gui/src/renderer/components/AdvancedSettings.tsx
+++ b/gui/src/renderer/components/AdvancedSettings.tsx
@@ -166,7 +166,7 @@ export default class AdvancedSettings extends Component<IProps, IState> {
                 <NavigationItems>
                   <BackBarItem action={this.props.onClose}>
                     {// TRANSLATORS: Back button in navigation bar
-                    messages.pgettext('advanced-settings-nav', 'Settings')}
+                    messages.pgettext('navigation-bar', 'Settings')}
                   </BackBarItem>
                   <TitleBarItem>
                     {// TRANSLATORS: Title label in navigation bar
diff --git a/gui/src/renderer/components/ErrorBoundary.tsx b/gui/src/renderer/components/ErrorBoundary.tsx
index 4877bff329..abd5b53b6e 100644
--- a/gui/src/renderer/components/ErrorBoundary.tsx
+++ b/gui/src/renderer/components/ErrorBoundary.tsx
@@ -77,9 +77,7 @@ export default class ErrorBoundary extends Component<IProps, IState> {
             <Container>
               <View style={styles.container}>
                 <ImageView height={120} width={120} source="logo-icon" style={styles.logo} />
-                <Text style={styles.title}>
-                  {messages.pgettext('generic', 'MULLVAD VPN')}
-                </Text>
+                <Text style={styles.title}>{messages.pgettext('generic', 'MULLVAD VPN')}</Text>
                 <Text style={styles.subtitle}>{reachBackMessage}</Text>
               </View>
             </Container>
diff --git a/gui/src/renderer/components/Preferences.tsx b/gui/src/renderer/components/Preferences.tsx
index c515361c33..715d51e40f 100644
--- a/gui/src/renderer/components/Preferences.tsx
+++ b/gui/src/renderer/components/Preferences.tsx
@@ -43,7 +43,7 @@ export default class Preferences extends Component<IProps> {
                 <NavigationItems>
                   <BackBarItem action={this.props.onClose}>
                     {// TRANSLATORS: Back button in navigation bar
-                    messages.pgettext('preferences-nav', 'Settings')}
+                    messages.pgettext('navigation-bar', 'Settings')}
                   </BackBarItem>
                   <TitleBarItem>
                     {// TRANSLATORS: Title label in navigation bar
diff --git a/gui/src/renderer/components/SelectLanguage.tsx b/gui/src/renderer/components/SelectLanguage.tsx
index c5c2228d00..7af49d76a8 100644
--- a/gui/src/renderer/components/SelectLanguage.tsx
+++ b/gui/src/renderer/components/SelectLanguage.tsx
@@ -72,7 +72,7 @@ export default class SelectLanguage extends Component<IProps, IState> {
                 <NavigationItems>
                   <BackBarItem action={this.props.onClose}>
                     {// TRANSLATORS: Back button in navigation bar
-                    messages.pgettext('select-language-nav', 'Settings')}
+                    messages.pgettext('navigation-bar', 'Settings')}
                   </BackBarItem>
                   <TitleBarItem>
                     {// TRANSLATORS: Title label in navigation bar
diff --git a/gui/src/renderer/components/Settings.tsx b/gui/src/renderer/components/Settings.tsx
index 129550f3a0..1a51e3ae53 100644
--- a/gui/src/renderer/components/Settings.tsx
+++ b/gui/src/renderer/components/Settings.tsx
@@ -52,7 +52,7 @@ export default class Settings extends Component<IProps> {
                   <CloseBarItem action={this.props.onClose} />
                   <TitleBarItem>
                     {// TRANSLATORS: Title label in navigation bar
-                    messages.pgettext('settings-view-nav', 'Settings')}
+                    messages.pgettext('navigation-bar', 'Settings')}
                   </TitleBarItem>
                 </NavigationItems>
               </NavigationBar>
@@ -62,7 +62,7 @@ export default class Settings extends Component<IProps> {
                   <View style={styles.content}>
                     {showLargeTitle && (
                       <SettingsHeader>
-                        <HeaderTitle>{messages.pgettext('settings-view', 'Settings')}</HeaderTitle>
+                        <HeaderTitle>{messages.pgettext('navigation-bar', 'Settings')}</HeaderTitle>
                       </SettingsHeader>
                     )}
                     <View>
diff --git a/gui/src/renderer/components/Support.tsx b/gui/src/renderer/components/Support.tsx
index 02f374737d..5313e7449c 100644
--- a/gui/src/renderer/components/Support.tsx
+++ b/gui/src/renderer/components/Support.tsx
@@ -142,7 +142,7 @@ export default class Support extends Component<ISupportProps, ISupportState> {
                   <NavigationItems>
                     <BackBarItem action={this.props.onClose}>
                       {// TRANSLATORS: Back button in navigation bar
-                      messages.pgettext('support-nav', 'Settings')}
+                      messages.pgettext('navigation-bar', 'Settings')}
                     </BackBarItem>
                   </NavigationItems>
                 </NavigationBar>