Skip to content

Commit

Permalink
Merge pull request #12168 from keymanapp/chore/developer/12161-update…
Browse files Browse the repository at this point in the history
…-sil-logo

chore(developer): update SIL logo
  • Loading branch information
mcdurdin authored Aug 14, 2024
2 parents 608011f + b505beb commit 02e500f
Show file tree
Hide file tree
Showing 6 changed files with 94 additions and 45 deletions.
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# License

Copyright (c) 2017-2022 SIL International. All rights reserved.
Copyright (c) 2017-2024 SIL Global. All rights reserved.

Licensed under the MIT License.

Expand All @@ -10,7 +10,7 @@ Licensed under the MIT License.

The MIT License

Copyright (c) 2017-2022 SIL International
Copyright (c) 2017-2024 SIL Global

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# License

Copyright (c) SIL International.
Copyright (c) SIL Global.

Keyman is an open source project distributed under the [MIT license](LICENSE.md).

Expand Down
126 changes: 87 additions & 39 deletions developer/src/tike/dialogs/UfrmAboutTike.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -504,12 +504,12 @@ inherited frmAboutTike: TfrmAboutTike
6082}
end
object lblCopyright: TLabel
Left = 125
Top = 347
Left = 156
Top = 304
Width = 200
Height = 11
Anchors = [akLeft, akBottom]
Caption = 'Copyright SIL International. All Rights Reserved'
Caption = 'Copyright SIL Global. All Rights Reserved'
Font.Charset = ANSI_CHARSET
Font.Color = clBlack
Font.Height = -9
Expand Down Expand Up @@ -544,50 +544,98 @@ inherited frmAboutTike: TfrmAboutTike
ExplicitWidth = 634
end
object Image1: TImage
Left = 55
Left = 39
Top = 256
Width = 52
Height = 58
Width = 107
Height = 64
AutoSize = True
Picture.Data = {
0954506E67496D61676589504E470D0A1A0A0000000D49484452000000340000
003A08020000007010EDCC000000097048597300000B1100000B11017F645F91
0000001674455874536F667477617265007061696E742E6E657420342E314CEF
C5FF000003664944415478DA6364889DC9305801E3A8E3461D37EAB851C78D3A
6ED471A38E1B75DCA000A38E1B75DCA8E348751C2323839182A8BD86A48A181F
2323E3C3379F2F3E7A7BEEC19B979FBE232B6366022A6484B0FF31FCFFF7EF3F
5C8A152C0707BFFF20C951E2384B55F149315646F2A2C8A683ACFFFFBF76ED99
F6CDE7215C0E56E6CB6DA10AA2BC10EEB26377E267ED872B3E54ED67A52A0EE7
8AE72C7EFBE507A58EF337525891E5CCCECA8C55367DFEE1D907AEC31D77B53D
4C11E6B8A5C76EC7CE4438EE488D3FB2E344B31751EA38097ECEEB9DE1FC9C6C
B81418D5ADBDF0F0EDC038AE23CCACCCDB0059E4EBCFDFB75F7CFAF3EF9FB420
B700179B40C682DF7FFF0D80E38049F86C53908E8C105CE4D8ED97811377BEFD
F213226BA8207CF2CE2B78BAA6ABE37838586F76854BF273C1451CDB371FBCF1
1C974174775C67B8A400C2712E9D5BF75D7B3A281C072C980ED7F85928234CDC
7BEDA9FF849DDF7EFE1978C7014182ADDABC14076491D3F75F27CC3A70FDD9FB
81771C30D5EFAFF44536140880213761D7E5E60DE77EFEF93B908E030259219E
DDE5DE6A12FC68E2C0200C99B4EBF1BBAF03E9382010E1E5589CEEE8AA23C384
5A7FDD7CFEC1AA69E3FB6F3F07D2710CE0CC116DA53A39D69A978315597CC1E1
5BC9730EFC1F58C7410030723716B8AB4B0AC045BEFCF8AD5CB2FCF5E71F03EF
38205095E0BFDC1ACAC6C20417899CB677E5C9BB83C271C0F83DD51064282F0C
17A9597BBA6DD3F941E1381626C68BADA19A5288982D5E7EA27FC7255A398E2D
710E234E4906B814331313B00595EEA459E2A98FACC4AE75D3915B2F48759C6C
C1D2775F7FFEFF8FAF390C94637CFFE527FE9085D340EBD958505A9D0FDF7ED1
AA58F5FDD71F521DF7F9FBEF7F0C841BEA8CFF886ACD6307590B8FCCD8770DC2
26C9714402321DF7F7DFFF093B2F97AD38415E7B8E568E0356A9579FBC6F587F
66EBC547C86986268E2B5A761C1EFBFF71A4038823FEFCFDF7E4FDD7F30FDF3C
7DF715B36BC7C2CC54EAA527C4CD0EE19E7BF076F9893B70D96C176D05111E92
1D37E43BD5A38E1B75DCA8E306011875DC30701CB0FF1466AE2C2BC4FDF0CD97
35A7EEFD1F548E9311E276D39171D395D97BF5E9B2E377BEFEFC33881CC7C3C1
5AE8AEFBE0CD676531BEB6CDE77FFDF937881C0704DCECAC5A5202D79E7DF8FA
F33703385A670DB4937002000B26443581ED65730000000049454E44AE426082}
0954506E67496D61676589504E470D0A1A0A0000000D494844520000006B0000
004008060000001DD489F9000000017352474200AECE1CE90000000467414D41
0000B18F0BFC6105000000097048597300002E2200002E2201AAE2DD92000009
584944415478DAED9C7D6C55E51DC77FF7BDEFF6B65494F262CB4A41A0142302
CA26533A20CE85B0CD04D1A0C365739B714BD438CDD8CCD8B24463BA65CB92C5
B89704131707D9FE603AC44DDBA1825005456094BE496BDFDBDBDEB6F7F5ECF9
5E7AEF3DE7DCE79C7BCE6DE1DE933EDFA494F39C7BCE7D389FE7F77B7EBFDFF3
1C6C246419D9B2DD0121E312B02C2401CB4212B02C2401CB42D2845572A0CDCB
7EDD96ED0EF254E6B1D38A52774ADF4702D1F677EFA93C173FAE79F86F2BA212
2DC9767FCDC861B39DB8F0C79D83BC737AB0EE60BF9AB3DD799E567BDD749DDB
AE689B8C48746628D838B0EBA61FC5DBAAF7BCD62849F478B6FB6B4676BBADA1
F54F5F7F9377CE72B02A0B9C5455EC54B431EBA1D343411A0F471B7DBBAB04AC
5C509EC346B7947BC8AEEA75DB58982E4F84F157012B57B4B2D44D5E8FD2FDF9
4251B83F92AE1C0A58B920041537335872C1FDB50C0568322CC59B04AC6C0B9D
5CCBDC5F8153D9DD2E7F983AC6C3F226012BDB9A9FEFA09A1297A22DC0A2BF93
83819875C924606553E8E02DF33C94EF5076F5C26888FAA622EA8F0B58D9D4BC
3C072DBF4E6955136C8E6A615625A57E5CC0E20903BDDCE3A012969C62D4E338
C49EDE68304A3D2C8C8E48342BAA2B7353894B19019E6756D59F6A559080A5B8
19BB6251A19316B0E4D4A17135E6934F4682310B9889105020AF52DFFB8301AE
554102565C456C84D7329794EF485FFFC54385AB9A092F542A50B190AB9D457F
9FF9C35A97085810E68E652C22B39BA8D3E3A1B68F878D5FA0D23A1658786403
03DC4FF4072818D51C0102D6F50C540DB328AD0F4B1A370AB1877ABC5FD365E9
AA9859F19A3265123C1C88C6DCAB8EE636AC521640ACF4BAB91F1C61C10492D2
B1503466012807A913D78F8682B1F366B5A4C8199B1BE5FA9F2F44BD9311BDCB
E62EAC3C87ADB99E8D6E27C7F7753217D7A9727115CC026B5561F645F6803FD7
7FC05CE17B8B5451E0FBCC4A43515D3B9D9BB0BCAFB4DDC12CAA591D3643B0A6
2ECE24CF735D3CA8E904E35C7F7D9EA273FE7094052CC17497CE4D585B8FF46C
629EAD49DD8EAA01AA073C016C9D0A5626418677DAF5CAD53D11A14B63A17497
660CCB6EB3D19A6A2FDDBCA4940AF39C34E80BD0B9AED1D84F243A4B49A3917E
64026BFB9B3D9BD849052CACC67EC8C271AD8417F3DB2AD543E6145BD30A7315
E62CB9741261B932827567DD7CDAB7BB9EAA6E284A3937EA0FD237F6FF875ABB
C7126DAF3E73272D5D509C38BEFD878729184ECECBEFFDFA1ECA733B12C7F7EE
3B4A5DFD7E43FFF6598375663818AB506889571AD272997AC23D702FB94EB141
6220C9360DEB6B1B17D18BDF5917B32C9ED8F554FFE83F686C3269D5FFFC4503
D52E2C49F677EF2105AC4F5FDA411E57B2FF5F7EEA0DEAE81D37F46F9F15587A
EE2F2E5435AA554BEEADCC75F54C980B30B01C52E854E657C77AA78CA400A660
95157BE8ED17B6C5DC9E963AFBFCB4F9C9D7156D390D0B2E1BCB11813405BFEA
621703A6B488730CF0407AF7A5D046165CC88B2470BF270702462E3505EBA186
2FD0BE07D628DACEB40DD36B4D1DE46396B4F4C6622AF03868FF2BA7159FC969
58062777EEB2BBD93C0B69C2860A653D10AE172ED8804CC17AE1DBB7D2CE4DC9
9D6A7D2353B4F989D7692AA43FB87216166C0985D3745605DD3ACF13DBD422D7
71FDF2508A78C55B0416E747D30F163209EB773FD840DBD755268E4F5F1AA61D
CFBD95F64B721696D10785BC79A32A3702A3637D53863A19172FFCC79CD76AC0
B2C924AC27BFB98A1EFD6A6DE2381C89D28E9FFD9BCE768EE87E49CEC2C27E3C
9F0137C6B308446F88E2CC88976399C8D54CC15AC61EF8E1FD5B1491A06F2244
3FFD4B0BFDFDDD2ECD2FC949585311A9C9E0C4CE0DDB8702513A3B6268AE49A8
FCCAD668451B2A209DC6C27FD3A1FBB3F7D7D1DEAD3529EDCD1FF7D2D32F9FA2
EEC18994733909AB6B3CDC64F021D16296C82E5625B2D878890D986684D5E715
A519E76AA6613998FF7E9E051A3B6E5F9C726E682C407B9E6FA64F3A946E3127
61B50C069A8CAEF6A2805BA14A643329E25E6B58F187F0C0DD4BE9A9FB56A5E4
5C8810B73F7B8486C7931E22E7602D3FD4B98985EC4D6450BC2AF9C72CDC1E09
9A5B1EE16DE63451B29A512177514521FDF6FBEB69759557D1FE87C317E857AF
9E491CE71C2CB3BB9BD4892C84907FCAE4CE19BC1DB25A15609870A733AEBA17
E5BB188C2D54595E9068FBACDF4F5F7A2259C5B0342C17F3FBEB5589AC891291
F26139ED545FAE8405570A976A40B3B244F2CCAE3A7A645B32E8407D70D9B70E
26AAEF9686853ADE5A55D81E9C5ED2372A9402115162CE525741609C58CF4225
0335CAC9F0D5DD83F1F33D6B69F75DD589E310FBEEE58F1C8A41832C0D8BE7BA
0C2E16C6AC7261A1836EC8D7DEDAA61612F54BCC2D72568D15B0B6FEF85F8DEC
135C58BCAF2A2A70D11757CDA7EFDD5B4B2E4772C09C6E1B66C972B2B26116D6
DE17FF9B920248893F946D2CE56B78E3975FB97AB0784101126924D45A42C563
6181932A0B8D43920B967B76388417E8E4CD0A5892243512CD7CA5F8277F6EA1
036F5D4A1C9B8565525B6C36DB51DE895981C50BB7F560012E2AF47999509209
968542B12C88997558C7CEF6C5722DF96AB1A561618E59A9B22CDE9C85CDA155
0C5299C7AE7B3F148D3D2A9028398109AE2D96A508AAED69B3060B70FEFA4E3B
ED3FF0114D0695B9A2A561F1EA82D0C5E9AD63F9EC3C1626F1EA8E9E2D217800
1424E2D8782387D2C7EE73613A2254BF577C22B92AA08075B0B9C3102C494A5A
CD4480459EDD3E3AFA610F5D1E98E07EFEB907EBA9725E32B4FFEE6FDE8B1581
E3FAFD631BC8E5D41F903A6AB87BED82AB3767E1261B3879965161DE69F58515
EB5EBCEABBBC228254C135BD454E967CCFCDDD4D669362BCEC06CB31230C68D4
1E614DBC60FCA622278B1495E59F4136F23147C152E39D97AD0C085846A4F526
BD96FCCCD5614F873FAC5D8EC2AD96716A8E7261DE7FBF7F2ABEE34AC0322A24
B5B5CCC26C3AC010C1A1D6870545A3D50D6C4D43559F775FD5265201CB8C50CD
C05289D7ED485819463FDC149259FC64B26712967B63FE9597F7B04F03D01174
A8AAFA025626C28DE37BE443D76E47AB80652109581692806521590ED6AECD55
545AE4A6931707E9F8B901012BDB9DD292D361A7BDDB6A28128952479F9F8E9C
EA16B0B2DD293D6D5C51117BE3A4EDF3716AEF1D17B0B2DD2933CA1416CACAF5
D9EEBC495D66B05AE307350F1FAC952469F14C6E78ADE5B0DB4E9E7F79E710EF
9CF80F8D2D2401CB4212B02C2401CB4212B02C2401CB42FA3FF896A69B0C9D8C
0A0000000049454E44AE426082}
end
object Label1: TLabel
Left = 125
Left = 156
Top = 284
Width = 184
Height = 18
Caption = 'Created by SIL International'
Caption = 'Created by SIL Global'
Color = clWhite
Font.Charset = ANSI_CHARSET
Font.Color = clBlack
Expand Down
4 changes: 2 additions & 2 deletions developer/src/tike/xml/project/globalwelcome.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<p id='header-version'>Version <xsl:value-of select="/Data/Version" /></p>
<div id='header-sil'>
<img src='res/sil.png' />
<div>Created by SIL International
<div id='header-copyright'>Copyright &#169; SIL International. All Rights Reserved.</div>
<div>Created by SIL Global
<div id='header-copyright'>Copyright &#169; SIL Global. All Rights Reserved.</div>
</div>
</div>

Expand Down
3 changes: 2 additions & 1 deletion developer/src/tike/xml/project/project.css
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,8 @@ k\:menuitem.down {

#header-sil img {
vertical-align: top;
margin-left: 4px;
margin-left: -6px;
margin-top: 7px;
}

#header-sil > div {
Expand Down
Binary file modified developer/src/tike/xml/project/sil.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 02e500f

Please sign in to comment.