From 2b668967e205431608ce0e14e5000f4a26939096 Mon Sep 17 00:00:00 2001 From: Kim Wittenburg Date: Tue, 15 Sep 2015 15:26:35 +0200 Subject: [PATCH] Added English localization --- TagTunes.xcodeproj/project.pbxproj | 32 +++++++++++++++++++++------ TagTunes/Base.lproj/Main.storyboard | 2 +- TagTunes/Preference Controllers.swift | 2 +- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/TagTunes.xcodeproj/project.pbxproj b/TagTunes.xcodeproj/project.pbxproj index 648c8d4..3680fa3 100644 --- a/TagTunes.xcodeproj/project.pbxproj +++ b/TagTunes.xcodeproj/project.pbxproj @@ -25,9 +25,9 @@ 3B96BD661B9CA24100CC4101 /* DescriptiveError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B96BD651B9CA24100CC4101 /* DescriptiveError.swift */; }; 3BAD17CD1B9F0F6800FEF908 /* AlbumCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BAD17CC1B9F0F6800FEF908 /* AlbumCollection.swift */; }; 3BB1C97D1BA76F5F0083301F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3BB1C97C1BA76F5F0083301F /* Assets.xcassets */; settings = {ASSET_TAGS = (); }; }; - 3BB8C5431BA2EEE800031021 /* Changelog.txt in Resources */ = {isa = PBXBuildFile; fileRef = 3BB8C5421BA2EEE800031021 /* Changelog.txt */; }; 3BBF6FA01B946B7000BB1EDB /* SearchResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BBF6F9F1B946B7000BB1EDB /* SearchResult.swift */; }; 3BBF710B1B95E00F00BB1EDB /* AppKitPlus.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BBF710A1B95E00F00BB1EDB /* AppKitPlus.framework */; }; + 3BFDED621BA84AD1007E7F36 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3BFDED601BA84AD1007E7F36 /* Localizable.strings */; settings = {ASSET_TAGS = (); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -59,7 +59,7 @@ 3B489DC91B90B3E3002B7EB3 /* iTunes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iTunes.h; sourceTree = ""; }; 3B489DCA1B90B3E3002B7EB3 /* iTunes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iTunes.m; sourceTree = ""; }; 3B489DD51B90E0D8002B7EB3 /* AlbumTableCellView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AlbumTableCellView.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; - 3B66275E1BA767C500483219 /* Credits.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = ""; }; + 3B66275E1BA767C500483219 /* Credits.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; name = Credits.rtf; path = ../Credits.rtf; sourceTree = ""; }; 3B76C76F1B909B280025D550 /* TagTunes.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TagTunes.app; sourceTree = BUILT_PRODUCTS_DIR; }; 3B76C7721B909B280025D550 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 3B76C7741B909B280025D550 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = ""; }; @@ -78,6 +78,7 @@ 3BBF6F9F1B946B7000BB1EDB /* SearchResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchResult.swift; sourceTree = ""; }; 3BBF710A1B95E00F00BB1EDB /* AppKitPlus.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKitPlus.framework; path = "../../../../Library/Developer/Xcode/DerivedData/TagTunes-ahlftzbggvvcneeglkkowfbohpzh/Build/Products/Debug/AppKitPlus.framework"; sourceTree = ""; }; 3BBF71161B98FB4200BB1EDB /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + 3BFDED611BA84AD1007E7F36 /* Base */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -118,7 +119,6 @@ 3B76C7661B909B280025D550 = { isa = PBXGroup; children = ( - 3B66275E1BA767C500483219 /* Credits.rtf */, 3BB8C5421BA2EEE800031021 /* Changelog.txt */, 3BBF71161B98FB4200BB1EDB /* README.md */, 3B76C7711B909B280025D550 /* TagTunes */, @@ -146,7 +146,7 @@ 3B76C79D1B909B8C0025D550 /* Model */, 3B76C79F1B909B960025D550 /* View */, 3B76C79E1B909B910025D550 /* Controller */, - 3B76C77B1B909B280025D550 /* Info.plist */, + 3BFDED631BA84ADB007E7F36 /* Resources */, 3B489DC81B90B3E2002B7EB3 /* TagTunes-Bridging-Header.h */, ); path = TagTunes; @@ -198,8 +198,6 @@ 3B76C79F1B909B960025D550 /* View */ = { isa = PBXGroup; children = ( - 3B76C7781B909B280025D550 /* Main.storyboard */, - 3BB1C97C1BA76F5F0083301F /* Assets.xcassets */, 3B489DD51B90E0D8002B7EB3 /* AlbumTableCellView.swift */, 3B489DBD1B90B055002B7EB3 /* TrackTableCellView.swift */, ); @@ -214,6 +212,18 @@ name = Frameworks; sourceTree = ""; }; + 3BFDED631BA84ADB007E7F36 /* Resources */ = { + isa = PBXGroup; + children = ( + 3B76C7781B909B280025D550 /* Main.storyboard */, + 3BB1C97C1BA76F5F0083301F /* Assets.xcassets */, + 3BFDED601BA84AD1007E7F36 /* Localizable.strings */, + 3B76C77B1B909B280025D550 /* Info.plist */, + 3B66275E1BA767C500483219 /* Credits.rtf */, + ); + name = Resources; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -318,8 +328,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3BFDED621BA84AD1007E7F36 /* Localizable.strings in Resources */, 3B76C77A1B909B280025D550 /* Main.storyboard in Resources */, - 3BB8C5431BA2EEE800031021 /* Changelog.txt in Resources */, 3BB1C97D1BA76F5F0083301F /* Assets.xcassets in Resources */, 3B66275F1BA767C500483219 /* Credits.rtf in Resources */, ); @@ -403,6 +413,14 @@ name = Main.storyboard; sourceTree = ""; }; + 3BFDED601BA84AD1007E7F36 /* Localizable.strings */ = { + isa = PBXVariantGroup; + children = ( + 3BFDED611BA84AD1007E7F36 /* Base */, + ); + name = Localizable.strings; + sourceTree = ""; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ diff --git a/TagTunes/Base.lproj/Main.storyboard b/TagTunes/Base.lproj/Main.storyboard index 418d33a..6310295 100644 --- a/TagTunes/Base.lproj/Main.storyboard +++ b/TagTunes/Base.lproj/Main.storyboard @@ -883,7 +883,7 @@ CA - + diff --git a/TagTunes/Preference Controllers.swift b/TagTunes/Preference Controllers.swift index 12575f2..68b8bf8 100644 --- a/TagTunes/Preference Controllers.swift +++ b/TagTunes/Preference Controllers.swift @@ -31,7 +31,7 @@ internal class GeneralPreferencesViewController: NSViewController { openPanel.canChooseDirectories = true openPanel.canChooseFiles = false openPanel.canCreateDirectories = true - openPanel.prompt = NSLocalizedString("Choose…", comment: "Button title prompting the user to choose a directory") + openPanel.prompt = NSLocalizedString("Choose…", comment: "Button title in an open dialog prompting the user to choose a directory") openPanel.beginSheetModalForWindow(view.window!) { result in if result == NSModalResponseOK {