Skip to content

Commit 22043ef

Browse files
vslavikvslavik
committed
Merge branch 'devel/require-macos11'
2 parents 92f458b + 0de214c commit 22043ef

Some content is hidden

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

67 files changed

+172
-165
lines changed

‎Poedit.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@
6767
B212FEED20A7356300FAC68F /* pl_evaluate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B28F1CE316F629D30018AF7E /* pl_evaluate.cpp */; };
6868
B212FEEE20A7366600FAC68F /* pl_evaluate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B28F1CE316F629D30018AF7E /* pl_evaluate.cpp */; };
6969
B2132FDA19B3672000326B16 /* customcontrols.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2132FD819B3672000326B16 /* customcontrols.cpp */; };
70-
B2166F4919AE4045000A6AA0 /* Prefs-Extractors.png in Resources */ = {isa = PBXBuildFile; fileRef = B2166F4119AE4045000A6AA0 /* Prefs-Extractors.png */; };
71-
B2166F4A19AE4045000A6AA0 /* Prefs-Extractors@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2166F4219AE4045000A6AA0 /* Prefs-Extractors@2x.png */; };
72-
B2166F4B19AE4045000A6AA0 /* Prefs-General.png in Resources */ = {isa = PBXBuildFile; fileRef = B2166F4319AE4045000A6AA0 /* Prefs-General.png */; };
73-
B2166F4C19AE4045000A6AA0 /* Prefs-General@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2166F4419AE4045000A6AA0 /* Prefs-General@2x.png */; };
74-
B2166F4D19AE4045000A6AA0 /* Prefs-TM.png in Resources */ = {isa = PBXBuildFile; fileRef = B2166F4519AE4045000A6AA0 /* Prefs-TM.png */; };
75-
B2166F4E19AE4045000A6AA0 /* Prefs-TM@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2166F4619AE4045000A6AA0 /* Prefs-TM@2x.png */; };
76-
B2166F4F19AE4045000A6AA0 /* Prefs-Updates.png in Resources */ = {isa = PBXBuildFile; fileRef = B2166F4719AE4045000A6AA0 /* Prefs-Updates.png */; };
77-
B2166F5019AE4045000A6AA0 /* Prefs-Updates@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2166F4819AE4045000A6AA0 /* Prefs-Updates@2x.png */; };
7870
B216A14E1AD9426500F2898C /* libcld2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2083D121A87D17D00150BBF /* libcld2.a */; };
7971
B21B7B491DD4DB9F002A4C62 /* editing_area.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B21B7B471DD4DB9F002A4C62 /* editing_area.cpp */; };
8072
B2284A53183BE3B300E097C7 /* PFMoveApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = B2284A51183BE3B300E097C7 /* PFMoveApplication.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc -Wno-deprecated-declarations"; }; };
@@ -180,8 +172,6 @@
180172
B2CAC13B2BBEE95900707D8D /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CAC13A2BBEE95900707D8D /* libicucore.tbd */; };
181173
B2CAC13C2BBEE96300707D8D /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CAC13A2BBEE95900707D8D /* libicucore.tbd */; };
182174
B2CE2FEF1A94EBF50020A620 /* crowdin_client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2CE2FED1A94EBF50020A620 /* crowdin_client.cpp */; };
183-
B2CE2FF21A94F19D0020A620 /* Prefs-Accounts.png in Resources */ = {isa = PBXBuildFile; fileRef = B2CE2FF01A94F19D0020A620 /* Prefs-Accounts.png */; };
184-
B2CE2FF31A94F19D0020A620 /* Prefs-Accounts@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2CE2FF11A94F19D0020A620 /* Prefs-Accounts@2x.png */; };
185175
B2CE6D211ACFCD95007E6863 /* GeneratePreviewForURL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2CE6D201ACFCD95007E6863 /* GeneratePreviewForURL.cpp */; };
186176
B2CE6D231ACFCD95007E6863 /* qlgenerator_main.c in Sources */ = {isa = PBXBuildFile; fileRef = B2CE6D221ACFCD95007E6863 /* qlgenerator_main.c */; };
187177
B2CE6D2B1AD00A0E007E6863 /* PoeditQuicklook.qlgenerator in Copy Quicklook plugin */ = {isa = PBXBuildFile; fileRef = B2CE6D1A1ACFCD95007E6863 /* PoeditQuicklook.qlgenerator */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -200,8 +190,6 @@
200190
B2E02A361CB812C500D18F5C /* unicode_helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2E02A341CB812C500D18F5C /* unicode_helpers.cpp */; };
201191
B2E11F121A2C66FB00E4E42C /* text_control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2E11F101A2C66FB00E4E42C /* text_control.cpp */; };
202192
B2E2184C199A76B100EA2784 /* syntaxhighlighter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2E2184A199A76B100EA2784 /* syntaxhighlighter.cpp */; };
203-
B2E3EE4E256D658500FCE1BF /* Prefs-Advanced.png in Resources */ = {isa = PBXBuildFile; fileRef = B2E3EE4C256D658500FCE1BF /* Prefs-Advanced.png */; };
204-
B2E3EE4F256D658500FCE1BF /* Prefs-Advanced@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2E3EE4D256D658500FCE1BF /* Prefs-Advanced@2x.png */; };
205193
B2E7F16E1E045343005FA992 /* SuggestionErrorTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2E7F16D1E045343005FA992 /* SuggestionErrorTemplate@2x.png */; };
206194
B2E836E91709ED2A00F31559 /* window-close.png in Resources */ = {isa = PBXBuildFile; fileRef = B2E836E01709ED2A00F31559 /* window-close.png */; };
207195
B2E836EB1709ED2A00F31559 /* poedit-status-cat-mid.png in Resources */ = {isa = PBXBuildFile; fileRef = B2E836E21709ED2A00F31559 /* poedit-status-cat-mid.png */; };
@@ -415,14 +403,6 @@
415403
B2148A2C1A76B95C004516FC /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/InfoPlist.strings; sourceTree = "<group>"; };
416404
B2148A2D1A76B96D004516FC /* sq */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sq; path = sq.lproj/InfoPlist.strings; sourceTree = "<group>"; };
417405
B2148A2E1A76B96E004516FC /* sq */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sq; path = sq.lproj/MoveApplication.strings; sourceTree = "<group>"; };
418-
B2166F4119AE4045000A6AA0 /* Prefs-Extractors.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Prefs-Extractors.png"; sourceTree = "<group>"; };
419-
B2166F4219AE4045000A6AA0 /* Prefs-Extractors@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Prefs-Extractors@2x.png"; sourceTree = "<group>"; };
420-
B2166F4319AE4045000A6AA0 /* Prefs-General.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Prefs-General.png"; sourceTree = "<group>"; };
421-
B2166F4419AE4045000A6AA0 /* Prefs-General@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Prefs-General@2x.png"; sourceTree = "<group>"; };
422-
B2166F4519AE4045000A6AA0 /* Prefs-TM.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Prefs-TM.png"; sourceTree = "<group>"; };
423-
B2166F4619AE4045000A6AA0 /* Prefs-TM@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Prefs-TM@2x.png"; sourceTree = "<group>"; };
424-
B2166F4719AE4045000A6AA0 /* Prefs-Updates.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Prefs-Updates.png"; sourceTree = "<group>"; };
425-
B2166F4819AE4045000A6AA0 /* Prefs-Updates@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Prefs-Updates@2x.png"; sourceTree = "<group>"; };
426406
B2178B1F1BD665EB0012F3E8 /* be */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = be; path = be.lproj/InfoPlist.strings; sourceTree = "<group>"; };
427407
B2178B201BD665EB0012F3E8 /* be */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = be; path = be.lproj/MoveApplication.strings; sourceTree = "<group>"; };
428408
B21B7B471DD4DB9F002A4C62 /* editing_area.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = editing_area.cpp; sourceTree = "<group>"; };
@@ -646,8 +626,6 @@
646626
B2CDAA1D1A61867600261248 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/InfoPlist.strings; sourceTree = "<group>"; };
647627
B2CE2FED1A94EBF50020A620 /* crowdin_client.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = crowdin_client.cpp; sourceTree = "<group>"; };
648628
B2CE2FEE1A94EBF50020A620 /* crowdin_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crowdin_client.h; sourceTree = "<group>"; };
649-
B2CE2FF01A94F19D0020A620 /* Prefs-Accounts.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Prefs-Accounts.png"; sourceTree = "<group>"; };
650-
B2CE2FF11A94F19D0020A620 /* Prefs-Accounts@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Prefs-Accounts@2x.png"; sourceTree = "<group>"; };
651629
B2CE6D1A1ACFCD95007E6863 /* PoeditQuicklook.qlgenerator */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PoeditQuicklook.qlgenerator; sourceTree = BUILT_PRODUCTS_DIR; };
652630
B2CE6D1D1ACFCD95007E6863 /* InfoLegacy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = InfoLegacy.plist; sourceTree = "<group>"; };
653631
B2CE6D201ACFCD95007E6863 /* GeneratePreviewForURL.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GeneratePreviewForURL.cpp; sourceTree = "<group>"; };
@@ -673,8 +651,6 @@
673651
B2E11F111A2C66FB00E4E42C /* text_control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text_control.h; sourceTree = "<group>"; };
674652
B2E2184A199A76B100EA2784 /* syntaxhighlighter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = syntaxhighlighter.cpp; sourceTree = "<group>"; };
675653
B2E2184B199A76B100EA2784 /* syntaxhighlighter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = syntaxhighlighter.h; sourceTree = "<group>"; };
676-
B2E3EE4C256D658500FCE1BF /* Prefs-Advanced.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Prefs-Advanced.png"; sourceTree = "<group>"; };
677-
B2E3EE4D256D658500FCE1BF /* Prefs-Advanced@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Prefs-Advanced@2x.png"; sourceTree = "<group>"; };
678654
B2E7F16D1E045343005FA992 /* SuggestionErrorTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SuggestionErrorTemplate@2x.png"; sourceTree = "<group>"; };
679655
B2E7F16F1E04534A005FA992 /* SuggestionTMTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SuggestionTMTemplate@2x.png"; sourceTree = "<group>"; };
680656
B2E836E01709ED2A00F31559 /* window-close.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "window-close.png"; sourceTree = "<group>"; };
@@ -828,26 +804,6 @@
828804
path = locales/macos;
829805
sourceTree = "<group>";
830806
};
831-
B2166F4019AE4024000A6AA0 /* Preferences */ = {
832-
isa = PBXGroup;
833-
children = (
834-
B2CE2FF01A94F19D0020A620 /* Prefs-Accounts.png */,
835-
B2CE2FF11A94F19D0020A620 /* Prefs-Accounts@2x.png */,
836-
B2166F4119AE4045000A6AA0 /* Prefs-Extractors.png */,
837-
B2166F4219AE4045000A6AA0 /* Prefs-Extractors@2x.png */,
838-
B2166F4319AE4045000A6AA0 /* Prefs-General.png */,
839-
B2166F4419AE4045000A6AA0 /* Prefs-General@2x.png */,
840-
B2166F4519AE4045000A6AA0 /* Prefs-TM.png */,
841-
B2166F4619AE4045000A6AA0 /* Prefs-TM@2x.png */,
842-
B2166F4719AE4045000A6AA0 /* Prefs-Updates.png */,
843-
B2166F4819AE4045000A6AA0 /* Prefs-Updates@2x.png */,
844-
B2E3EE4C256D658500FCE1BF /* Prefs-Advanced.png */,
845-
B2E3EE4D256D658500FCE1BF /* Prefs-Advanced@2x.png */,
846-
);
847-
name = Preferences;
848-
path = macos;
849-
sourceTree = "<group>";
850-
};
851807
B22083AA197A82CD009355BB /* LetsMove */ = {
852808
isa = PBXGroup;
853809
children = (
@@ -1184,7 +1140,6 @@
11841140
isa = PBXGroup;
11851141
children = (
11861142
B23149D22AC5CB4B00B42587 /* Assets.xcassets */,
1187-
B2166F4019AE4024000A6AA0 /* Preferences */,
11881143
B24ACD8316F6263900399242 /* Poedit.iconset */,
11891144
B2B5A3632A4B31870045FC33 /* AccountCrowdin.png */,
11901145
B2B5A3622A4B31870045FC33 /* AccountCrowdin@2x.png */,
@@ -1459,7 +1414,6 @@
14591414
B24D19691E84503B00C6DD8D /* StatusWarning.png in Resources */,
14601415
B267EAFE1E045959005541E7 /* StatusError@2x.png in Resources */,
14611416
B23149D32AC5CB4B00B42587 /* Assets.xcassets in Resources */,
1462-
B2CE2FF31A94F19D0020A620 /* Prefs-Accounts@2x.png in Resources */,
14631417
B2E836E91709ED2A00F31559 /* window-close.png in Resources */,
14641418
B2E7F16E1E045343005FA992 /* SuggestionErrorTemplate@2x.png in Resources */,
14651419
B2E836EB1709ED2A00F31559 /* poedit-status-cat-mid.png in Resources */,
@@ -1468,7 +1422,6 @@
14681422
B2E836EC1709ED2A00F31559 /* poedit-status-cat-no.png in Resources */,
14691423
B2E836ED1709ED2A00F31559 /* poedit-status-cat-ok.png in Resources */,
14701424
B209006019CAD64A00D6382E /* SuggestionErrorTemplate.png in Resources */,
1471-
B2E3EE4F256D658500FCE1BF /* Prefs-Advanced@2x.png in Resources */,
14721425
B20D90412A4C664D002B1BD2 /* AccountLocalazy.png in Resources */,
14731426
B267EAFD1E045959005541E7 /* StatusError.png in Resources */,
14741427
B26E2C8E25A245BD008D6DF1 /* CloseButtonHoverTemplate@2x.png in Resources */,
@@ -1485,8 +1438,6 @@
14851438
B20F31D0216654DA005B7037 /* StatusWarningBlack.png in Resources */,
14861439
B20F31CC216654D2005B7037 /* StatusErrorBlack@2x.png in Resources */,
14871440
B2B735F92A5865320037A0DA /* LocalazyLogo@2x.png in Resources */,
1488-
B2CE2FF21A94F19D0020A620 /* Prefs-Accounts.png in Resources */,
1489-
B2E3EE4E256D658500FCE1BF /* Prefs-Advanced.png in Resources */,
14901441
B2D52B861DE88A3D00E27B35 /* SuggestionPerfectMatch.png in Resources */,
14911442
B29AE89217103992008D1F8A /* manager.xrc in Resources */,
14921443
B29AE89317103992008D1F8A /* menus.xrc in Resources */,
@@ -1500,16 +1451,8 @@
15001451
B292667521664C9500DC536C /* ItemCommentTemplate@2x.png in Resources */,
15011452
B2B735F82A5865320037A0DA /* LocalazyLogo.png in Resources */,
15021453
B2B5A3652A4B31870045FC33 /* AccountCrowdin@2x.png in Resources */,
1503-
B2166F4B19AE4045000A6AA0 /* Prefs-General.png in Resources */,
15041454
B209005E19CAD64400D6382E /* SuggestionTMTemplate.png in Resources */,
1505-
B2166F4C19AE4045000A6AA0 /* Prefs-General@2x.png in Resources */,
15061455
B25DB35D1E3E5102006D7228 /* ExtractorsGNUgettext.png in Resources */,
1507-
B2166F4D19AE4045000A6AA0 /* Prefs-TM.png in Resources */,
1508-
B2166F4E19AE4045000A6AA0 /* Prefs-TM@2x.png in Resources */,
1509-
B2166F4919AE4045000A6AA0 /* Prefs-Extractors.png in Resources */,
1510-
B2166F4A19AE4045000A6AA0 /* Prefs-Extractors@2x.png in Resources */,
1511-
B2166F4F19AE4045000A6AA0 /* Prefs-Updates.png in Resources */,
1512-
B2166F5019AE4045000A6AA0 /* Prefs-Updates@2x.png in Resources */,
15131456
B20D903F2A4C664D002B1BD2 /* AccountLocalazy@2x.png in Resources */,
15141457
);
15151458
runOnlyForDeploymentPostprocessing = 0;
@@ -2380,7 +2323,7 @@
23802323
deps/cld2,
23812324
"$(inherited)",
23822325
);
2383-
MACOSX_DEPLOYMENT_TARGET = 10.14;
2326+
MACOSX_DEPLOYMENT_TARGET = 11.5;
23842327
ONLY_ACTIVE_ARCH = YES;
23852328
POEDIT_FEATURES = "";
23862329
POEDIT_VERSION = "";
@@ -2456,7 +2399,7 @@
24562399
"$(inherited)",
24572400
);
24582401
LLVM_LTO = YES_THIN;
2459-
MACOSX_DEPLOYMENT_TARGET = 10.14;
2402+
MACOSX_DEPLOYMENT_TARGET = 11.5;
24602403
POEDIT_FEATURES = "";
24612404
POEDIT_VERSION = "";
24622405
SDKROOT = macosx;

‎README.md‎

Lines changed: 1 addition & 1 deletion

‎artwork/README‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎artwork/macos/Assets.xcassets/FileMO-badge.iconset/icon_128x128.png‎

2.45 KB

‎artwork/macos/Assets.xcassets/FileMO-badge.iconset/icon_128x128@2x.png‎

5.36 KB

‎artwork/macos/Assets.xcassets/FileMO-badge.iconset/icon_16x16.png‎

293 Bytes

‎artwork/macos/Assets.xcassets/FileMO-badge.iconset/icon_16x16@2x.png‎

577 Bytes

‎artwork/macos/Assets.xcassets/FileMO-badge.iconset/icon_256x256.png‎

5.36 KB

‎artwork/macos/Assets.xcassets/FileMO-badge.iconset/icon_256x256@2x.png‎

11.9 KB

‎artwork/macos/Assets.xcassets/FileMO-badge.iconset/icon_32x32.png‎

577 Bytes

0 commit comments

Comments
 (0)