Skip to content

Commit 0df4077

Browse files
author
序歌
committed
update
1 parent eb71003 commit 0df4077

File tree

709 files changed

+25119
-12529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

709 files changed

+25119
-12529
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ xcode_workspace: Clipy.xcworkspace
55
xcode_scheme: Clipy
66
xcode_destination: platform=macOS
77
before_install:
8-
- gem install xcpretty bundler
8+
- gem install xcpretty bundler cocoapods

Clipy.xcodeproj/project.pbxproj

+9-5
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
FA6167921D3ABEB10049FA14 /* FolderSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA6167911D3ABEB10049FA14 /* FolderSpec.swift */; };
6969
FA6167941D3ACCB90049FA14 /* DraggedDataSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA6167931D3ACCB90049FA14 /* DraggedDataSpec.swift */; };
7070
FA6167961D3ACDD80049FA14 /* SnippetSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA6167951D3ACDD80049FA14 /* SnippetSpec.swift */; };
71-
FA6DD5141C7DEDB600317E73 /* (null) in Resources */ = {isa = PBXBuildFile; };
72-
FA6DD5151C7DEDB600317E73 /* (null) in Resources */ = {isa = PBXBuildFile; };
71+
FA6DD5141C7DEDB600317E73 /* BuildFile in Resources */ = {isa = PBXBuildFile; };
72+
FA6DD5151C7DEDB600317E73 /* BuildFile in Resources */ = {isa = PBXBuildFile; };
7373
FA801F4821A99F0400ACBE31 /* AvailableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA801F4721A99F0400ACBE31 /* AvailableType.swift */; };
7474
FAA4BCCC2163DC9100FF5D18 /* AccessibilityService.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAA4BCCB2163DC9100FF5D18 /* AccessibilityService.swift */; };
7575
FAC0DCE91DE15FD900309C49 /* DataCleanService.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC0DCE81DE15FD900309C49 /* DataCleanService.swift */; };
@@ -660,7 +660,7 @@
660660
buildActionMask = 2147483647;
661661
files = (
662662
FA1DB5131DDCB4C0007F95C8 /* CPYPreferencesWindowController.xib in Resources */,
663-
FA6DD5141C7DEDB600317E73 /* (null) in Resources */,
663+
FA6DD5141C7DEDB600317E73 /* BuildFile in Resources */,
664664
FA1DB51E1DDCB4C0007F95C8 /* CPYTypePreferenceViewController.xib in Resources */,
665665
FA1DB4901DDCA5D9007F95C8 /* Images.xcassets in Resources */,
666666
FA1DB51D1DDCB4C0007F95C8 /* CPYShortcutsPreferenceViewController.xib in Resources */,
@@ -669,7 +669,7 @@
669669
FA1DB51B1DDCB4C0007F95C8 /* CPYGeneralPreferenceViewController.xib in Resources */,
670670
FA1DB51A1DDCB4C0007F95C8 /* CPYExcludeAppPreferenceViewController.xib in Resources */,
671671
FA1DB5191DDCB4C0007F95C8 /* CPYBetaPreferenceViewController.xib in Resources */,
672-
FA6DD5151C7DEDB600317E73 /* (null) in Resources */,
672+
FA6DD5151C7DEDB600317E73 /* BuildFile in Resources */,
673673
FA1DB4941DDCB22C007F95C8 /* dsa_pub.pem in Resources */,
674674
FA1DB4981DDCB2CB007F95C8 /* Localizable.strings in Resources */,
675675
FA1DB49F1DDCB417007F95C8 /* MainMenu.xib in Resources */,
@@ -704,11 +704,13 @@
704704
"${BUILT_PRODUCTS_DIR}/RealmSwift/RealmSwift.framework",
705705
"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
706706
"${BUILT_PRODUCTS_DIR}/RxOptional/RxOptional.framework",
707+
"${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework",
707708
"${BUILT_PRODUCTS_DIR}/RxScreeen/RxScreeen.framework",
708709
"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
709710
"${BUILT_PRODUCTS_DIR}/Sauce/Sauce.framework",
710711
"${BUILT_PRODUCTS_DIR}/Screeen/Screeen.framework",
711712
"${PODS_ROOT}/Sparkle/Sparkle.framework",
713+
"${PODS_ROOT}/Sparkle/Sparkle.framework.dSYM",
712714
"${BUILT_PRODUCTS_DIR}/SwiftHEXColors/SwiftHEXColors.framework",
713715
);
714716
name = "[CP] Embed Pods Frameworks";
@@ -723,11 +725,13 @@
723725
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmSwift.framework",
724726
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
725727
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxOptional.framework",
728+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework",
726729
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxScreeen.framework",
727730
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
728731
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sauce.framework",
729732
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Screeen.framework",
730733
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sparkle.framework",
734+
"${DWARF_DSYM_FOLDER_PATH}/Sparkle.framework.dSYM",
731735
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftHEXColors.framework",
732736
);
733737
runOnlyForDeploymentPostprocessing = 0;
@@ -831,7 +835,7 @@
831835
);
832836
runOnlyForDeploymentPostprocessing = 0;
833837
shellPath = /bin/sh;
834-
shellScript = "\"${PODS_ROOT}/BartyCrouch/bartycrouch\" interfaces -p \"$PROJECT_DIR\"";
838+
shellScript = "\"${PODS_ROOT}/BartyCrouch/bartycrouch\" update";
835839
};
836840
FAAD02201CA98E20007C6EEE /* SwiftLint */ = {
837841
isa = PBXShellScriptBuildPhase;

Clipy/Generated/AssetsImages.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// swiftlint:disable all
2-
// Generated using SwiftGen, by O.Halligon — https://github.com/SwiftGen/SwiftGen
2+
// Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen
33

44
#if os(OSX)
55
import AppKit.NSImage

Clipy/Generated/Colors.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// swiftlint:disable all
2-
// Generated using SwiftGen, by O.Halligon — https://github.com/SwiftGen/SwiftGen
2+
// Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen
33

44
#if os(OSX)
55
import AppKit.NSColor

Clipy/Generated/LocalizedStrings.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// swiftlint:disable all
2-
// Generated using SwiftGen, by O.Halligon — https://github.com/SwiftGen/SwiftGen
2+
// Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen
33

44
import Foundation
55

@@ -67,6 +67,7 @@ internal enum L10n {
6767

6868
extension L10n {
6969
private static func tr(_ table: String, _ key: String, _ args: CVarArg...) -> String {
70+
// swiftlint:disable:next nslocalizedstring_key
7071
let format = NSLocalizedString(key, tableName: table, bundle: Bundle(for: BundleToken.self), comment: "")
7172
return String(format: format, locale: Locale.current, arguments: args)
7273
}
+21-32
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,48 @@
1-
//
2-
// Localizable.strings
3-
//
4-
// Clipy
5-
// GitHub: https://github.com/clipy
6-
// HP: https://clipy-app.com
7-
//
8-
// Created by Econa77 on 2015/06/21.
9-
//
10-
// Copyright © 2015-2018 Clipy Project.
11-
//
121

13-
"Launch Clipy on system startup?" = "Clipy beim Starten öffnen?";
2+
"Add" = "Hinzufügen";
143

15-
"You can change this setting in the Preferences if you want" = "Sie können diese Option in den Einstellungen ändern.";
4+
"Are you sure want to delete this item?" = "Möchten sie diesen Eintrag wirklich löschen?";
165

17-
"Launch on system startup" = "Anwendung automatisch starten";
6+
"Are you sure you want to clear your clipboard history?" = "Möchten sie den Verlauf ihrer Zwischenablage wirklich löschen?";
187

19-
"Don't Launch" = "Nicht starten";
8+
"Cancel" = "Abbrechen";
209

2110
"Clear History" = "Verlauf löschen";
2211

23-
"Are you sure you want to clear your clipboard history?" = "Möchten sie den Verlauf ihrer Zwischenablage wirklich löschen?";
12+
"Delete Item" = "Einträge löschen";
2413

25-
"Cancel" = "Abbrechen";
14+
"Don't Launch" = "Nicht starten";
2615

2716
"Edit Snippets" = "Snippets bearbeiten...";
2817

29-
"Preferences" = "Einstellungen...";
30-
31-
"Quit Clipy" = "Clipy beenden";
18+
"General" = "Allgemein";
3219

3320
"History" = "Verlauf";
3421

35-
"Snippet" = "Snippet";
22+
"Launch Clipy on system startup?" = "Clipy beim Starten öffnen?";
3623

37-
"General" = "Allgemein";
24+
"Launch on system startup" = "Anwendung automatisch starten";
3825

3926
"Menu" = "Menü";
4027

41-
"Type" = "Typ";
42-
43-
"Shortcuts" = "Tastenkombinationen";
28+
"Open System Preferences" = "Open System Preferences";
4429

45-
"Updates" = "Aktualisierungen";
30+
"Please allow Accessibility" = "Please allow Accessibility.";
4631

47-
"Delete Item" = "Einträge löschen";
32+
"Please fill in the contents of the snippet" = "Bitte geben Sie den Inhalt des Snippets ein";
4833

49-
"Are you sure want to delete this item?" = "Möchten sie diesen Eintrag wirklich löschen?";
34+
"Preferences" = "Einstellungen...";
5035

51-
"Add" = "Hinzufügen";
36+
"Quit Clipy" = "Clipy beenden";
5237

53-
"Please fill in the contents of the snippet" = "Bitte geben Sie den Inhalt des Snippets ein";
38+
"Shortcuts" = "Tastenkombinationen";
5439

55-
"Please allow Accessibility" = "Please allow Accessibility.";
40+
"Snippet" = "Snippet";
5641

5742
"To do this action please allow Accessibility in Security Privacy preferences located in System Preferences" = "To do this action please allow Accessibility in Security & Privacy preferences, located in System Preferences.";
5843

59-
"Open System Preferences" = "Open System Preferences";
44+
"Type" = "Typ";
45+
46+
"Updates" = "Aktualisierungen";
47+
48+
"You can change this setting in the Preferences if you want" = "Sie können diese Option in den Einstellungen ändern.";
+21-32
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,48 @@
1-
//
2-
// Localizable.strings
3-
//
4-
// Clipy
5-
// GitHub: https://github.com/clipy
6-
// HP: https://clipy-app.com
7-
//
8-
// Created by Econa77 on 2015/06/21.
9-
//
10-
// Copyright © 2015-2018 Clipy Project.
11-
//
121

13-
"Launch Clipy on system startup?" = "Launch Clipy on system startup?";
2+
"Add" = "Add";
143

15-
"You can change this setting in the Preferences if you want" = "You can change this setting in the Preferences if you want.";
4+
"Are you sure want to delete this item?" = "Are you sure want to delete this item?";
165

17-
"Launch on system startup" = "Launch on system startup";
6+
"Are you sure you want to clear your clipboard history?" = "Are you sure you want to clear your clipboard history?";
187

19-
"Don't Launch" = "Don't Launch";
8+
"Cancel" = "Cancel";
209

2110
"Clear History" = "Clear History";
2211

23-
"Are you sure you want to clear your clipboard history?" = "Are you sure you want to clear your clipboard history?";
12+
"Delete Item" = "Delete Item";
2413

25-
"Cancel" = "Cancel";
14+
"Don't Launch" = "Don't Launch";
2615

2716
"Edit Snippets" = "Edit Snippets...";
2817

29-
"Preferences" = "Preferences...";
30-
31-
"Quit Clipy" = "Quit Clipy";
18+
"General" = "General";
3219

3320
"History" = "History";
3421

35-
"Snippet" = "Snippet";
22+
"Launch Clipy on system startup?" = "Launch Clipy on system startup?";
3623

37-
"General" = "General";
24+
"Launch on system startup" = "Launch on system startup";
3825

3926
"Menu" = "Menu";
4027

41-
"Type" = "Type";
42-
43-
"Shortcuts" = "Shortcuts";
28+
"Open System Preferences" = "Open System Preferences";
4429

45-
"Updates" = "Updates";
30+
"Please allow Accessibility" = "Please allow Accessibility.";
4631

47-
"Delete Item" = "Delete Item";
32+
"Please fill in the contents of the snippet" = "Please fill in the contents of the snippet";
4833

49-
"Are you sure want to delete this item?" = "Are you sure want to delete this item?";
34+
"Preferences" = "Preferences...";
5035

51-
"Add" = "Add";
36+
"Quit Clipy" = "Quit Clipy";
5237

53-
"Please fill in the contents of the snippet" = "Please fill in the contents of the snippet";
38+
"Shortcuts" = "Shortcuts";
5439

55-
"Please allow Accessibility" = "Please allow Accessibility.";
40+
"Snippet" = "Snippet";
5641

5742
"To do this action please allow Accessibility in Security Privacy preferences located in System Preferences" = "To do this action please allow Accessibility in Security & Privacy preferences, located in System Preferences.";
5843

59-
"Open System Preferences" = "Open System Preferences";
44+
"Type" = "Type";
45+
46+
"Updates" = "Updates";
47+
48+
"You can change this setting in the Preferences if you want" = "You can change this setting in the Preferences if you want.";
+21-32
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,48 @@
1-
//
2-
// Localizable.strings
3-
//
4-
// Clipy
5-
// GitHub: https://github.com/clipy
6-
// HP: https://clipy-app.com
7-
//
8-
// Created by Econa77 on 2015/06/21.
9-
//
10-
// Copyright © 2015-2018 Clipy Project.
11-
//
121

13-
"Launch Clipy on system startup?" = "Vuoi avviare Clipy al login?";
2+
"Add" = "Aggiungi";
143

15-
"You can change this setting in the Preferences if you want" = "Puoi modificare questa impostazione nelle Preferenze.";
4+
"Are you sure want to delete this item?" = "Vuoi davvero eliminare questo elemento?";
165

17-
"Launch on system startup" = "Avvia Clipy al login";
6+
"Are you sure you want to clear your clipboard history?" = "Vuoi davvero cancellare tutte le voci della Cronologia?";
187

19-
"Don't Launch" = "Non avviare";
8+
"Cancel" = "Annulla";
209

2110
"Clear History" = "Svuota la Cronologia";
2211

23-
"Are you sure you want to clear your clipboard history?" = "Vuoi davvero cancellare tutte le voci della Cronologia?";
12+
"Delete Item" = "Elimina";
2413

25-
"Cancel" = "Annulla";
14+
"Don't Launch" = "Non avviare";
2615

2716
"Edit Snippets" = "Modifica snippet...";
2817

29-
"Preferences" = "Preferenze...";
30-
31-
"Quit Clipy" = "Esci da Clipy";
18+
"General" = "Generali";
3219

3320
"History" = "Cronologia";
3421

35-
"Snippet" = "Snippet";
22+
"Launch Clipy on system startup?" = "Vuoi avviare Clipy al login?";
3623

37-
"General" = "Generali";
24+
"Launch on system startup" = "Avvia Clipy al login";
3825

3926
"Menu" = "Menu";
4027

41-
"Type" = "Appunti";
42-
43-
"Shortcuts" = "Scorciatoie";
28+
"Open System Preferences" = "Open System Preferences";
4429

45-
"Updates" = "Aggiornamenti";
30+
"Please allow Accessibility" = "Please allow Accessibility.";
4631

47-
"Delete Item" = "Elimina";
32+
"Please fill in the contents of the snippet" = "Si prega di compilare il contenuto dello snippet";
4833

49-
"Are you sure want to delete this item?" = "Vuoi davvero eliminare questo elemento?";
34+
"Preferences" = "Preferenze...";
5035

51-
"Add" = "Aggiungi";
36+
"Quit Clipy" = "Esci da Clipy";
5237

53-
"Please fill in the contents of the snippet" = "Si prega di compilare il contenuto dello snippet";
38+
"Shortcuts" = "Scorciatoie";
5439

55-
"Please allow Accessibility" = "Please allow Accessibility.";
40+
"Snippet" = "Snippet";
5641

5742
"To do this action please allow Accessibility in Security Privacy preferences located in System Preferences" = "To do this action please allow Accessibility in Security & Privacy preferences, located in System Preferences.";
5843

59-
"Open System Preferences" = "Open System Preferences";
44+
"Type" = "Appunti";
45+
46+
"Updates" = "Aggiornamenti";
47+
48+
"You can change this setting in the Preferences if you want" = "Puoi modificare questa impostazione nelle Preferenze.";

0 commit comments

Comments
 (0)