diff --git a/Vienna/Interfaces/Base.lproj/InfoWindow.xib b/Vienna/Interfaces/Base.lproj/InfoWindow.xib index d5752ed21b..6c77f73490 100644 --- a/Vienna/Interfaces/Base.lproj/InfoWindow.xib +++ b/Vienna/Interfaces/Base.lproj/InfoWindow.xib @@ -50,14 +50,6 @@ - - - - - - - - @@ -74,14 +66,6 @@ - - - - - - - - diff --git a/Vienna/Interfaces/Base.lproj/Preferences.storyboard b/Vienna/Interfaces/Base.lproj/Preferences.storyboard index bedc6dbe55..e2f90516bc 100644 --- a/Vienna/Interfaces/Base.lproj/Preferences.storyboard +++ b/Vienna/Interfaces/Base.lproj/Preferences.storyboard @@ -287,76 +287,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/Vienna/Interfaces/mul.lproj/MainMenu.xcstrings b/Vienna/Interfaces/mul.lproj/MainMenu.xcstrings index 96bf3db5f1..f11d8acc5f 100644 --- a/Vienna/Interfaces/mul.lproj/MainMenu.xcstrings +++ b/Vienna/Interfaces/mul.lproj/MainMenu.xcstrings @@ -1199,7 +1199,8 @@ "value" : "Vienna" } } - } + }, + "shouldTranslate" : false }, "57.title" : { "comment" : "Class = \"NSMenu\"; title = \"Vienna\"; ObjectID = \"57\";", @@ -1211,7 +1212,8 @@ "value" : "Vienna" } } - } + }, + "shouldTranslate" : false }, "58.title" : { "comment" : "Class = \"NSMenuItem\"; title = \"About Vienna\"; ObjectID = \"58\";", diff --git a/Vienna/Interfaces/mul.lproj/MainWindowController.xcstrings b/Vienna/Interfaces/mul.lproj/MainWindowController.xcstrings index 2553b484c8..4021d3628d 100644 --- a/Vienna/Interfaces/mul.lproj/MainWindowController.xcstrings +++ b/Vienna/Interfaces/mul.lproj/MainWindowController.xcstrings @@ -1295,7 +1295,8 @@ "value" : "Vienna" } } - } + }, + "shouldTranslate" : false }, "676-5a-TdF.title" : { "comment" : "Class = \"NSMenuItem\"; title = \"Open Subscription Home Page\"; ObjectID = \"676-5a-TdF\";", @@ -7223,7 +7224,8 @@ "value" : "Folder Name" } } - } + }, + "shouldTranslate" : false }, "RSJ-ph-xG6.title" : { "comment" : "Class = \"NSButtonCell\"; title = \"0\"; ObjectID = \"RSJ-ph-xG6\";", @@ -7235,7 +7237,8 @@ "value" : "0" } } - } + }, + "shouldTranslate" : false }, "sDP-Ni-g3a.title" : { "comment" : "Class = \"NSMenuItem\"; title = \"Unread Articles\"; ObjectID = \"sDP-Ni-g3a\";", diff --git a/Vienna/Interfaces/mul.lproj/Preferences.xcstrings b/Vienna/Interfaces/mul.lproj/Preferences.xcstrings index 4ab0374247..30a74f76e0 100644 --- a/Vienna/Interfaces/mul.lproj/Preferences.xcstrings +++ b/Vienna/Interfaces/mul.lproj/Preferences.xcstrings @@ -428,7 +428,7 @@ } }, "5Y4-ws-cQJ.title" : { - "comment" : "Class = \"NSMenuItem\"; title = \"15\"; ObjectID = \"5Y4-ws-cQJ\"; Note = \"Do not localize\";", + "comment" : "Class = \"NSMenuItem\"; title = \"15\"; ObjectID = \"5Y4-ws-cQJ\";", "extractionState" : "extracted_with_value", "localizations" : { "en" : { @@ -437,7 +437,8 @@ "value" : "15" } } - } + }, + "shouldTranslate" : false }, "6GF-Pk-gI9.title" : { "comment" : "Class = \"NSMenuItem\"; title = \"Every 6 hours\"; ObjectID = \"6GF-Pk-gI9\";", @@ -1214,7 +1215,7 @@ } }, "aYj-Ub-Isd.title" : { - "comment" : "Class = \"NSMenuItem\"; title = \"5\"; ObjectID = \"aYj-Ub-Isd\"; Note = \"Do not localize\";", + "comment" : "Class = \"NSMenuItem\"; title = \"5\"; ObjectID = \"aYj-Ub-Isd\";", "extractionState" : "extracted_with_value", "localizations" : { "en" : { @@ -1223,7 +1224,8 @@ "value" : "5" } } - } + }, + "shouldTranslate" : false }, "bom-nB-4zx.title" : { "comment" : "Class = \"NSTextFieldCell\"; title = \"Move articles to Trash:\"; ObjectID = \"bom-nB-4zx\";", @@ -1472,7 +1474,7 @@ } }, "Byc-c2-qnN.title" : { - "comment" : "Class = \"NSMenuItem\"; title = \"1\"; ObjectID = \"Byc-c2-qnN\"; Note = \"Do not localize\";", + "comment" : "Class = \"NSMenuItem\"; title = \"1\"; ObjectID = \"Byc-c2-qnN\";", "extractionState" : "extracted_with_value", "localizations" : { "en" : { @@ -1481,7 +1483,8 @@ "value" : "1" } } - } + }, + "shouldTranslate" : false }, "c4l-M5-qB1.title" : { "comment" : "Class = \"NSMenuItem\"; title = \"After one day\"; ObjectID = \"c4l-M5-qB1\";", @@ -3446,7 +3449,7 @@ } }, "ILd-2a-Vjb.title" : { - "comment" : "Class = \"NSMenuItem\"; title = \"2\"; ObjectID = \"ILd-2a-Vjb\"; Note = \"Do not localize\";", + "comment" : "Class = \"NSMenuItem\"; title = \"2\"; ObjectID = \"ILd-2a-Vjb\";", "extractionState" : "extracted_with_value", "localizations" : { "en" : { @@ -3455,7 +3458,8 @@ "value" : "2" } } - } + }, + "shouldTranslate" : false }, "ITA-U9-lhX.title" : { "comment" : "Class = \"NSTextFieldCell\"; title = \"Article list font:\"; ObjectID = \"ITA-U9-lhX\";", @@ -3584,7 +3588,7 @@ } }, "jbS-7v-rF4.title" : { - "comment" : "Class = \"NSMenuItem\"; title = \"30\"; ObjectID = \"jbS-7v-rF4\"; Note = \"Do not localize\";", + "comment" : "Class = \"NSMenuItem\"; title = \"30\"; ObjectID = \"jbS-7v-rF4\";", "extractionState" : "extracted_with_value", "localizations" : { "en" : { @@ -3593,7 +3597,8 @@ "value" : "30" } } - } + }, + "shouldTranslate" : false }, "jfH-Hq-gRk.title" : { "comment" : "Class = \"NSButtonCell\"; title = \"Bounce the application icon\"; ObjectID = \"jfH-Hq-gRk\";", @@ -6308,7 +6313,7 @@ } }, "vyo-cC-5Xv.title" : { - "comment" : "Class = \"NSMenuItem\"; title = \"50\"; ObjectID = \"vyo-cC-5Xv\"; Note = \"Do not localize\";", + "comment" : "Class = \"NSMenuItem\"; title = \"50\"; ObjectID = \"vyo-cC-5Xv\";", "extractionState" : "extracted_with_value", "localizations" : { "en" : { @@ -6317,7 +6322,8 @@ "value" : "50" } } - } + }, + "shouldTranslate" : false }, "wyk-W1-xMh.title" : { "comment" : "Class = \"NSViewController\"; title = \"Updates\"; ObjectID = \"wyk-W1-xMh\";", @@ -6578,7 +6584,7 @@ } }, "xjZ-nG-iOH.title" : { - "comment" : "Class = \"NSMenuItem\"; title = \"10\"; ObjectID = \"xjZ-nG-iOH\"; Note = \"Do not localize\";", + "comment" : "Class = \"NSMenuItem\"; title = \"10\"; ObjectID = \"xjZ-nG-iOH\";", "extractionState" : "extracted_with_value", "localizations" : { "en" : { @@ -6587,7 +6593,8 @@ "value" : "10" } } - } + }, + "shouldTranslate" : false }, "YG6-9k-gKH.title" : { "comment" : "Class = \"NSTextFieldCell\"; title = \"URL:\"; ObjectID = \"YG6-9k-gKH\";", diff --git a/Vienna/Resources/InfoPlist.xcstrings b/Vienna/Resources/InfoPlist.xcstrings index f867216b20..ffa4a03f47 100644 --- a/Vienna/Resources/InfoPlist.xcstrings +++ b/Vienna/Resources/InfoPlist.xcstrings @@ -11,7 +11,8 @@ "value" : "Vienna" } } - } + }, + "shouldTranslate" : false }, "NSAppleEventsUsageDescription" : { "comment" : "A message that tells the user why Vienna is requesting the ability to send Apple events.", @@ -22,7 +23,8 @@ "value" : "" } } - } + }, + "shouldTranslate" : false }, "NSHumanReadableCopyright" : { "comment" : "Copyright (human-readable)", @@ -34,7 +36,8 @@ "value" : "© 2004–2024 The Vienna RSS Project" } } - } + }, + "shouldTranslate" : false }, "OPML document" : { "comment" : "A label for OPML (Outline Processor Markup Language) documents. This is shown in Finder's Get Info window, for example.", diff --git a/Vienna/Resources/Localizable.xcstrings b/Vienna/Resources/Localizable.xcstrings index fab87e73c5..a70a8b5bc2 100644 --- a/Vienna/Resources/Localizable.xcstrings +++ b/Vienna/Resources/Localizable.xcstrings @@ -643,7 +643,8 @@ "value" : "%1$@, %2$@" } } - } + }, + "shouldTranslate" : false }, "%d new articles retrieved" : { "localizations" : { @@ -8268,9 +8269,6 @@ } } }, - "Development Options" : { - "comment" : "Do not localize" - }, "Do not show this warning again" : { "comment" : "Title of a checkbox on an alert", "localizations" : { @@ -13647,12 +13645,6 @@ } } }, - "Log Formatting Strings" : { - "comment" : "Do not localize" - }, - "Log Predicate String" : { - "comment" : "Do not localize" - }, "Make sure the username and password needed to access the Open Reader server are correctly set in Vienna's preferences. Also check your network access." : { "localizations" : { "da" : { diff --git a/Vienna/Sources/Alerts/SmartFolder.m b/Vienna/Sources/Alerts/SmartFolder.m index 8653ceba5b..4720289977 100644 --- a/Vienna/Sources/Alerts/SmartFolder.m +++ b/Vienna/Sources/Alerts/SmartFolder.m @@ -337,14 +337,18 @@ - (void)prepareDevelopmentOptionsButton { NSPopUpButton *button = [[NSPopUpButton alloc] initWithFrame:NSZeroRect pullsDown:YES]; - [button addItemWithTitle:NSLocalizedString(@"Development Options", - @"Do not localize")]; - [button.menu addItemWithTitle:NSLocalizedString(@"Log Predicate String", - @"Do not localize") + NSBundle *mainBundle = NSBundle.mainBundle; + [button addItemWithTitle:[mainBundle localizedStringForKey:@"Development Options" + value:nil + table:nil]]; + [button.menu addItemWithTitle:[mainBundle localizedStringForKey:@"Log Predicate String" + value:nil + table:nil] action:@selector(logPredicateString) keyEquivalent:@""]; - [button.menu addItemWithTitle:NSLocalizedString(@"Log Formatting Strings", - @"Do not localize") + [button.menu addItemWithTitle:[mainBundle localizedStringForKey:@"Log Formatting Strings" + value:nil + table:nil] action:@selector(logFormattingStrings) keyEquivalent:@""]; button.translatesAutoresizingMaskIntoConstraints = NO;