diff --git a/code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj b/code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj index 706c24a7..09ac0ed7 100644 --- a/code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj +++ b/code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj @@ -122,8 +122,7 @@ C0546BDB20FE961E003FE5A6 /* MSCPasswordAlertController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MSCPasswordAlertController.swift; sourceTree = ""; }; C05F878D210556C9000DB8D8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainMenu.strings; sourceTree = ""; }; C05F878E21055746000DB8D8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Base; path = Base.lproj/Info.plist; sourceTree = ""; }; - C05F87942105587A000DB8D8 /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; - C05F879621055BFE000DB8D8 /* Base */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = ""; }; + C05F879621055BFE000DB8D8 /* Base */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = ""; }; C05F879721055DAA000DB8D8 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = ""; }; C05F879821055DE2000DB8D8 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; C05F87A221055E7F000DB8D8 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = ""; }; @@ -139,6 +138,7 @@ C0BCAD7C2442A0B3001D2FDD /* appleupdates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = appleupdates.swift; sourceTree = ""; }; C0C5DF6B20F5C27700CA0687 /* MSCStatusController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MSCStatusController.swift; sourceTree = ""; }; C0D30BEA20CA445A005E876E /* MunkiItems.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MunkiItems.swift; sourceTree = ""; }; + C0E10E58245494C4003E04F2 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; C0E2599D210AD8CD00C3A3D9 /* Socket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Socket.swift; sourceTree = ""; }; C0F8E3DF2105622F00718259 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; C0F8E3E221057A1500718259 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/MainMenu.strings; sourceTree = ""; }; @@ -522,7 +522,6 @@ C05F87952105587A000DB8D8 /* Localizable.strings */ = { isa = PBXVariantGroup; children = ( - C05F87942105587A000DB8D8 /* en */, C05F879621055BFE000DB8D8 /* Base */, C05F879721055DAA000DB8D8 /* da */, C05F879821055DE2000DB8D8 /* de */, @@ -538,6 +537,7 @@ C005116821055FC500F2D091 /* en-AU */, C00511692105600A00F2D091 /* en-CA */, C005116A2105602000F2D091 /* en-GB */, + C0E10E58245494C4003E04F2 /* en */, ); name = Localizable.strings; sourceTree = ""; diff --git a/code/apps/Managed Software Center/Managed Software Center/Base.lproj/Localizable.strings b/code/apps/Managed Software Center/Managed Software Center/Base.lproj/Localizable.strings index cb87ab42..99e9a5de 100644 Binary files a/code/apps/Managed Software Center/Managed Software Center/Base.lproj/Localizable.strings and b/code/apps/Managed Software Center/Managed Software Center/Base.lproj/Localizable.strings differ diff --git a/code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift b/code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift index f4564a9c..72b34390 100644 --- a/code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift +++ b/code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift @@ -1198,9 +1198,9 @@ class MainWindowController: NSWindowController, NSWindowDelegate, WKNavigationDe "Please contact your administrator for more details", comment: "Pre Install Uninstall Upgrade Alert Detail") let defaultOKLabel = NSLocalizedString( - "OK", comment: "Pre Install Uninstall Upgrade OK Label") + "OK", comment: "OK button title") let defaultCancelLabel = NSLocalizedString( - "Cancel", comment: "Pre Install Uninstall Upgrade Cancel Label") + "Cancel", comment: "Cancel button title/short action text") let alertTitle = alert["alert_title"] as? String ?? defaultAlertTitle let alertDetail = alert["alert_detail"] as? String ?? defaultAlertDetail diff --git a/code/apps/Managed Software Center/Managed Software Center/MunkiItems.swift b/code/apps/Managed Software Center/Managed Software Center/MunkiItems.swift index cb3eddfa..94103cbd 100644 --- a/code/apps/Managed Software Center/Managed Software Center/MunkiItems.swift +++ b/code/apps/Managed Software Center/Managed Software Center/MunkiItems.swift @@ -332,7 +332,7 @@ class GenericItem: BaseItem { comment: "Update Will Be Installed status text"), "update-available": NSLocalizedString("Update available", - comment: "Update Available status text"), + comment: "Update available text"), "unavailable": NSLocalizedString("Unavailable", comment: "Unavailable status text") @@ -570,7 +570,7 @@ class GenericItem: BaseItem { let note = my["note"] as? String ?? "" if is_update { return NSLocalizedString("Update available", - comment: "Update available display text") + comment: "Update available text") } else if note.hasPrefix("Insufficient disk space to download and install") { return NSLocalizedString("Not enough disk space", comment: "Not Enough Disk Space display text") diff --git a/code/apps/Managed Software Center/Managed Software Center/en.lproj/Localizable.strings b/code/apps/Managed Software Center/Managed Software Center/en.lproj/Localizable.strings index cb87ab42..99e9a5de 100644 Binary files a/code/apps/Managed Software Center/Managed Software Center/en.lproj/Localizable.strings and b/code/apps/Managed Software Center/Managed Software Center/en.lproj/Localizable.strings differ