Fix duplicated string ids

duckduckgo · Dec 6, 2024 · bc7af06 · bc7af06
1 parent b0ce5ab
commit bc7af06
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 22 deletions.
diff --git a/DuckDuckGo/Common/Localizables/UserText+NetworkProtection+Shared.swift b/DuckDuckGo/Common/Localizables/UserText+NetworkProtection+Shared.swift
@@ -25,7 +25,7 @@ extension UserText {
 
     // MARK: Location formatter
 
-    static let locationFormatterNearestLocation = NSLocalizedString("network.protection.vpn.location.formatter.nearest.location.descriptor", value: "Nearest Location", comment: "Nearest available location setting description")
+    static let locationFormatterNearestLocation = NSLocalizedString("network.protection.vpn.location.formatter.nearest.location", value: "Nearest Location", comment: "Nearest available location setting description")
 
     static let locationFormatterNearestLocationDescriptor = NSLocalizedString("network.protection.vpn.location.formatter.nearest.location.descriptor", value: "(Nearest)", comment: "Description added after the nearest location in the VPN status view")
 

diff --git a/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift b/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift
@@ -44,9 +44,9 @@ extension UserText {
 
     static let networkProtectionNavBarStatusViewSendFeedback = NSLocalizedString("network.protection.navbar.status.view.send.feedback", value: "Send Feedback…", comment: "Menu item for 'Send Feedback' in the VPN status view that's shown in the navigation bar")
 
-    static let networkProtectionNavBarStatusMenuVPNSettings = NSLocalizedString("network.protection.status.menu.vpn.settings", value: "VPN Settings…", comment: "The status menu 'VPN Settings' menu item")
+    static let networkProtectionNavBarStatusViewVPNSettings = NSLocalizedString("network.protection.navbar.status.view.vpn.settings", value: "VPN Settings…", comment: "The status menu 'VPN Settings' menu item")
 
-    static let networkProtectionNavBarStatusMenuFAQ = NSLocalizedString("network.protection.status.menu.faq", value: "FAQs and Support…", comment: "The status menu 'FAQ' menu item")
+    static let networkProtectionNavBarStatusViewFAQ = NSLocalizedString("network.protection.navbar.status.view.faq", value: "FAQs and Support…", comment: "The status menu 'FAQ' menu item")
 }
 
 extension UserText {

diff --git a/DuckDuckGo/Localizable.xcstrings b/DuckDuckGo/Localizable.xcstrings
@@ -37024,50 +37024,50 @@
         }
       }
     },
-    "network.protection.navbar.status.view.send.feedback" : {
-      "comment" : "Menu item for 'Send Feedback' in the VPN status view that's shown in the navigation bar",
+    "network.protection.navbar.status.view.faq" : {
+      "comment" : "The status menu 'FAQ' menu item",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Send Feedback…"
+            "value" : "FAQs and Support…"
           }
         }
       }
     },
-    "network.protection.status.button.tooltip" : {
-      "comment" : "The tooltip for NetP's nav bar button",
+    "network.protection.navbar.status.view.send.feedback" : {
+      "comment" : "Menu item for 'Send Feedback' in the VPN status view that's shown in the navigation bar",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "VPN"
+            "value" : "Send Feedback…"
           }
         }
       }
     },
-    "network.protection.status.menu.faq" : {
-      "comment" : "The status menu 'FAQ' menu item",
+    "network.protection.navbar.status.view.vpn.settings" : {
+      "comment" : "The status menu 'VPN Settings' menu item",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "FAQs and Support…"
+            "value" : "VPN Settings…"
           }
         }
       }
     },
-    "network.protection.status.menu.vpn.settings" : {
-      "comment" : "The status menu 'VPN Settings' menu item",
+    "network.protection.status.button.tooltip" : {
+      "comment" : "The tooltip for NetP's nav bar button",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "VPN Settings…"
+            "value" : "VPN"
           }
         }
       }
@@ -37120,8 +37120,20 @@
         }
       }
     },
+    "network.protection.vpn.location.formatter.nearest.location" : {
+      "comment" : "Nearest available location setting description",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Nearest Location"
+          }
+        }
+      }
+    },
     "network.protection.vpn.location.formatter.nearest.location.descriptor" : {
-      "comment" : "Description added after the nearest location in the VPN status view\nNearest available location setting description",
+      "comment" : "Description added after the nearest location in the VPN status view",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {

diff --git a/...o/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift b/...o/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift
@@ -133,11 +133,11 @@ final class NetworkProtectionNavBarPopoverManager: NetPPopoverManager {
                 if UserDefaults.netP.networkProtectionOnboardingStatus == .completed {
                     return [
                         NetworkProtectionStatusView.Model.MenuItem(
-                            name: UserText.networkProtectionNavBarStatusMenuVPNSettings, action: {
+                            name: UserText.networkProtectionNavBarStatusViewVPNSettings, action: {
                                 try? await appLauncher.launchApp(withCommand: VPNAppLaunchCommand.showSettings)
                             }),
                         NetworkProtectionStatusView.Model.MenuItem(
-                            name: UserText.networkProtectionNavBarStatusMenuFAQ, action: {
+                            name: UserText.networkProtectionNavBarStatusViewFAQ, action: {
                                 try? await appLauncher.launchApp(withCommand: VPNAppLaunchCommand.showFAQ)
                             }),
                         NetworkProtectionStatusView.Model.MenuItem(
@@ -149,7 +149,7 @@ final class NetworkProtectionNavBarPopoverManager: NetPPopoverManager {
                 } else {
                     return [
                         NetworkProtectionStatusView.Model.MenuItem(
-                            name: UserText.networkProtectionNavBarStatusMenuFAQ, action: {
+                            name: UserText.networkProtectionNavBarStatusViewFAQ, action: {
                                 try? await appLauncher.launchApp(withCommand: VPNAppLaunchCommand.showFAQ)
                             }),
                         NetworkProtectionStatusView.Model.MenuItem(

diff --git a/DuckDuckGoDBPBackgroundAgent/UserText.swift b/DuckDuckGoDBPBackgroundAgent/UserText.swift
@@ -21,6 +21,6 @@ import Foundation
 final class UserText {
     // MARK: - Status Menu
 
-    static let networkProtectionStatusMenuSendFeedback = NSLocalizedString("network.protection.status.menu.send.feedback", value: "Send Feedback…", comment: "The status menu 'Send Feedback' menu item")
-    static let networkProtectionStatusMenuOpenDuckDuckGo = NSLocalizedString("network.protection.status.menu.open.duckduckgo", value: "Open DuckDuckGo…", comment: "The status menu 'Open DuckDuckGo' menu item")
+    static let networkProtectionStatusMenuSendFeedback = NSLocalizedString("dbp.menu.send.feedback", value: "Send Feedback…", comment: "The status menu 'Send Feedback' menu item")
+    static let networkProtectionStatusMenuOpenDuckDuckGo = NSLocalizedString("dbp.open.duckduckgo", value: "Open DuckDuckGo…", comment: "The status menu 'Open DuckDuckGo' menu item")
 }
diff --git a/DuckDuckGoVPN/Localizable.xcstrings b/DuckDuckGoVPN/Localizable.xcstrings
@@ -121,8 +121,20 @@
         }
       }
     },
+    "network.protection.vpn.location.formatter.nearest.location" : {
+      "comment" : "Nearest available location setting description",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Nearest Location"
+          }
+        }
+      }
+    },
     "network.protection.vpn.location.formatter.nearest.location.descriptor" : {
-      "comment" : "Description added after the nearest location in the VPN status view\nNearest available location setting description",
+      "comment" : "Description added after the nearest location in the VPN status view",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {