You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Hyrum K. Wright" <hy...@hyrumwright.org> on 2009/10/14 17:18:49 UTC

Re: svn commit: r40029 - branches/1.6.x/subversion/po

1.6.x is still be distributed under the old license, so this change  
isn't correct.

-Hyrum

On Oct 14, 2009, at 12:07 PM, Øyvind A. Holm wrote:

> Author: sunny256
> Date: Wed Oct 14 10:07:00 2009
> New Revision: 40029
>
> Log:
> On the 1.6.x branch:
>
> * subversion/po/nb.po
>  Sync header with nb.po on trunk; new license and dictionary changes.
>
> Modified:
>   branches/1.6.x/subversion/po/nb.po
>
> Modified: branches/1.6.x/subversion/po/nb.po
> URL: http://svn.collab.net/viewvc/svn/branches/1.6.x/subversion/po/nb.po?pathrev=40029&r1=40028&r2=40029
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- branches/1.6.x/subversion/po/nb.po	Wed Oct 14 10:04:52 2009	 
> (r40028)
> +++ branches/1.6.x/subversion/po/nb.po	Wed Oct 14 10:07:00 2009	 
> (r40029)
> @@ -1,13 +1,30 @@
> # Norwegian Bokmål translations for the subversion package
> -# Copyright (C) 2004–2008 CollabNet.
> -# This file is distributed under the same license as the subversion  
> package.
> +#
> +#    Licensed to the Subversion Corporation (SVN Corp.) under one
> +#    or more contributor license agreements.  See the NOTICE file
> +#    distributed with this work for additional information
> +#    regarding copyright ownership.  The SVN Corp. licenses this file
> +#    to you under the Apache License, Version 2.0 (the
> +#    "License"); you may not use this file except in compliance
> +#    with the License.  You may obtain a copy of the License at
> +#
> +#      http://www.apache.org/licenses/LICENSE-2.0
> +#
> +#    Unless required by applicable law or agreed to in writing,
> +#    software distributed under the License is distributed on an
> +#    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +#    KIND, either express or implied.  See the License for the
> +#    specific language governing permissions and limitations
> +#    under the License.
> #
> # Dictionary:
> #
> # '' - «»
> +# API - programmeringsgrensesnitt
> +# URL - URL
> +# WC (“working copy”) - AK («arbeidskopi»)
> # allocate - reservere
> # ancestor - opprinnelse
> -# API - programmeringsgrensesnitt
> # argument - argument
> # authentication realm - autentiseringsområde
> # bump - øke
> @@ -61,12 +78,11 @@
> # switched - byttet
> # target - mål
> # token - nøkkel (i lock-sammenheng)
> +# truncate - avkorte
> # unsupported x - x ikke støttet
> # unversioned - uversjonert
> -# URL - URL
> # usage - bruk
> # uuid - uuid
> -# WC (“working copy”) - AK («arbeidskopi»)
> # working copy - arbeidskopi
> #
> msgid ""
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2407657

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2407659

Re: svn commit: r40029 - branches/1.6.x/subversion/po

Posted by "Øyvind A. Holm" <re...@sunbase.org>.
On 2009-10-14 12:18:49, Hyrum K. Wright wrote:
> 1.6.x is still be distributed under the old license, so this change 
> isn't correct.
>
> -Hyrum
>
> On Oct 14, 2009, at 12:07 PM, Øyvind A. Holm wrote:
>
> > Author: sunny256
> > Date: Wed Oct 14 10:07:00 2009
> > New Revision: 40029
> >
> > Log:
> > On the 1.6.x branch:
> >
> > * subversion/po/nb.po
> >   Sync header with nb.po on trunk; new license and dictionary 
> >   changes.

D’oh, of course. Thanks for catching it, I’ll fix it now.

Regards,
Øyvind

+-| Øyvind A. Holm <su...@sunbase.org> - N 60.39548° E 5.31735° |-+
| OpenPGP: 0xFB0CBEE894A506E5 - http://www.sunbase.org/pubkey.asc |
| Fingerprint: A006 05D6 E676 B319 55E2  E77E FB0C BEE8 94A5 06E5 |
+------------| f3cbbe80-b8e5-11de-9f09-00248cd5cf1e |-------------+