Improve localization contexts

5 files changed, 11 insertions, 13 deletions

diff --git a/gui/src/renderer/components/Account.tsx b/gui/src/renderer/components/Account.tsx
index 73cf77dd5a..0055a32049 100644
--- a/gui/src/renderer/components/Account.tsx
+++ b/gui/src/renderer/components/Account.tsx
@@ -72,9 +72,7 @@ export default class Account extends React.Component<IProps> {
                 disabled={this.props.isOffline}
                 onPress={this.props.onBuyMore}>
                 <AppButton.GreenButton style={styles.account__buy_button}>
-                  <AppButton.Label>
-                    {messages.pgettext('account-view', 'Buy more credit')}
-                  </AppButton.Label>
+                  <AppButton.Label>{messages.gettext('Buy more credit')}</AppButton.Label>
                   <AppButton.Icon source="icon-extLink" height={16} width={16} />
                 </AppButton.GreenButton>
               </AppButton.BlockingButton>
diff --git a/gui/src/renderer/components/AdvancedSettings.tsx b/gui/src/renderer/components/AdvancedSettings.tsx
index ecc93a2544..4fa10adde9 100644
--- a/gui/src/renderer/components/AdvancedSettings.tsx
+++ b/gui/src/renderer/components/AdvancedSettings.tsx
@@ -406,7 +406,7 @@ export default class AdvancedSettings extends Component<IProps, IState> {
             {messages.pgettext('advanced-settings-view', 'Enable anyway')}
           </AppButton.RedButton>,
           <AppButton.BlueButton key="back" onPress={this.hideConfirmBlockWhenDisconnectedAlert}>
-            {messages.pgettext('advanced-settings-view', 'Back')}
+            {messages.gettext('Back')}
           </AppButton.BlueButton>,
         ]}>
         <ModalMessage>
diff --git a/gui/src/renderer/components/ExpiredAccountErrorView.tsx b/gui/src/renderer/components/ExpiredAccountErrorView.tsx
index dc986b13d5..e96b0edd45 100644
--- a/gui/src/renderer/components/ExpiredAccountErrorView.tsx
+++ b/gui/src/renderer/components/ExpiredAccountErrorView.tsx
@@ -158,8 +158,8 @@ export default class ExpiredAccountErrorView extends Component<
 
   private renderExternalPaymentButton() {
     const buttonText = this.isNewAccount()
-      ? messages.pgettext('connect-view', 'Buy credit')
-      : messages.pgettext('connect-view', 'Buy more credit');
+      ? messages.gettext('Buy credit')
+      : messages.gettext('Buy more credit');
 
     return (
       <AppButton.BlockingButton
@@ -186,7 +186,7 @@ export default class ExpiredAccountErrorView extends Component<
               key="cancel"
               disabled={this.state.redeemingVoucher}
               onPress={this.onCloseRedeemVoucherAlert}>
-              {messages.pgettext('connect-view', 'Cancel')}
+              {messages.gettext('Cancel')}
             </AppButton.BlueButton>,
           ]}>
           <Text style={styles.fieldLabel}>
@@ -207,7 +207,7 @@ export default class ExpiredAccountErrorView extends Component<
           <AppButton.BlueButton
             key="cancel"
             onPress={this.onCloseBlockWhenDisconnectedInstructions}>
-            {messages.pgettext('connect-view', 'Close')}
+            {messages.gettext('Close')}
           </AppButton.BlueButton>,
         ]}>
         <Text style={styles.fieldLabel}>
diff --git a/gui/src/renderer/components/Support.tsx b/gui/src/renderer/components/Support.tsx
index 5f9a6db8a4..244f939a5e 100644
--- a/gui/src/renderer/components/Support.tsx
+++ b/gui/src/renderer/components/Support.tsx
@@ -235,7 +235,7 @@ export default class Support extends Component<ISupportProps, ISupportState> {
             {messages.pgettext('support-view', 'Send anyway')}
           </AppButton.RedButton>,
           <AppButton.BlueButton key="cancel" onPress={this.onCancelNoEmailDialog}>
-            {messages.pgettext('support-view', 'Back')}
+            {messages.gettext('Back')}
           </AppButton.BlueButton>,
         ]}
       />
@@ -269,7 +269,7 @@ export default class Support extends Component<ISupportProps, ISupportState> {
             {messages.pgettext('support-view', 'Continue anyway')}
           </AppButton.RedButton>,
           <AppButton.BlueButton key="cancel" onPress={this.props.onClose}>
-            {messages.pgettext('support-view', 'Cancel')}
+            {messages.gettext('Cancel')}
           </AppButton.BlueButton>,
         ]}
       />
diff --git a/gui/src/renderer/components/WireguardKeys.tsx b/gui/src/renderer/components/WireguardKeys.tsx
index f8b439489d..5af224be35 100644
--- a/gui/src/renderer/components/WireguardKeys.tsx
+++ b/gui/src/renderer/components/WireguardKeys.tsx
@@ -95,14 +95,14 @@ export default class WireguardKeys extends Component<IProps, IState> {
 
                     <View style={styles.wgkeys__row}>
                       <Text style={styles.wgkeys__row_label}>
-                        {messages.pgettext('wireguard-keys', 'Public key')}
+                        {messages.pgettext('wireguard-key-view', 'Public key')}
                       </Text>
 
                       <View style={styles.wgkeys__row_value}>{this.getKeyText()}</View>
                     </View>
                     <View style={styles.wgkeys__row}>
                       <Text style={styles.wgkeys__row_label}>
-                        {messages.pgettext('wireguard-keys', 'Key generated')}
+                        {messages.pgettext('wireguard-key-view', 'Key generated')}
                       </Text>
                       <Text style={styles.wgkeys__row_value}>{this.ageOfKeyString()}</Text>
                     </View>
@@ -260,7 +260,7 @@ export default class WireguardKeys extends Component<IProps, IState> {
         if (key.valid === true) {
           return (
             <Text style={styles.wgkeys__valid_key}>
-              {messages.pgettext('account-view', 'Key is valid')}
+              {messages.pgettext('wireguard-key-view', 'Key is valid')}
             </Text>
           );
         } else if (key.valid === false) {