Merge pull request #2237 from quicksilver/general

Change Preferences → Preferences to Preferences → General
quicksilver · Jul 26, 2016 · 48b58d6 · 48b58d6
2 parents a57946f + d630a0d
commit 48b58d6
Show file tree

Hide file tree

Showing 4 changed files with 250 additions and 1,183 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 language: objective-c
+osx_image: xcode7.2
 xcode_project: Quicksilver/Quicksilver.xcodeproj # path to your xcodeproj folder
 xcode_scheme: "Quicksilver Distribution"
 script: |

diff --git a/Quicksilver/Code-App/QSPreferencesController.m b/Quicksilver/Code-App/QSPreferencesController.m
@@ -612,8 +612,9 @@ - (void)setShowSettings:(BOOL)flag {
 - (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag {
 	if ([itemIdentifier isEqualToString:@"QSSettingsPanePlaceholder"]) {
 		NSToolbarItem *newItem = [[NSToolbarItem alloc] initWithItemIdentifier:itemIdentifier];
-		[newItem setLabel:@"Preferences"];
-		[newItem setPaletteLabel:@"Preferences"];
+		NSString *general = NSLocalizedString(@"General", @"Not related to a specific category");
+		[newItem setLabel:general];
+		[newItem setPaletteLabel:general];
 		[newItem setImage:[QSResourceManager imageNamed:@"Pref-Settings"]];
 		[newItem setToolTip:@"Application and Plugin Preferences"];
 		[newItem setTarget:self];

diff --git a/Quicksilver/Localized/en.lproj/Localizable.strings b/Quicksilver/Localized/en.lproj/Localizable.strings