Skip to content

Commit 478d341

Browse files
superhighfivessuperhighfives
authored
Merge pull request #213 from superhighfives/1.7.0
1.7.0 — Duolingo (Japanese, Croatian, i18n parity)
2 parents 93ce24d + 89fb6d2 commit 478d341

26 files changed

Lines changed: 1621 additions & 154 deletions

‎Pika.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,9 @@
264264
EA635DF025B5A6D80014D91A /* Toast.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Toast.swift; sourceTree = "<group>"; };
265265
EA64D70A2F25FB6700A3F295 /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/Localizable.strings; sourceTree = "<group>"; };
266266
EA64D70C2F25FB9B00A3F295 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
267+
EA64D70E2F25FBC500A3F295 /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/Main.strings; sourceTree = "<group>"; };
268+
FA0000000000000000000A01 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
269+
FA0000000000000000000A02 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Main.strings; sourceTree = "<group>"; };
267270
EA72BB8225A5334B008205E7 /* MetalShader.metal */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.metal; path = MetalShader.metal; sourceTree = "<group>"; };
268271
EA72BB8725A53750008205E7 /* SplashView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashView.swift; sourceTree = "<group>"; };
269272
EA72BB8A25A537C3008205E7 /* MetalShader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetalShader.swift; sourceTree = "<group>"; };
@@ -743,6 +746,7 @@
743746
"zh-Hant",
744747
pl,
745748
hr,
749+
ja,
746750
);
747751
mainGroup = EAD0B6BF259CED1C00FA2F67;
748752
packageReferences = (
@@ -1048,6 +1052,7 @@
10481052
B581F92B2EDF40D700392413 /* pl */,
10491053
EA64D70A2F25FB6700A3F295 /* hr */,
10501054
EA64D70C2F25FB9B00A3F295 /* en */,
1055+
FA0000000000000000000A01 /* ja */,
10511056
);
10521057
name = Localizable.strings;
10531058
sourceTree = "<group>";
@@ -1063,6 +1068,8 @@
10631068
C1BF641F2C1AE533004D33DD /* zh-Hans */,
10641069
C1BF64212C1AE53C004D33DD /* zh-Hant */,
10651070
B581F92C2EDF40D700392413 /* pl */,
1071+
EA64D70E2F25FBC500A3F295 /* hr */,
1072+
FA0000000000000000000A02 /* ja */,
10661073
);
10671074
name = Main.storyboard;
10681075
sourceTree = "<group>";
@@ -1199,7 +1206,7 @@
11991206
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
12001207
CODE_SIGN_STYLE = Automatic;
12011208
COMBINE_HIDPI_IMAGES = YES;
1202-
CURRENT_PROJECT_VERSION = 78;
1209+
CURRENT_PROJECT_VERSION = 83;
12031210
DEAD_CODE_STRIPPING = YES;
12041211
DEVELOPMENT_ASSET_PATHS = "\"Pika/Preview Content\"";
12051212
DEVELOPMENT_TEAM = TGHU37N6EX;
@@ -1213,7 +1220,7 @@
12131220
"@executable_path/../Frameworks",
12141221
);
12151222
MACOSX_DEPLOYMENT_TARGET = 14.0;
1216-
MARKETING_VERSION = 1.6.0;
1223+
MARKETING_VERSION = 1.7.0-beta2;
12171224
PRODUCT_BUNDLE_IDENTIFIER = com.superhighfives.Pika;
12181225
PRODUCT_NAME = Pika;
12191226
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG TARGET_SPARKLE";
@@ -1231,7 +1238,7 @@
12311238
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
12321239
CODE_SIGN_STYLE = Automatic;
12331240
COMBINE_HIDPI_IMAGES = YES;
1234-
CURRENT_PROJECT_VERSION = 78;
1241+
CURRENT_PROJECT_VERSION = 83;
12351242
DEAD_CODE_STRIPPING = YES;
12361243
DEVELOPMENT_ASSET_PATHS = "\"Pika/Preview Content\"";
12371244
DEVELOPMENT_TEAM = TGHU37N6EX;
@@ -1245,7 +1252,7 @@
12451252
"@executable_path/../Frameworks",
12461253
);
12471254
MACOSX_DEPLOYMENT_TARGET = 14.0;
1248-
MARKETING_VERSION = 1.6.0;
1255+
MARKETING_VERSION = 1.7.0-beta2;
12491256
PRODUCT_BUNDLE_IDENTIFIER = com.superhighfives.Pika;
12501257
PRODUCT_NAME = Pika;
12511258
SWIFT_ACTIVE_COMPILATION_CONDITIONS = TARGET_SPARKLE;
@@ -1264,7 +1271,7 @@
12641271
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
12651272
CODE_SIGN_STYLE = Automatic;
12661273
COMBINE_HIDPI_IMAGES = YES;
1267-
CURRENT_PROJECT_VERSION = 79;
1274+
CURRENT_PROJECT_VERSION = 81;
12681275
DEAD_CODE_STRIPPING = YES;
12691276
DEVELOPMENT_ASSET_PATHS = "\"Pika/Preview Content\"";
12701277
DEVELOPMENT_TEAM = TGHU37N6EX;
@@ -1278,7 +1285,7 @@
12781285
"@executable_path/../Frameworks",
12791286
);
12801287
MACOSX_DEPLOYMENT_TARGET = 14.0;
1281-
MARKETING_VERSION = 1.6.0;
1288+
MARKETING_VERSION = 1.7.0-beta2;
12821289
PRODUCT_BUNDLE_IDENTIFIER = com.superhighfives.Pika;
12831290
PRODUCT_NAME = Pika;
12841291
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG TARGET_MAS";
@@ -1297,7 +1304,7 @@
12971304
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
12981305
CODE_SIGN_STYLE = Automatic;
12991306
COMBINE_HIDPI_IMAGES = YES;
1300-
CURRENT_PROJECT_VERSION = 79;
1307+
CURRENT_PROJECT_VERSION = 81;
13011308
DEAD_CODE_STRIPPING = YES;
13021309
DEVELOPMENT_ASSET_PATHS = "\"Pika/Preview Content\"";
13031310
DEVELOPMENT_TEAM = TGHU37N6EX;
@@ -1311,7 +1318,7 @@
13111318
"@executable_path/../Frameworks",
13121319
);
13131320
MACOSX_DEPLOYMENT_TARGET = 14.0;
1314-
MARKETING_VERSION = 1.6.0;
1321+
MARKETING_VERSION = 1.7.0-beta2;
13151322
PRODUCT_BUNDLE_IDENTIFIER = com.superhighfives.Pika;
13161323
PRODUCT_NAME = Pika;
13171324
SWIFT_ACTIVE_COMPILATION_CONDITIONS = TARGET_MAS;

‎Pika/Assets/de.lproj/Localizable.strings‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
/* Pika */
22
"app.name" = "Pika";
33

4+
/* Cancel */
5+
"general.cancel" = "Abbrechen";
6+
7+
/* Clear */
8+
"general.clear" = "Löschen";
9+
410
/* Version */
511
"app.version" = "Version";
612

@@ -468,3 +474,60 @@
468474

469475
/* Restore system appearance */
470476
"help.url.appearance.system" = "Systemerscheinungsbild wiederherstellen";
477+
478+
/* Toggle compliance */
479+
"compliance.toggle" = "Konformität umschalten";
480+
481+
/* New palette… */
482+
"palette.new" = "Neue Palette…";
483+
484+
/* Rename palette */
485+
"palette.rename" = "Palette umbenennen";
486+
487+
/* Delete palette */
488+
"palette.delete" = "Palette löschen";
489+
490+
/* Remove from palette */
491+
"palette.remove" = "Aus Palette entfernen";
492+
493+
/* Palette name */
494+
"palette.name.prompt" = "Palettenname";
495+
496+
/* My palette */
497+
"palette.name.placeholder" = "Meine Palette";
498+
499+
/* Add to palette */
500+
"palette.add" = "Zur Palette hinzufügen";
501+
502+
/* Export palette */
503+
"palette.export" = "Palette exportieren";
504+
505+
/* Export color history */
506+
"history.export" = "Farbverlauf exportieren";
507+
508+
/* Are you sure you want to clear all history? */
509+
"history.clear.confirm" = "Möchten Sie wirklich den gesamten Verlauf löschen?";
510+
511+
/* Show compliance */
512+
"help.url.compliance.show" = "Konformität anzeigen";
513+
514+
/* Hide compliance */
515+
"help.url.compliance.hide" = "Konformität ausblenden";
516+
517+
/* Toggle compliance */
518+
"help.url.compliance.toggle" = "Konformität umschalten";
519+
520+
/* Show colour preview */
521+
"help.url.preview.show" = "Farbvorschau anzeigen";
522+
523+
/* Hide colour preview */
524+
"help.url.preview.hide" = "Farbvorschau ausblenden";
525+
526+
/* Toggle colour preview */
527+
"help.url.preview.toggle" = "Farbvorschau umschalten";
528+
529+
/* Compliance */
530+
"help.url.group.compliance" = "Konformität";
531+
532+
/* Preview */
533+
"help.url.group.preview" = "Vorschau";

‎Pika/Assets/de.lproj/Main.strings‎

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,23 @@
2323
/* Class = "NSMenuItem"; title = "Check for updates…"; ObjectID = "BOF-NM-1cW"; */
2424
"BOF-NM-1cW.title" = "Updates überprüfen…";
2525

26+
/* Class = "NSMenuItem"; title = "Use system picker for background"; ObjectID = "CnG-MW-7x1"; */
27+
"CnG-MW-7x1.title" = "Systemfarbwähler für Hintergrund verwenden";
28+
2629
/* Class = "NSMenuItem"; title = "Copy all as text"; ObjectID = "D8e-06-QFY"; */
2730
"D8e-06-QFY.title" = "Als Text kopieren";
2831

2932
/* Class = "NSMenu"; title = "Help"; ObjectID = "F2S-fz-NVQ"; */
3033
"F2S-fz-NVQ.title" = "Hilfe";
3134

3235
/* Class = "NSMenuItem"; title = "Pika website"; ObjectID = "FKE-Sm-Kum"; */
33-
"FKE-Sm-Kum.title" = "Pika website";
36+
"FKE-Sm-Kum.title" = "Pika-Website";
37+
38+
/* Class = "NSMenuItem"; title = "HSB"; ObjectID = "GfU-Et-UCF"; */
39+
"GfU-Et-UCF.title" = "HSB";
40+
41+
/* Class = "NSMenuItem"; title = "RGB"; ObjectID = "Jrv-mf-bNr"; */
42+
"Jrv-mf-bNr.title" = "RGB";
3443

3544
/* Class = "NSMenu"; title = "Eyedroppers"; ObjectID = "KHB-9b-hO2"; */
3645
"KHB-9b-hO2.title" = "Auswahl";
@@ -47,6 +56,9 @@
4756
/* Class = "NSMenuItem"; title = "Pick foreground..."; ObjectID = "Nec-cr-B3a"; */
4857
"Nec-cr-B3a.title" = "Vordergrund auswählen...";
4958

59+
/* Class = "NSMenuItem"; title = "LAB"; ObjectID = "Nwx-nK-ndW"; */
60+
"Nwx-nK-ndW.title" = "LAB";
61+
5062
/* Class = "NSMenuItem"; title = "Hide Pika"; ObjectID = "Olw-nP-bQN"; */
5163
"Olw-nP-bQN.title" = "App verstecken";
5264

@@ -56,24 +68,60 @@
5668
/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "Vdr-fp-XzO"; */
5769
"Vdr-fp-XzO.title" = "Andere verstecken";
5870

71+
/* Class = "NSMenuItem"; title = "Close window"; ObjectID = "VpE-fH-2gc"; */
72+
"VpE-fH-2gc.title" = "Fenster schließen";
73+
5974
/* Class = "NSMenu"; title = "Edit"; ObjectID = "W48-6f-4Dl"; */
6075
"W48-6f-4Dl.title" = "Bearbeiten";
6176

6277
/* Class = "NSMenuItem"; title = "Pick background..."; ObjectID = "YF5-6a-ACB"; */
6378
"YF5-6a-ACB.title" = "Hintergrund auswählen...";
6479

80+
/* Class = "NSMenuItem"; title = "OpenGL"; ObjectID = "caq-wZ-Zn0"; */
81+
"caq-wZ-Zn0.title" = "OpenGL";
82+
6583
/* Class = "NSMenuItem"; title = "Eyedroppers"; ObjectID = "dNS-BC-3MB"; */
6684
"dNS-BC-3MB.title" = "Auswahl";
6785

6886
/* Class = "NSMenuItem"; title = "Undo"; ObjectID = "dRJ-4n-Yzg"; */
6987
"dRJ-4n-Yzg.title" = "Widerrufen";
7088

89+
/* Class = "NSMenuItem"; title = "Use system picker for foreground"; ObjectID = "hMH-To-rZ9"; */
90+
"hMH-To-rZ9.title" = "Systemfarbwähler für Vordergrund verwenden";
91+
92+
/* Class = "NSMenuItem"; title = "Delete history item"; ObjectID = "hst-Dl-mnu"; */
93+
"hst-Dl-mnu.title" = "Verlaufseintrag löschen";
94+
95+
/* Class = "NSMenuItem"; title = "Next history item"; ObjectID = "hst-Nx-mnu"; */
96+
"hst-Nx-mnu.title" = "Nächster Verlaufseintrag";
97+
98+
/* Class = "NSMenuItem"; title = "Previous history item"; ObjectID = "hst-Pv-mnu"; */
99+
"hst-Pv-mnu.title" = "Vorheriger Verlaufseintrag";
100+
101+
/* Class = "NSMenuItem"; title = "Report feedback"; ObjectID = "hxD-2G-mEq"; */
102+
"hxD-2G-mEq.title" = "Feedback melden";
103+
71104
/* Class = "NSMenu"; title = "Services"; ObjectID = "hz9-B4-Xy5"; */
72105
"hz9-B4-Xy5.title" = "Dienstleistungen";
73106

107+
/* Class = "NSMenuItem"; title = "Format"; ObjectID = "jQ5-Ak-Ocb"; */
108+
"jQ5-Ak-Ocb.title" = "Format";
109+
110+
/* Class = "NSMenuItem"; title = "OKLCH"; ObjectID = "oKl-Ch-7fM"; */
111+
"oKl-Ch-7fM.title" = "OKLCH";
112+
74113
/* Class = "NSMenuItem"; title = "Copy background"; ObjectID = "p7U-sR-JqZ"; */
75114
"p7U-sR-JqZ.title" = "Hintergrund kopieren";
76115

116+
/* Class = "NSMenuItem"; title = "Hex"; ObjectID = "rJ3-3M-xcY"; */
117+
"rJ3-3M-xcY.title" = "Hex";
118+
119+
/* Class = "NSMenuItem"; title = "HSL"; ObjectID = "t7X-bM-FAM"; */
120+
"t7X-bM-FAM.title" = "HSL";
121+
122+
/* Class = "NSMenuItem"; title = "Toggle history"; ObjectID = "tgl-Hs-mnu"; */
123+
"tgl-Hs-mnu.title" = "Verlauf umschalten";
124+
77125
/* Class = "NSMenu"; title = "Pika"; ObjectID = "uQy-DD-JDr"; */
78126
"uQy-DD-JDr.title" = "Pika";
79127

@@ -83,5 +131,5 @@
83131
/* Class = "NSMenuItem"; title = "Copy foreground"; ObjectID = "x3v-GG-iWU"; */
84132
"x3v-GG-iWU.title" = "Vordergrund kopieren";
85133

86-
/* Class = "NSMenuItem"; title = "Report feedback"; ObjectID = "hxD-2G-mEq.title"; */
87-
"hxD-2G-mEq.title" = "Feedback melden";
134+
/* Class = "NSMenu"; title = "Eyedroppers"; ObjectID = "z8G-HT-ae8"; */
135+
"z8G-HT-ae8.title" = "Auswahl";

‎Pika/Assets/en.lproj/Localizable.strings‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
/* Pika */
22
"app.name" = "Pika";
33

4+
/* Cancel */
5+
"general.cancel" = "Cancel";
6+
7+
/* Clear */
8+
"general.clear" = "Clear";
9+
410
/* Version */
511
"app.version" = "Version";
612

‎Pika/Assets/en.lproj/Main.strings‎

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
/* Class = "NSMenuItem"; title = "Check for updates…"; ObjectID = "BOF-NM-1cW"; */
2424
"BOF-NM-1cW.title" = "Check for updates…";
2525

26+
/* Class = "NSMenuItem"; title = "Use system picker for background"; ObjectID = "CnG-MW-7x1"; */
27+
"CnG-MW-7x1.title" = "Use system picker for background";
28+
2629
/* Class = "NSMenuItem"; title = "Copy all as text"; ObjectID = "D8e-06-QFY"; */
2730
"D8e-06-QFY.title" = "Copy all as text";
2831

@@ -32,6 +35,12 @@
3235
/* Class = "NSMenuItem"; title = "Pika website"; ObjectID = "FKE-Sm-Kum"; */
3336
"FKE-Sm-Kum.title" = "Pika website";
3437

38+
/* Class = "NSMenuItem"; title = "HSB"; ObjectID = "GfU-Et-UCF"; */
39+
"GfU-Et-UCF.title" = "HSB";
40+
41+
/* Class = "NSMenuItem"; title = "RGB"; ObjectID = "Jrv-mf-bNr"; */
42+
"Jrv-mf-bNr.title" = "RGB";
43+
3544
/* Class = "NSMenu"; title = "Eyedroppers"; ObjectID = "KHB-9b-hO2"; */
3645
"KHB-9b-hO2.title" = "Eyedroppers";
3746

@@ -47,6 +56,9 @@
4756
/* Class = "NSMenuItem"; title = "Pick foreground..."; ObjectID = "Nec-cr-B3a"; */
4857
"Nec-cr-B3a.title" = "Pick foreground...";
4958

59+
/* Class = "NSMenuItem"; title = "LAB"; ObjectID = "Nwx-nK-ndW"; */
60+
"Nwx-nK-ndW.title" = "LAB";
61+
5062
/* Class = "NSMenuItem"; title = "Hide Pika"; ObjectID = "Olw-nP-bQN"; */
5163
"Olw-nP-bQN.title" = "Hide Pika";
5264

@@ -56,24 +68,60 @@
5668
/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "Vdr-fp-XzO"; */
5769
"Vdr-fp-XzO.title" = "Hide Others";
5870

71+
/* Class = "NSMenuItem"; title = "Close window"; ObjectID = "VpE-fH-2gc"; */
72+
"VpE-fH-2gc.title" = "Close window";
73+
5974
/* Class = "NSMenu"; title = "Edit"; ObjectID = "W48-6f-4Dl"; */
6075
"W48-6f-4Dl.title" = "Edit";
6176

6277
/* Class = "NSMenuItem"; title = "Pick background..."; ObjectID = "YF5-6a-ACB"; */
6378
"YF5-6a-ACB.title" = "Pick background...";
6479

80+
/* Class = "NSMenuItem"; title = "OpenGL"; ObjectID = "caq-wZ-Zn0"; */
81+
"caq-wZ-Zn0.title" = "OpenGL";
82+
6583
/* Class = "NSMenuItem"; title = "Eyedroppers"; ObjectID = "dNS-BC-3MB"; */
6684
"dNS-BC-3MB.title" = "Eyedroppers";
6785

6886
/* Class = "NSMenuItem"; title = "Undo"; ObjectID = "dRJ-4n-Yzg"; */
6987
"dRJ-4n-Yzg.title" = "Undo";
7088

89+
/* Class = "NSMenuItem"; title = "Use system picker for foreground"; ObjectID = "hMH-To-rZ9"; */
90+
"hMH-To-rZ9.title" = "Use system picker for foreground";
91+
92+
/* Class = "NSMenuItem"; title = "Delete history item"; ObjectID = "hst-Dl-mnu"; */
93+
"hst-Dl-mnu.title" = "Delete history item";
94+
95+
/* Class = "NSMenuItem"; title = "Next history item"; ObjectID = "hst-Nx-mnu"; */
96+
"hst-Nx-mnu.title" = "Next history item";
97+
98+
/* Class = "NSMenuItem"; title = "Previous history item"; ObjectID = "hst-Pv-mnu"; */
99+
"hst-Pv-mnu.title" = "Previous history item";
100+
101+
/* Class = "NSMenuItem"; title = "Report feedback"; ObjectID = "hxD-2G-mEq"; */
102+
"hxD-2G-mEq.title" = "Report feedback";
103+
71104
/* Class = "NSMenu"; title = "Services"; ObjectID = "hz9-B4-Xy5"; */
72105
"hz9-B4-Xy5.title" = "Services";
73106

107+
/* Class = "NSMenuItem"; title = "Format"; ObjectID = "jQ5-Ak-Ocb"; */
108+
"jQ5-Ak-Ocb.title" = "Format";
109+
110+
/* Class = "NSMenuItem"; title = "OKLCH"; ObjectID = "oKl-Ch-7fM"; */
111+
"oKl-Ch-7fM.title" = "OKLCH";
112+
74113
/* Class = "NSMenuItem"; title = "Copy background"; ObjectID = "p7U-sR-JqZ"; */
75114
"p7U-sR-JqZ.title" = "Copy background";
76115

116+
/* Class = "NSMenuItem"; title = "Hex"; ObjectID = "rJ3-3M-xcY"; */
117+
"rJ3-3M-xcY.title" = "Hex";
118+
119+
/* Class = "NSMenuItem"; title = "HSL"; ObjectID = "t7X-bM-FAM"; */
120+
"t7X-bM-FAM.title" = "HSL";
121+
122+
/* Class = "NSMenuItem"; title = "Toggle history"; ObjectID = "tgl-Hs-mnu"; */
123+
"tgl-Hs-mnu.title" = "Toggle history";
124+
77125
/* Class = "NSMenu"; title = "Pika"; ObjectID = "uQy-DD-JDr"; */
78126
"uQy-DD-JDr.title" = "Pika";
79127

@@ -83,5 +131,5 @@
83131
/* Class = "NSMenuItem"; title = "Copy foreground"; ObjectID = "x3v-GG-iWU"; */
84132
"x3v-GG-iWU.title" = "Copy foreground";
85133

86-
/* Class = "NSMenuItem"; title = "Report feedback"; ObjectID = "hxD-2G-mEq.title"; */
87-
"hxD-2G-mEq.title" = "Report feedback";
134+
/* Class = "NSMenu"; title = "Eyedroppers"; ObjectID = "z8G-HT-ae8"; */
135+
"z8G-HT-ae8.title" = "Eyedroppers";

0 commit comments

Comments
 (0)