Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
* dev: (31 commits)
  add Polish support
  bunp version
  support Music and Audirvana 3.5
  fix: touchbar disappear while the app activate
  New translations Perference.strings (Polish)
  New translations Perference.strings (Polish)
  New translations Perference.strings (Polish)
  New translations Perference.strings (Polish)
  New translations Perference.strings (Polish)
  New translations Perference.strings (Polish)
  New translations Perference.strings (Polish)
  New translations Localizable.strings (Polish)
  New translations InfoPlist.strings (Polish)
  New translations Localizable.strings (Polish)
  New translations Main.strings (Polish)
  New translations Main.strings (Polish)
  New translations Main.strings (Polish)
  New translations Perference.strings (Japanese)
  New translations Main.strings (Polish)
  New translations Main.strings (Polish)
  ...
  • Loading branch information
ddddxxx committed Jun 28, 2019
2 parents 29c49b7 + c5da1e3 commit d21d788
Show file tree
Hide file tree
Showing 13 changed files with 300 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github "ddddxxx/LyricsProvider" == 0.7.0

github "ddddxxx/MusicPlayer" == 0.4.1
github "ddddxxx/MusicPlayer" "a3ea79b572bb37223da6a2972ff8b5de415a003b"

github "ddddxxx/GenericID" == 0.5.0

Expand Down
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "SnapKit/SnapKit" "5.0.0"
github "ddddxxx/GenericID" "v0.5.0"
github "ddddxxx/LyricsProvider" "v0.7.0"
github "ddddxxx/MusicPlayer" "v0.4.1"
github "ddddxxx/MusicPlayer" "a3ea79b572bb37223da6a2972ff8b5de415a003b"
github "ddddxxx/Semver" "v0.1.2"
github "ddddxxx/SwiftyOpenCC" "v1.0.0"
github "ddddxxx/TouchBarHelper" "v1.0.0"
Expand Down
5 changes: 5 additions & 0 deletions LyricsX.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,8 @@
BBC1D5901E4C80FC008869EC /* PreferenceDisplayViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreferenceDisplayViewController.swift; sourceTree = "<group>"; };
BBC7C5541E6AE28600E3EC4F /* PreferenceGeneralViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreferenceGeneralViewController.swift; sourceTree = "<group>"; };
BBD03C361E9B2C7200EFB975 /* DragNDropView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DragNDropView.swift; sourceTree = "<group>"; };
BBD2E35B22B780FC00410259 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Main.strings; sourceTree = "<group>"; };
BBD2E35C22B780FC00410259 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Perference.strings; sourceTree = "<group>"; };
BBE557961EC0291E00F1EC31 /* GenericID.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GenericID.framework; path = Carthage/Build/Mac/GenericID.framework; sourceTree = "<group>"; };
BBE8FC741F6BEA6200122AFA /* Then.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Then.swift; sourceTree = "<group>"; };
BBF83E201FB5501A00D76E5B /* MusicPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MusicPlayer.framework; path = Carthage/Build/Mac/MusicPlayer.framework; sourceTree = "<group>"; };
Expand Down Expand Up @@ -638,6 +640,7 @@
Base,
"zh-Hans",
ja,
pl,
);
mainGroup = BB4141A11E458BA800A51775;
productRefGroup = BB4141AB1E458BA800A51775 /* Products */;
Expand Down Expand Up @@ -967,6 +970,7 @@
BB3D1E911E8A2A2A00CA5B8F /* zh-Hans */,
BB335B112057BCE3003A69F8 /* en */,
E9AAA38B2195650D0006EBC2 /* ja */,
BBD2E35B22B780FC00410259 /* pl */,
);
name = Main.storyboard;
sourceTree = "<group>";
Expand All @@ -986,6 +990,7 @@
BB6139781FCCFAC800CBD808 /* zh-Hans */,
BB335B132057BD03003A69F8 /* en */,
E9AAA38A219565080006EBC2 /* ja */,
BBD2E35C22B780FC00410259 /* pl */,
);
name = Perference.storyboard;
sourceTree = "<group>";
Expand Down
4 changes: 4 additions & 0 deletions LyricsX/Component/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate, NSTouchBarPr

@available(OSX 10.12.2, *)
var touchBar: NSTouchBar? {
#if IS_FOR_MAS
return (self.touchBarLyrics as! TouchBarLyrics?)?.touchBar
#else
return nil
#endif
}

lazy var searchLyricsWC: NSWindowController = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ class PreferenceGeneralViewController: NSViewController {
for lan in supportedLanguages {
let str = Locale(identifier: lan).localizedString(forLanguageCode: lan)!
languagePopUp.addItem(withTitle: str)
if lan == defaults[.AppleLanguages].first {
languagePopUp.selectItem(withTitle: str)
}
}
}

Expand Down Expand Up @@ -141,4 +144,5 @@ let supportedLanguages = [
"en",
"zh-Hans",
"ja",
"pl",
]
6 changes: 3 additions & 3 deletions LyricsX/Supporting Files/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.6</string>
<string>1.5.0</string>
<key>CFBundleVersion</key>
<string>2122</string>
<string>2138</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>
Expand All @@ -43,7 +43,7 @@
<key>LSUIElement</key>
<true/>
<key>LX_BUILD_TIME</key>
<integer>1557144140</integer>
<integer>1560759553</integer>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSExceptionDomains</key>
Expand Down
2 changes: 2 additions & 0 deletions LyricsX/Supporting Files/LyricsX.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@
<key>com.apple.security.temporary-exception.apple-events</key>
<array>
<string>com.apple.iTunes</string>
<string>com.apple.Music</string>
<string>com.spotify.client</string>
<string>com.coppertino.Vox</string>
<string>com.audirvana.Audirvana-Plus</string>
<string>com.audirvana.Audirvana</string>
<string>ddddxxx.LyricsXHelper</string>
</array>
<key>com.apple.security.scripting-targets</key>
Expand Down
1 change: 1 addition & 0 deletions LyricsX/Supporting Files/pl.lproj/InfoPlist.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"NSAppleEventsUsageDescription" = "LyricsX musi wiedzieć jaką piosenkę właśnie odtwarzasz, żeby wyświetlić odpowiedni tekst.";
17 changes: 17 additions & 0 deletions LyricsX/Supporting Files/pl.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* title of download button on the update alert. Download new version of the app. */
"Download" = "Pobierz";

/* No comment provided by engineer. */
"Font Fallback: %@" = "Czcionka zapasowa: %@";

/* No comment provided by engineer. */
"OK" = "OK";

/* window title */
"Search Lyrics" = "Szukaj tekstu";

/* No comment provided by engineer. */
"Touch Bar lyrics is not supported in Mac App Store Version. Please download on GitHub." = "Tekst na Touch Bar nie jest dostępny w Wersji z App Store. Aby pobrać, wejdź na GitHub.";

/* alert title */
"Unable to enable Touch Bar lyrics." = "Nie można włączyć tekstu na Touch Bar.";
2 changes: 1 addition & 1 deletion LyricsX/ja.lproj/Main.strings
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@
"hxE-X4-sJh.title" = "歌詞";

/* Class = "NSMenuItem"; title = "Disable Lyrics for Entire Album"; ObjectID = "hgd-IJ-u14"; */
"hgd-IJ-u14.title" = "Disable Lyrics for Entire Album";
"hgd-IJ-u14.title" = "アルバム全体の歌詞を無効にする";
10 changes: 5 additions & 5 deletions LyricsX/ja.lproj/Perference.strings
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,16 @@
"T7p-MT-Mrh.title" = "ドラッグを有効にする";

/* Class = "NSButtonCell"; title = "Strict Search"; ObjectID = "As7-rZ-u6c"; */
"As7-rZ-u6c.title" = "Strict Search";
"As7-rZ-u6c.title" = "厳密な検索";

/* Class = "NSButtonCell"; title = "Customize TouchBar"; ObjectID = "zQK-i2-2Nc"; */
"zQK-i2-2Nc.title" = "Customize TouchBar";
"zQK-i2-2Nc.title" = "TouchBarをカスタマイズ";

/* Class = "NSTextFieldCell"; title = "Search result match the exact search term"; ObjectID = "rSD-qR-EXA"; */
"rSD-qR-EXA.title" = "Search result match the exact search term";
"rSD-qR-EXA.title" = "検索結果は正確な検索語と一致にする";

/* Class = "NSTextFieldCell"; title = "Language (Requires Restart):"; ObjectID = "WfA-pe-S5D"; */
"WfA-pe-S5D.title" = "Language (Requires Restart):";
"WfA-pe-S5D.title" = "言語 (再起動が必要):";

/* Class = "NSButtonCell"; title = "Help translate LyricsX"; ObjectID = "oiH-T7-agJ"; */
"oiH-T7-agJ.title" = "Help translate LyricsX";
"oiH-T7-agJ.title" = "LyricsXの翻訳に協力する";
80 changes: 80 additions & 0 deletions LyricsX/pl.lproj/Main.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
/* Class = "NSTableColumn"; headerCell.title = "Source"; ObjectID = "1xI-G4-Fsc"; */
"1xI-G4-Fsc.headerCell.title" = "Źródło";

/* Class = "NSWindow"; title = "Donate"; ObjectID = "CW0-AL-Z6N"; */
"CW0-AL-Z6N.title" = "Wesprzyj nas";

/* Class = "NSMenuItem"; title = "Preferences..."; ObjectID = "CWo-Qx-2Ut"; */
"CWo-Qx-2Ut.title" = "Ustawienia";

/* Class = "NSMenuItem"; title = "Donate..."; ObjectID = "EoO-ld-6Xv"; */
"EoO-ld-6Xv.title" = "Wesprzyj nas...";

/* Class = "NSTextFieldCell"; title = "Title:"; ObjectID = "FMI-7E-tCo"; */
"FMI-7E-tCo.title" = "Tytuł:";

/* Class = "NSMenuItem"; title = "Enable Karaoke Lyrics"; ObjectID = "GGU-uz-d9h"; */
"GGU-uz-d9h.title" = "Tryb Karaoke";

/* Class = "NSButton"; ibShadowedToolTip = "Always on top"; ObjectID = "Gza-SX-MCH"; */
"Gza-SX-MCH.ibShadowedToolTip" = "Zawsze na wierzchu";

/* Class = "NSTableColumn"; headerCell.title = "Artist"; ObjectID = "HMU-fa-17B"; */
"HMU-fa-17B.headerCell.title" = "Wykonawca";

/* Class = "NSTextFieldCell"; title = "Lyrics Offset:"; ObjectID = "IFz-XQ-DHf"; */
"IFz-XQ-DHf.title" = "Przesunięcie napisów:";

/* Class = "NSMenuItem"; title = "About LyricsX"; ObjectID = "PdE-VG-JUC"; */
"PdE-VG-JUC.title" = "O LyricsX";

/* Class = "NSMenuItem"; title = "Check For Update..."; ObjectID = "Piu-i2-JjD"; */
"Piu-i2-JjD.title" = "Sprawdź dostępność aktualizacji";

/* Class = "NSButtonCell"; title = "Apply"; ObjectID = "RGl-MT-MQb"; */
"RGl-MT-MQb.title" = "Zastosuj";

/* Class = "NSMenuItem"; title = "Quit LyricsX"; ObjectID = "RPR-IV-34T"; */
"RPR-IV-34T.title" = "Zamknij LyricsX";

/* Class = "NSMenuItem"; title = "Enable Menu Bar Lyrics"; ObjectID = "Z7d-yp-uRx"; */
"Z7d-yp-uRx.title" = "Włącz tekst w pasku menu";

/* Class = "NSTextFieldCell"; title = "No Lyrics\n\nDrag & Drop to import LRC file"; ObjectID = "aRw-yQ-GNX"; */
"aRw-yQ-GNX.title" = "Brak tekstu\n\nPrzeciągnij tu plik LRC żeby zaimportować";

/* Class = "NSButton"; ibShadowedToolTip = "Synchronism"; ObjectID = "d5a-4n-6k8"; */
"d5a-4n-6k8.ibShadowedToolTip" = "Synchronism";

/* Class = "NSButtonCell"; title = "Search"; ObjectID = "eb9-fE-Lgq"; */
"eb9-fE-Lgq.title" = "Szukaj";

/* Class = "NSMenuItem"; title = "Wrong Lyrics"; ObjectID = "fmS-zv-RcJ"; */
"fmS-zv-RcJ.title" = "Zły tekst";

/* Class = "NSMenuItem"; title = "Search Lyrics..."; ObjectID = "h6D-jz-GbI"; */
"h6D-jz-GbI.title" = "Szukaj tekstu...";

/* Class = "NSTableColumn"; headerCell.title = "Title"; ObjectID = "jWT-S5-YXM"; */
"jWT-S5-YXM.headerCell.title" = "Tytuł";

/* Class = "NSMenuItem"; title = "Write to iTunes"; ObjectID = "kNl-ZO-aX6"; */
"kNl-ZO-aX6.title" = "Zapisz w iTunes";

/* Class = "NSMenuItem"; title = "Show Lyrics Window"; ObjectID = "kyJ-kV-2Du"; */
"kyJ-kV-2Du.title" = "Pokaż okno z tekstem";

/* Class = "NSTextFieldCell"; title = "Artist:"; ObjectID = "l8J-1r-dIZ"; */
"l8J-1r-dIZ.title" = "Wykonawca:";

/* Class = "NSTextFieldCell"; title = "If you enjoy using LyricsX, and would like to buy me a cup of coffee, as well as help me keep this software going, you can scan QR code below to make a generous donation."; ObjectID = "o52-Z0-lue"; */
"o52-Z0-lue.title" = "Jeśli podoba Ci się LyricsX i chciałbyś mnie wesprzeć kubkiem kawy potrzebnym do pracy nad oprogramowaniem, możesz zeskanować poniższy kod QR i przesłać wsparcie.";

/* Class = "NSMenuItem"; title = "Show In Finder"; ObjectID = "DNi-vI-MTr"; */
"DNi-vI-MTr.title" = "Pokaż w Finderze";

/* Class = "NSMenuItem"; title = "Lyrics"; ObjectID = "hxE-X4-sJh"; */
"hxE-X4-sJh.title" = "Tekst";

/* Class = "NSMenuItem"; title = "Disable Lyrics for Entire Album"; ObjectID = "hgd-IJ-u14"; */
"hgd-IJ-u14.title" = "Wyłącz tekst dla całego albumu";
Loading

0 comments on commit d21d788

Please sign in to comment.