Return-Path: 
 <ooo-dev-return-23305-apmail-incubator-ooo-dev-archive=incubator.apache.org@incubator.apache.org>
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 758E1C7B4
	for <apmail-incubator-ooo-dev-archive@minotaur.apache.org>;
 Sat, 21 Jul 2012 20:26:29 +0000 (UTC)
Received: (qmail 99533 invoked by uid 500); 21 Jul 2012 20:26:29 -0000
Delivered-To: apmail-incubator-ooo-dev-archive@incubator.apache.org
Received: (qmail 99469 invoked by uid 500); 21 Jul 2012 20:26:29 -0000
Mailing-List: contact ooo-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:ooo-dev-help@incubator.apache.org>
List-Unsubscribe: <mailto:ooo-dev-unsubscribe@incubator.apache.org>
List-Post: <mailto:ooo-dev@incubator.apache.org>
List-Id: <ooo-dev.incubator.apache.org>
Reply-To: ooo-dev@incubator.apache.org
Delivered-To: mailing list ooo-dev@incubator.apache.org
Received: (qmail 99460 invoked by uid 99); 21 Jul 2012 20:26:29 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 Jul 2012 20:26:29 +0000
X-ASF-Spam-Status: No, hits=1.5 required=5.0
	tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS
X-Spam-Check-By: apache.org
Received-SPF: pass (athena.apache.org: domain of kay.schenk@gmail.com
 designates 209.85.217.175 as permitted sender)
Received: from [209.85.217.175] (HELO mail-lb0-f175.google.com)
 (209.85.217.175)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 Jul 2012 20:26:22 +0000
Received: by lbol5 with SMTP id l5so6152379lbo.6
        for <ooo-dev@incubator.apache.org>;
 Sat, 21 Jul 2012 13:26:01 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :content-type;
        bh=iHzzLd8E0/Xlq7lryaTtmUdNSzR6gplZ6iHlMAhWZto=;
        b=JiAiSHJPMYkYoCVti2t+MztEf6DjHjATROzxq06t5HwdVSGfJRGo73u6FaFEL6jZUz
         vN2wITjmtM2T4bN0qScoIxzK6MplI92gC0LMcUr8NkWT55ilUj5EN4tG+2cqM+0WdF+J
         Pa+QGVif4wsCj/bYOrrTU81wMFVVYBLYDclzRim8f+8AlKIfIKakCb0db7YDhb/One8p
         YnTlRGdp66oRGNGiHnEhq+D4N7VnEELWw862OanjivwEoRnjGGUAk3vsaTxegDTOeIiY
         erlkbbRUUMFYXTCCn1/h1UipxeGrWfeEtux0Z9FSVj6OddDBcHk4sq2HeFgoos8C6ScU
         Mo2Q==
MIME-Version: 1.0
Received: by 10.152.109.198 with SMTP id hu6mr11000651lab.21.1342902361179;
 Sat, 21 Jul 2012 13:26:01 -0700 (PDT)
Received: by 10.112.20.5 with HTTP; Sat, 21 Jul 2012 13:26:01 -0700 (PDT)
In-Reply-To: <CF29B599-9FAC-4D3E-85CF-8432B8E55279@comcast.net>
References: <20120720220847.D2DB240DCBF@cms.zones.apache.org>
	<4A16D053-32F8-4AF5-BF9A-414AA3BF3481@comcast.net>
	<CAGj3217gfhrvKe0t+_okkf77VXG_dd1t4PwQnuGQHkpe6NtzOQ@mail.gmail.com>
	<1342888361.74327.YahooMailNeo@web124706.mail.ne1.yahoo.com>
	<CF29B599-9FAC-4D3E-85CF-8432B8E55279@comcast.net>
Date: Sat, 21 Jul 2012 13:26:01 -0700
Message-ID: 
 <CAGj3215c7HP5O_sUZWhNxU4t8+7tbrR0hFmBeyVqShvUR5YGzg@mail.gmail.com>
Subject: Re: CMS diff: Pakiet biurowy OpenOffice.org po polsku
From: Kay Schenk <kay.schenk@gmail.com>
To: ooo-dev@incubator.apache.org
Content-Type: multipart/alternative; boundary=bcaec54b49d634c57904c55cd2f1
X-Virus-Checked: Checked by ClamAV on apache.org

--bcaec54b49d634c57904c55cd2f1
Content-Type: text/plain; charset=ISO-8859-1

On Sat, Jul 21, 2012 at 10:32 AM, Dave Fisher <dave2wave@comcast.net> wrote:

> Good news, I look forward to seeing these results.
>
> On Jul 21, 2012, at 9:32 AM, Joe Schaefer wrote:
>
> > You did the right thing in resolving the conflict.
> > I looked at your working copy and other than there
> > being 2 <title> sections for the page it looks ready
> > to commit.
>

Yeah, well, my svn "local" copy didn't share your enthusiam. Oy!

OK, after unscrambling snv's brains, it's all good now!

Thanks for the encouraging words by the way. I think Rob and I got into
some kind of "lock" situation which I hadn't experienced before.

>
> >
> >
> > ----- Original Message -----
> >> From: Kay Schenk <kay.schenk@gmail.com>
> >> To: ooo-dev@incubator.apache.org
> >> Cc:
> >> Sent: Saturday, July 21, 2012 12:24 PM
> >> Subject: Re: CMS diff: Pakiet biurowy OpenOffice.org po polsku
> >>
> >> On Fri, Jul 20, 2012 at 3:11 PM, Dave Fisher <dave2wave@comcast.net>
> >> wrote:
> >>
> >>> Oops, I had got into anonymous mode.
> >>>
> >>
> >> Well OK...I am STILL trying to fix this and running into "conflict"
> >> problems -- huh, wah!? :(
> >>
> >> Later...things to do for a few hours.
> >>
> >>
> >>
> >>>
> >>> On Jul 20, 2012, at 3:08 PM, There were three lines of mismatched tags
> >>> wrote:
> >>>
> >>>> Clone URL (Committers only):
> >>>>
> >>>
> >>
> https://cms.apache.org/redirect?new=anonymous;action=diff;uri=http://ooo-site.apache.org/pl%2Findex.html
> >>>>
> >>>> There were three lines of mismatched tags
> >>>>
> >>>> Index: trunk/content/pl/index.html
> >>>> ===================================================================
> >>>> --- trunk/content/pl/index.html       (revision 1363590)
> >>>> +++ trunk/content/pl/index.html       (working copy)
> >>>> @@ -42,8 +42,6 @@
> >>>> </head>
> >>>> <body>
> >>>>
> >>>> -</div>
> >>>> -</td></tr></table>
> >>>> <table id="mainpl"><tr>
> >>>> <td id="menu">
> >>>>    <a href="http://pl.openoffice.org"
> >> id="stronaglowna"></a>
> >>>>
> >>>
> >>>
> >>
> >>
> >> --
> >>
> ----------------------------------------------------------------------------------------
> >> MzK
> >>
> >> "I would rather have a donkey that takes me there
> >> than a horse that will not fare."
> >>                                           -- Portuguese proverb
> >>
>
>


-- 
----------------------------------------------------------------------------------------
MzK

"I would rather have a donkey that takes me there
 than a horse that will not fare."
                                          -- Portuguese proverb

--bcaec54b49d634c57904c55cd2f1--