Return-Path: X-Original-To: apmail-incubator-ooo-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B640FD306 for ; Wed, 25 Jul 2012 22:07:02 +0000 (UTC) Received: (qmail 79604 invoked by uid 500); 25 Jul 2012 22:07:02 -0000 Delivered-To: apmail-incubator-ooo-dev-archive@incubator.apache.org Received: (qmail 79543 invoked by uid 500); 25 Jul 2012 22:07:02 -0000 Mailing-List: contact ooo-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-dev@incubator.apache.org Received: (qmail 79525 invoked by uid 99); 25 Jul 2012 22:07:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jul 2012 22:07:02 +0000 X-ASF-Spam-Status: No, hits=0.0 required=5.0 tests=FSL_FREEMAIL_1,FSL_FREEMAIL_2,RCVD_IN_DNSWL_NONE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [98.138.229.176] (HELO nm40-vm0.bullet.mail.ne1.yahoo.com) (98.138.229.176) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 25 Jul 2012 22:06:53 +0000 Received: from [98.138.90.56] by nm40.bullet.mail.ne1.yahoo.com with NNFMP; 25 Jul 2012 22:06:31 -0000 Received: from [98.138.87.5] by tm9.bullet.mail.ne1.yahoo.com with NNFMP; 25 Jul 2012 22:06:31 -0000 Received: from [127.0.0.1] by omp1005.mail.ne1.yahoo.com with NNFMP; 25 Jul 2012 22:06:31 -0000 X-Yahoo-Newman-Property: ymail-3 X-Yahoo-Newman-Id: 777504.57077.bm@omp1005.mail.ne1.yahoo.com Received: (qmail 76993 invoked by uid 60001); 25 Jul 2012 22:06:31 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1343253991; bh=TaLs1KlYekFz3RzuduxfsXZWgJa50+lHrLRCzChhOLU=; h=X-YMail-OSG:Received:X-Mailer:References:Message-ID:Date:From:Reply-To:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=W5lWudzsCZcXMReWWeaYIWHCnRlvs7GeyKinHFuI31G5mquTq6hqWcqKJZkrghJ/jAOA/xof6AWGZ4x7EdBqWqcaax42dlBbkxoNdtZkGDWyzuwOsMvaN0iSS04ATJvs+ott9xHuTwOMLu7mWx+74hznpqcMF2x/ZzIT7UvgdAc= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=X-YMail-OSG:Received:X-Mailer:References:Message-ID:Date:From:Reply-To:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=4PKCSqLkSWVxLFb8Yvn7/xzaf3ryy6838uyacekbl4R/XpwoLRg+jHJS3M8CNo5dxl8pF8+Z4xfwkDR72tTprfJEhAUTc2DzLPMJS8SQG8cRPHNGZeEe2L7e5CBA9ko2iH+bIqSpdLZbEOGPbjpcYjgCronRKRyLohhcZ3Un50c=; X-YMail-OSG: I4udiaUVM1lAg6x3LCoPU.miQf8fSce0b71Q_jxBt3OE_PD gJlXSLXSZ5ST8z9DjsUdwOwvOROFzy2Z5SfDgm21YbzDGlZfF1ArbhJDkFJV vS6jD94m1QP.Rb4y84I1BLCCElq0L46LinBCSkCoVS4UbP9E4bq2rcnnJNI3 WUHi7pxPJp2gU1DVmJ1fD.qkHk6wpVtnFkY2al_KJOcUgLUXIVD7yhQuS6Fy T.jAaekfA58UGXTwozQEM6KM78bMuqyGK20rJDHqDIvG7XBntvtf..IGyicU l4FA8w_l5vcbatkpf0lcuQl4qpDv0Yj9n5V35Sc8gc_jPZHB7LrKpvDWsgII jmWFQzOEmamKRNMQOtgr.AQsV7q73kXbltRWdl2zk8RJAVLPmjfYw2g8F0lT C0brzK3M1qOh7wnwUuMn0vz6QH2kINo6jbjJu2tNpJWCaKCLaRMeLM4JWNfg 6VMAdnS0_6PQ57rXkPh_Sj7dvjVAB3ZwuiKDzfi.AJmonF3u.GVUYq43yYEb zjF9Z4j7XRSW.g6Xfh0L8R_yn6ZYnuxr6QQGThjY5lmYskg0BeoU.u1dC2zn ao.KBTKmKeua5.usFwc5DquaVTdExN4lHSMZ6D6vJNTG0hDKq4kJ8yei4k1B HmYr4y2lGS_2kQl8- Received: from [99.135.28.65] by web124705.mail.ne1.yahoo.com via HTTP; Wed, 25 Jul 2012 15:06:31 PDT X-Mailer: YahooMailWebService/0.8.120.356233 References: <20120725210116.4A0B440D17C@cms.zones.apache.org> <64876C3F-C0D9-48A4-9FE1-8DE5E2F0987C@comcast.net> Message-ID: <1343253991.70044.YahooMailNeo@web124705.mail.ne1.yahoo.com> Date: Wed, 25 Jul 2012 15:06:31 -0700 (PDT) From: Joe Schaefer Reply-To: Joe Schaefer Subject: Re: CMS diff: index.mdtext To: "ooo-dev@incubator.apache.org" In-Reply-To: <64876C3F-C0D9-48A4-9FE1-8DE5E2F0987C@comcast.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable FWIW I'm watching you try to commit the index.html changes...=0Ayou have to= actually resolve the conflicts or tell Michal=0Ato update the anon tree an= d resolve them for you.=C2=A0 Either=0Away just clicking on the clone link = won't get you past that.=0A=0A=0A=0A----- Original Message -----=0A> From: = Dave Fisher =0A> To: ooo-dev@incubator.apache.org=0A= > Cc: =0A> Sent: Wednesday, July 25, 2012 5:57 PM=0A> Subject: Re: CMS diff= : index.mdtext=0A> =0A> Ooops.=0A> =0A> This is product/index. Sorry.=0A> = =0A> Regards,=0A> Dave=0A> =0A> On Jul 25, 2012, at 2:50 PM, Dave Fisher wr= ote:=0A> =0A>> Michal,=0A>> =0A>> Please choose to use either index.mdtex= t or index.html. You've created =0A> the mdtext version here, but then you'= ve subsequently updated the =0A> index.html. If you'd like to experiment wi= th a markdown version of =0A> index.html then please create it first as tes= t.mdtext.=0A>> =0A>> I know that there are ways to get class and id into M= arkdown. Someone will =0A> need to research the question.=0A>> =0A>> Regar= ds,=0A>> Dave=0A>> =0A>> On Jul 25, 2012, at 2:01 PM, Michal Hri=C5=88 wr= ote:=0A>> =0A>>> Clone URL (Committers only):=0A>>> =0A> https://cms.apach= e.org/redirect?new=3Danonymous;action=3Ddiff;uri=3Dhttp://ooo-site.apache.o= rg/sk%2Fproduct%2Findex.mdtext=0A>>> =0A>>> Michal Hri=C5=88=0A>>> =0A>>> = Index: trunk/content/sk/product/index.mdtext=0A>>> =3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>>> --- trunk/content/sk/product/index.md= text=C2=A0=C2=A0=C2=A0 (revision 0)=0A>>> +++ trunk/content/sk/product/ind= ex.mdtext=C2=A0=C2=A0=C2=A0 (working copy)=0A>>> @@ -0,0 +1,106 @@=0A>>> = +Title: index.mdtext=0A>>> +Notice:=C2=A0 =C2=A0 Licensed to the Apache So= ftware Foundation (ASF) under one=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 or more contributor license agreements.=C2=A0 See the NOTICE =0A> file= =0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 distributed with this work for= additional information=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 regardi= ng copyright ownership.=C2=A0 The ASF licenses this file=0A>>> +=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 to you under the Apache License, Version 2.0 (the= =0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "License"); you may not use th= is file except in =0A> compliance=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 with the License.=C2=A0 You may obtain a copy of the License at=0A>>> = +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 .=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 http://www.apache.org/licenses/LICENSE-2.0=0A>>> +=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 .=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = Unless required by applicable law or agreed to in writing,=0A>>> +=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 software distributed under the License is dist= ributed on an=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "AS IS" BASIS, WI= THOUT WARRANTIES OR CONDITIONS =0A> OF ANY=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 KIND, either express or implied.=C2=A0 See the License for the= =0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 specific language governing pe= rmissions and limitations=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 under= the License.=0A>>> +=0A>>> +Title:=C2=A0 Popis produktu Apache OpenOffic= e=0A>>> +Notice:=C2=A0 =C2=A0 Licensed to the Apache Software Foundation (= ASF) under one=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 or more contribu= tor license agreements.=C2=A0 See the NOTICE =0A> file=0A>>> +=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 distributed with this work for additional informa= tion=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 regarding copyright owners= hip.=C2=A0 The ASF licenses this file=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 to you under the Apache License, Version 2.0 (the=0A>>> +=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 "License"); you may not use this file except i= n =0A> compliance=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 with the Lice= nse.=C2=A0 You may obtain a copy of the License at=0A>>> +=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 .=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 h= ttp://www.apache.org/licenses/LICENSE-2.0=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 .=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Unless required b= y applicable law or agreed to in writing,=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 software distributed under the License is distributed on an=0A>= >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "AS IS" BASIS, WITHOUT WARRANTIES = OR CONDITIONS =0A> OF ANY=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 KIND,= either express or implied.=C2=A0 See the License for the=0A>>> +=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 specific language governing permissions and li= mitations=0A>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 under the License.=0A= >>> +css:=C2=A0 =C2=A0 /product/styles.css=0A>>> +=0A>>> +Kompatibiln=C3= =BD s ostatn=C3=BDmi hlavn=C3=BDmi kancel=C3=A1rskymi bal=C3=ADkmi, Apache = =0A> OpenOffice je vo=C4=BEn=C3=BD na=0A>>> +stiahnutie, pou=C5=BE=C3=ADva= nie a distrib=C3=BAciu. [Stiahnite si ho teraz][1] a =0A> z=C3=ADskajte:=0A= >>> +=0A>>> +![Apache OpenOffice?](/images/AOO_logos/orb.jpg) # {.rfloati= mg}=0A>>> +=0A>>> +=C2=A0 - [Writer](writer.html "Textov=C3=BD procesor")= textov=C3=BD =0A> procesor m=C3=B4=C5=BEete pou=C5=BEi=C5=A5 na=0A>>> += =C2=A0 =C2=A0 =C4=8Doko=C4=BEvek od p=C3=ADsania kr=C3=A1tkych listov a=C5= =BE po produkciu celej knihy.=0A>>> +=C2=A0 =C2=A0 # { .product-writer }= =0A>>> +=C2=A0 - [Calc](calc.html "Tabu=C4=BEkov=C3=BD procesor") v=C3=BDk= onn=C3=BD tabu=C4=BEkov=C3=BD =0A> procesor so v=C5=A1etk=C3=BDmi n=C3=A1st= rojmi=0A>>> +=C2=A0 =C2=A0 potrebn=C3=BDmi na v=C3=BDpo=C4=8Dty, anal=C3= =BDzu, a poskytovanie va=C5=A1ich d=C3=A1t v =0A> =C4=8D=C3=ADseln=C3=BDch = spr=C3=A1vach=0A>>> +=C2=A0 =C2=A0 alebo vzru=C5=A1uj=C3=BAcich grafoch. #= { .product-calc }=0A>>> +=C2=A0 - [Impress](impress.html "Prezenta=C4=8Dn= =C3=BD program") =0A> najr=C3=BDchlej=C5=A1=C3=AD, najsilnej=C5=A1=C3=AD=0A= >>> +=C2=A0 =C2=A0 ako vytvori=C5=A5 p=C3=B4sobiv=C3=A9 multimedi=C3=A1lne= prezent=C3=A1cie. # { =0A> .product-impress }=0A>>> +=C2=A0 - [Draw](draw= .html "Vektorov=C3=BD kresliaci n=C3=A1stroj") umo=C5=BE=C5=88uje =0A> tvor= i=C5=A5 v=C5=A1etko od=0A>>> +=C2=A0 =C2=A0 jednoduch=C3=BDch diagramov a= =C5=BE po dynamick=C3=A9 3D ilustr=C3=A1cie. # { =0A> .product-draw }=0A>>>= +=C2=A0 - [Base](base.html "Datb=C3=A1za") v=C3=A1m umo=C5=BE=C5=88uje be= z probl=C3=A9mov =0A> manipulova=C5=A5 s datab=C3=A1zami.=0A>>> +=C2=A0 = =C2=A0 Vytv=C3=A1rajte a me=C5=88te tabu=C4=BEky, formul=C3=A1re, dopyty a = zostavy, v=C5=A1etko =0A> zvn=C3=BAtra=0A>>> +=C2=A0 =C2=A0 Apache OpenOff= ice. # { .product-base }=0A>>> +=C2=A0 - [Math](math.html "Tvorca matemati= ck=C3=BDch funkci=C3=AD") =0A> umo=C5=BE=C5=88uje v=C3=A1m vytvori=C5=A5=0A= >>> +=C2=A0 =C2=A0 matematick=C3=A9 rovnice s grafick=C3=BDm u=C5=BE=C3=AD= vate=C4=BEsk=C3=BDm rozhran=C3=ADm alebo =0A> priamo p=C3=ADsa=C5=A5=0A>>> = +=C2=A0 =C2=A0 va=C5=A1e vzorce do editoru rovn=C3=ADc. # { .product-math = }=0A>>> +=0A>>> +## Pre=C4=8Do Apache OpenOffice? #{ .why }=0A>>> +=0A>>= > +Apache OpenOffice je synonymom **kvality**=0A>>> +=0A>>> +- the [root= s of Apache OpenOffice][2] go back twenty years, creating a =0A> mature=0A>= >> +=C2=A0 and powerful product=0A>>> +- stovky z tis=C3=ADcok u=C5=BE=C3= =ADvate=C4=BEov sa z=C3=BA=C4=8Dastnilo beta testovania verzie 3=0A>>> +- = [nez=C3=A1visl=C3=AD kritici][3] z cel=C3=A9ho sveta doporu=C4=8Dili produk= t=0A>>> +- s plne otvoren=C3=BDm sp=C3=B4sobom v=C3=BDvoja, Apache OpenOff= ice nem=C3=A1=0A>>> +=C2=A0 =C4=8Do skry=C5=A5 - produkt stoj=C3=AD a pad= =C3=A1 na jeho povesti=0A>>> +=0A>>> +Apache OpenOffice je **jednoduch=C3= =BD na pou=C5=BE=C3=ADvanie**=0A>>> +=0A>>> +- softv=C3=A9r vyzer=C3=A1 a= reaguje prirodzene a je okam=C5=BEite pou=C5=BEite=C4=BEn=C3=BD pre =0A> k= ohoko=C4=BEvek kto=0A>>> +=C2=A0 pou=C5=BE=C3=ADval konkuren=C4=8Dn=C3=BD = produkt=0A>>> +- je =C4=BEahk=C3=A9 prejs=C5=A5 na Apache OpenOffice - sof= tv=C3=A9r =C4=8D=C3=ADta v=C5=A1etky hlavn=C3=A9=0A>>> +=C2=A0 konkuren=C4= =8Dn=C3=A9 s=C3=BAbory=0A>>> +- m=C3=A1lo [jazykov=C3=BDch prek=C3=A1=C5= =BEok][4] - ak e=C5=A1te nie je dostupn=C3=BD vo va=C5=A1om =0A> jazyku,=0A= >>> +=C2=A0 s=C3=BA =C5=A1ance, =C5=BEe bude =C4=8Doskoro=0A>>> +- Apache= OpenOffice je potporovan=C3=BD glob=C3=A1lnou komunitou priate=C4=BEsk=C3= =BDch =0A> dobrovo=C4=BEn=C3=ADkov,=0A>>> +=C2=A0 te=C5=A1iacich sa na pos= kytnutie pomoci nov=C3=A1=C4=8Dikom a takisto aj sk=C3=BAsen=C3=BDm =0A> po= u=C5=BE=C3=ADvate=C4=BEom=0A>>> +=0A>>> +Apache OpenOffice je **slobodn= =C3=BD softv=C3=A9r**=0A>>> +=0A>>> +- m=C3=B4=C5=BEete si stiahnu=C5=A5 = Apache OpenOffice =C3=BAplne zadarmo bez licen=C4=8Dn=C3=BDch =0A> poplatko= v=0A>>> +- in=C5=A1talova=C5=A5 ho na to=C4=BEko po=C4=8D=C3=ADta=C4=8Dov = ko=C4=BEko chcete=0A>>> +- pou=C5=BE=C3=ADva=C5=A5 ho na hociak=C3=BD =C3= =BA=C4=8Del - s=C3=BAkromn=C3=BD, vzdel=C3=A1vac=C3=AD, pre vl=C3=A1dnu a = =0A> verejn=C3=BA=0A>>> +=C2=A0 spr=C3=A1vu, komer=C4=8Dn=C3=BD...=0A>>> = +- bez poplatku ho nahra=C5=A5 rodine, kamar=C3=A1tom, =C5=A1tudentom, zame= stnancom, =0A> at=C4=8F.=0A>>> +=0A>>> +Apache OpenOffice je **v s=C3=BAl= ade so =C5=A1tandardmi**=0A>>> +=0A>>> +- certifikovan=C3=BD [OSI][5] org= aniz=C3=A1ciou, =C5=BEe je v s=C3=BAlade s otvoren=C3=BDmi =0A> standardmi= =0A>>> +=C2=A0 a prv=C3=BD softv=C3=A9rov=C3=BD bal=C3=ADk na svete, ktor= =C3=BD pou=C5=BE=C3=ADva=0A>>> +=C2=A0 [OASIS][6] [OpenDocument form=C3=A1= t][7] (ISO 26300) ako svoj nat=C3=ADvny =0A> form=C3=A1t s=C3=BAborov.=0A>>= > +=0A>>> +### [Vyp=C3=A1trajte viac][8] alebo [ho hne=C4=8F sk=C3=BAste]= [1]!=0A>>> +=0A>>> +=0A>>> +[1]: /sk/download.html "Stiahnu=C5=A5 Apache= OpenOffice"=0A>>> +[2]: /about_us/milestones.html=0A>>> +[3]: reviews.ht= ml=0A>>> +[4]: /projects/native-lang.html=0A>>> +[5]: http://www.opensour= ce.org/docs/definition.php=0A>>> +[6]: http://www.oasis-open.org/=0A>>> += [7]: http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=3Doffice=0A= >>> +[8]: development/releases/index.html=0A>>> \ No newline at end of fi= le=0A>>> =0A>>> Property changes on: trunk/content/sk/product/index.mdtext= =0A>>> ___________________________________________________________________= =0A>>> Added: svn:eol-style=0A>>> ## -0,0 +1 ##=0A>>> +native=0A>>> \ N= o newline at end of property=0A>>> =0A>> =0A>