From 240a4ae095cdee6e8d54398d7ec09c262f6000df Mon Sep 17 00:00:00 2001 From: Pale Moon Date: Mon, 8 Dec 2014 00:06:29 +0100 Subject: [PATCH] Update branding information: correct typoes, add trademark information, remove leftover erroneous Firefox branding. --- LICENSE | 2 +- browser/LICENSE | 2 +- browser/branding/official/appname.bmp | Bin 12164 -> 35690 bytes .../official/content/about-wordmark.png | Bin 994 -> 2197 bytes .../official/content/about-wordmark.svg | 152 +++++++++++++++--- .../branding/official/locales/en-US/brand.dtd | 2 +- 6 files changed, 133 insertions(+), 25 deletions(-) diff --git a/LICENSE b/LICENSE index dcfc1cf08..39855d549 100644 --- a/LICENSE +++ b/LICENSE @@ -6,7 +6,7 @@ For more information about source code licensing, see: http://www.mozilla.org/foundation/licensing.html You are not granted rights or licenses to the intellectual property or trademarks -of the Mozilla Foundation, Moonchild productions, or any other party, including +of the Mozilla Foundation, Moonchild Productions, or any other party, including without limitation the Pale Moon name or logo. Binary versions of Pale Moon are subject to the Pale Moon redistribution license. diff --git a/browser/LICENSE b/browser/LICENSE index 9abed4bd1..e3b716096 100644 --- a/browser/LICENSE +++ b/browser/LICENSE @@ -3,5 +3,5 @@ licensing conditions attached to this codebase, including copies of the licenses concerned. You are not granted rights or licenses to the trademarks of the -Mozilla Foundation, Moonchild productions or any party, including without +Mozilla Foundation, Moonchild Productions or any party, including without limitation the Pale Moon name or logo. diff --git a/browser/branding/official/appname.bmp b/browser/branding/official/appname.bmp index 1c2f44cf3776a5f7c9748effcf0acc9e2ba6ae1f..e029b1fc223645d1e4bfe06d21780dfd58d0ab2f 100644 GIT binary patch literal 35690 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 literal 12164 zcmeHNJ*)IY6rN-EiT;o0q+r%$%?1oHJ);lK1%+-hWp4>s|Zz8TJV(#M~Deqw+B*?(Vs`GxxSo3GW&FTJSVeB*WX+N-aqAHM%i{rk_~>hsS& zRX_jqqx$R5Kh*EP{i5D^`z`g!#~-N=KX^~w-rlO4n;R$k>2=8i$9ib|b=KV_x@-(= z`p{-W>mLnWGc20M$ufElIg@eKdm484@k~sPtfL{>8TeDSQzSSLgE6N}j~E(w2=v^Q zwC;lCu!A&eG;H`RmTtn<*coN7Gf6S#kQmi6$4-P1o?~s2UPNW@WAy0^7U6usWIPzK7$emknNVcdc35Vi zSTMmkFpRw7yJw)70A^sTkL=;>hYB>@+XGu@vV*2yM zmx*VIL7QQq$8}hQO+L{hckN6i-<7Z+!$zV~94T)p^c#=O3g(_P!?wc0@?n#QV{03H zSHQxPIOd^aLS#lCDbBJWiQNV-c~$n$HgQ3!z;cq$VJcvO+2nJ_#m0KxBV><$`XiL= zCDOGC7UYGri8Ro?fCZT^!XlQ)u-fxfJX=waV)6{zC@v^sNx3Hw@eV66_jzI`naLZJ zu*`CCvz+{p@OT}Y#06fFf2<=o}U_tCi zw~)`xDHd2JV(jQ4k9@;fMl4COARRPls3W^W?u8sfX}uek7P{xKz$o}3vXm7;UWS1l z*I+?TKv>!cnqd!l1s&PxgyRA%ynuSiVWlAxafep)q>Tr`Lg=Du=wvM7C}S-yX4p3K zcNgI$$77&A|qoCP$^1`Mtkir_0#Cvoh%W20}m?uU$_aPy*l}yX-kPbVE zp9n#rc#}kHTTlVx=dhq=2w9F5{cd9%t~B(i9-?92kd5IE>1(jSXs)47KDIW&4WJ^g zl>G1Q!d4Zz2i|BU%mWVBNFm?}#IsoBt3GYnGkA)H z(L$XAGnp>nG#zjz9Kl)l&oN_oX7WB(1PjiLSr3blV?3kek^wqOB$nQYmjOakgmPyr ztjU-L@(NXy4``7JoQy?L%7`U{Uw~3YMg}`@n7=eiKTqa zKD1{P2eE5mVF#PrS`QKD5*F1}L*sOjUB~)tAHzHNE^5N6S+g2*f<+E?)4(eCr72vr zKD8AF?Kfk|XIZ<-0YZdrPfz@f4NN;U;nR&+Uo6f1b?h|hbwqtd`g(n88ZCU*c9mPG zDuT{3OX~}dww+(!>M5V6>EgU&hC*vGE(MK{@ z_1=v1UsUcQIj4QVxS-CV;fjd zmQNe5)boBpp6{207RT|4BCNATn(I2J5YXe+L*5VZ-tN8%5#q4nZ0oB-omm3Qrwyk{ z>`AWHjIEs+2d&*sXl9YmOkDjqg@7J+xZM(q*uO^|y!Tyg?u0_*pe=6HG!xjG%`C20$0ssH>BsS;( diff --git a/browser/branding/official/content/about-wordmark.png b/browser/branding/official/content/about-wordmark.png index 7c5962786e2a8cff70fbef09ac378e38cc5405db..5d51e1d4dcc6e3d39b31b3d9cc829126bdb5fff7 100644 GIT binary patch literal 2197 zcmV;G2x|9WdH}>34H=v0$ zQXmNn5j2Yh6i|Q!mclJ)gak0IB)SD_0f|UZ5?B)gK@zdS_*1Y;AqARH;8qqoA9u$0 z-FY+j&Aj{Wdrz4!IoY}Q&YhWa=9`%_XYSht0|N&nA)(u_u+t4lNN^z$GodSyh?&rp zNW@I&N+emkU6d5)R z)RobpLv0axl_r@krh5rvP)V| zP$+Q7y7y2k&`FFc*-F>nD)}zr{nJVY==y0PrXiwD%zh=;lx$Lhlb$IhtMI(+QVxb+ zRPt6El#7|otHKKF`bfmPt0hlLU^wFa|0BSk50#uz@~4tnC5!QZiTRFX)9tTxZ%W^@ zWn9T4%6Cr5U<(_JnPh>IZ#r$c2H2ovd0^fc5xb$3rijMjs?62@^0vK22^HllL!5uj;fyZN^!t?Gx~Kv-KS0T#Lk_h(cYsW?jQ)nz8O-iHCE$ znC@Xmi{<}*ixme!Kos^zF+wpCAGWwIl!=W{kCHL*Z)8lH3?`NA*6GC(4%pBp^0Z_V zL@VqR(kFwGAA~ajECE)Cz7YYGbfYWm1Y4<9Lq91tKE{B`jhAm*QA~olKv=-*ZJ9K9+ps2K$j` zb^2&QJCP5wWAGp;#}sZb?|A1+LAouDht6$ah5=yFCA*EHT$v z*Jf%Tq(-9iUXW~;Z3OW^RBdvV!SEYlGrLtQrh*!H3yAh z2YXgqQlQs$$@{b>Lej782^-$Abn}sOP?u-=1hya7i2%K>IAmv_DtyV&=0Rke((gxyPF{<8j5pH9)SSw(9tk6 zYpwN^!;W+8iIXw-Zo1wkeqR;jGz99C=3=fK3^yS))W-viW0fH3kWN3Md>jJnchrNn zafAbU6`d|Yx6__B06c4>9j}UiZvcJZ3vw(wBn*hbG3|Nw1*Mk+l=TFShzY;JK779` znUl<<#Au1#9nM7Nx554ymY_yQgFMQsTFyD(&a)**X$H+a-FNxmqm;&M6SAW{EVY5x zW9i4`p&cQSkZqPuMZO_yf1=}UE<(3~(2R}3 zMIhdsb?>ocqo7fI3WP*xqS4O$zk>CYp0%DKT*ILwo)tk_o~7)SWx4ogv6xlmsx)?q zV#>Q2P#$nMqRe14A|^(9GqJx@lK21MvtU*QnYq)h#S~fq81Z04{(BL5LjYo7^M_^6 ze3)Qhx6Af}SBRgOF*AEe-d+ih8HX;rbCI?RLfHVj3z+tql<+@YOMU3a51}aQv&LZF zaSwi;eJl&ImO0(Rk{o(!65=jKIug1xJ6HPLN6 zPifc3CGgAcSoaQl%HnvTJ=1+j=^cS>gYHZuwmFCKM#GBB#T&7yYUiMTf~tR7QM6MZ z3ogYC7>heNBt98@^58&EKpqYqfuz1j!5pRS(;wbUz%4i$P%j78VH37HlN5gN>IP+* z<6VQ$4OmN2H8Hn{n+!1aP-Iyy?4mT5(evUbA36lF*JeURp@c>N+Qe^HHmMVq{&BiS z$Zn4(Z?D#wZE1h8gEsL@ep&qFTrTw|MEj%zsDhXr8tIc78DK;NslS%Y*if230sBR= zkdhB$Qvc&6_+NZdfl~;a2OrmUqCO0Q?;%3fMQh%P`%ojb3#}2(XB!dkn zlj$SLeyDX+>$FMh__NebUI0u4u336S@^Q{v+9vyTc_yScC;1a6oTRn-tE?MR+|N%? z#pVYi9w!lI0|Z4cdW^+i9}P&c!wrMNm%M7-#|*(y0F<{^iwiNo(E(m`w5x1q!ACV4 zC8HMx3ln}s+tCmYdL5Gb-$EJqHkqcqIBvW`x(tbb)iR_kI{;m_3OePhYAJtLvcUTT z$1}_X_y_?6*(>=E0&Gls%5c@UM(Q^oj47RGvy>y&c!_rnCIj>`$Acky^-J*~2Y?9! zpQw!%)NMZQcurbFO3~%qjD2ZA8~zO;mWqDKzC)aCp~603<{6aQIrN-#U{_fI;Qy_V znl0x`>SaFq#pVk$I0i!1eG`m!5Hlem8tFfABy=SbF%!BHiI@ppiA2nVu0$ecLRaD+ XYHzS2H2)dV00000NkvXXu0mjfT2TP? literal 994 zcmeAS@N?(olHy`uVBq!ia0vp^3xHUSgBeJc{7AS3q&xzALR{67Q0n$!zdF?XvQM zeKk%Fo9k`6MfNaC1g?uTn*Aub;ZMdt?t&$9`Zj!O4zgi*!RRM@G_|)k`-$ z-Eq^Z;ezhY8x=y+7;e1T{9(%WZOLbX3QB&4E!F&TSndClXWdVe=Cs}2aqh^PLNz{4 zt+Yzt_BU>i`#*^;==61duB4vz%Z}+1(*uq^#-~F3cXj%gJY$piy7gx-KcjQj$zoqk z2dPP-Czh(3KTXM;Rej*)B!@7Qv@@OBM~jbe&J~!g=+xQx$+1IJUWZLmx$10R;*y8f z2UHiPI%Mc_@7ywVa_Z8TvXxU7Hi#;n_FPnOQIy|Iz~ z&FL1`JtvtD2o^9*vtUq@Jat{H{Lyj7*D~Gbjum$PecBmvl)*1)>$S>t8Yyr4B_iK5 zv7J)b#_Y4LDzJ-Hbw?%t4$}wMaz6V#u}qiw#@>*#p5?^r?|+3R=*!52_#V0Q%In=? zn|JjbFEkrAdS97yDbM)w$F|2hr*2;=zVtgQ+^AV|{^afdI2WuH+1#adOd-otaF>|w z{C^kE-3b+nc(=`#(QiTa+5_yb4JTi8G|^LR+vshh$<&BT6 zV@)0wF-*D47a(u1^}JNVVS2vj#o9`*=~8>0ZNjp)_3sZ~J^$VxgEimx>gZ(7I$%~6 k?kV-ry!6$TmBIClOub=S?%#V>1I%Cyp00i_>zopr04W%~V*mgE diff --git a/browser/branding/official/content/about-wordmark.svg b/browser/branding/official/content/about-wordmark.svg index 042b8eaa0..e0dcc255f 100644 --- a/browser/branding/official/content/about-wordmark.svg +++ b/browser/branding/official/content/about-wordmark.svg @@ -1,24 +1,132 @@ - - + + - - - - + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/browser/branding/official/locales/en-US/brand.dtd b/browser/branding/official/locales/en-US/brand.dtd index 2a548961f..8bb55b52a 100644 --- a/browser/branding/official/locales/en-US/brand.dtd +++ b/browser/branding/official/locales/en-US/brand.dtd @@ -1,4 +1,4 @@ - +