You touched a file in svn/main.c on the release branch. That is not
allowed. Your commit area is limited to subversion/po/ only.
*ESPECIALLY* when it comes to the *RELEASE BRANCH*.
This is Bad.
On Tue, Mar 17, 2009 at 15:22, Jens Seidel <jensseidel_at_users.sf.net> wrote:
> Author: jensseidel
> Date: Tue Mar 17 07:22:10 2009
> New Revision: 36625
>
> Log:
> Merge r36213 from trunk:
>
> * subversion/svn/main.c
> (svn_cl__cmd_table."status"): Update help message for 'svn status'.
>
> * subversion/po/fr.po,
> subversion/po/de.po,
> subversion/po/ko.po,
> subversion/po/zh_CN.po: Unfuzzy translations. Strings are obtained from
> individual substrings from the current PO file.
>
> Modified:
> branches/1.6.x/ (props changed)
> branches/1.6.x/subversion/po/de.po
> branches/1.6.x/subversion/po/fr.po
> branches/1.6.x/subversion/po/ko.po
> branches/1.6.x/subversion/po/zh_CN.po
> branches/1.6.x/subversion/svn/main.c
>
> Merged:
> /trunk:r36213
>
> Modified: branches/1.6.x/subversion/po/de.po
> URL: http://svn.collab.net/viewvc/svn/branches/1.6.x/subversion/po/de.po?pathrev=36625&r1=36624&r2=36625
> ==============================================================================
> --- branches/1.6.x/subversion/po/de.po Tue Mar 17 06:59:34 2009 (r36624)
> +++ branches/1.6.x/subversion/po/de.po Tue Mar 17 07:22:10 2009 (r36625)
> @@ -79,7 +79,7 @@ msgstr ""
> "Project-Id-Version: subversion 1.6\n"
> "Report-Msgid-Bugs-To: dev_at_subversion.tigris.org\n"
> "POT-Creation-Date: 2009-03-17 14:50+0100\n"
> -"PO-Revision-Date: 2009-03-16 17:12+0100\n"
> +"PO-Revision-Date: 2009-03-17 15:06+0100\n"
> "Last-Translator: Subversion Developers <dev_at_subversion.tigris.org>\n"
> "Language-Team: German <dev_at_subversion.tigris.org>\n"
> "MIME-Version: 1.0\n"
> @@ -8802,7 +8802,7 @@ msgid ""
> " svn status\n"
> " M wc/bar.c\n"
> " ! C wc/qaz.c\n"
> -" > incoming edit, local missing\n"
> +" > local missing, incoming edit upon update\n"
> " D wc/qax.c\n"
> msgstr ""
> "Gibt den Status der Dateien und Verzeichnisse der\n"
>
> Modified: branches/1.6.x/subversion/po/fr.po
> URL: http://svn.collab.net/viewvc/svn/branches/1.6.x/subversion/po/fr.po?pathrev=36625&r1=36624&r2=36625
> ==============================================================================
> --- branches/1.6.x/subversion/po/fr.po Tue Mar 17 06:59:34 2009 (r36624)
> +++ branches/1.6.x/subversion/po/fr.po Tue Mar 17 07:22:10 2009 (r36625)
> @@ -10,7 +10,7 @@ msgstr ""
> "Project-Id-Version: subversion 1.6\n"
> "Report-Msgid-Bugs-To: dev_at_subversion.tigris.org\n"
> "POT-Creation-Date: 2009-03-17 14:50+0100\n"
> -"PO-Revision-Date: 2009-02-18 13:26+0100\n"
> +"PO-Revision-Date: 2009-03-17 15:14+0100\n"
> "Last-Translator: Subversion Developers <dev_at_subversion.tigris.org>\n"
> "Language-Team: French <dev_at_subversion.tigris.org>\n"
> "MIME-Version: 1.0\n"
> @@ -8669,7 +8669,7 @@ msgid ""
> " svn status\n"
> " M wc/bar.c\n"
> " ! C wc/qaz.c\n"
> -" > incoming edit, local missing\n"
> +" > local missing, incoming edit upon update\n"
> " D wc/qax.c\n"
> msgstr ""
> "Affiche l'état des fichiers et répertoires de la copie de travail.\n"
> @@ -8755,7 +8755,7 @@ msgstr ""
> " svn status\n"
> " M wc/bar.c\n"
> " ! C wc/qaz.c\n"
> -" > édition entrante, local manquant\n"
> +" > local manquant, arrivée de édite sur mis à jour\n"
> " D wc/qax.c\n"
>
> #: ../svn/main.c:908
>
> Modified: branches/1.6.x/subversion/po/ko.po
> URL: http://svn.collab.net/viewvc/svn/branches/1.6.x/subversion/po/ko.po?pathrev=36625&r1=36624&r2=36625
> ==============================================================================
> --- branches/1.6.x/subversion/po/ko.po Tue Mar 17 06:59:34 2009 (r36624)
> +++ branches/1.6.x/subversion/po/ko.po Tue Mar 17 07:22:10 2009 (r36625)
> @@ -7,7 +7,7 @@ msgstr ""
> "Project-Id-Version: subversion 1.6\n"
> "Report-Msgid-Bugs-To: dev_at_subversion.tigris.org\n"
> "POT-Creation-Date: 2009-03-17 14:50+0100\n"
> -"PO-Revision-Date: 2008-12-31 15:31+0900\n"
> +"PO-Revision-Date: 2009-03-17 15:16+0100\n"
> "Last-Translator: Subversion Developers <dev_at_subversion.tigris.org>\n"
> "Language-Team: Korean <dev_at_subversion.tigris.org>\n"
> "MIME-Version: 1.0\n"
> @@ -8495,7 +8495,7 @@ msgid ""
> " svn status\n"
> " M wc/bar.c\n"
> " ! C wc/qaz.c\n"
> -" > incoming edit, local missing\n"
> +" > local missing, incoming edit upon update\n"
> " D wc/qax.c\n"
> msgstr ""
> "작업 사본내의 파일과 디렉토리에 대한 상태를 출력합니다.\n"
> @@ -8580,7 +8580,7 @@ msgstr ""
> " svn status\n"
> " M wc/bar.c\n"
> " ! C wc/qaz.c\n"
> -" > 서버상태: 수정됨, 작업사본: 누락됨\n"
> +" > 작업사본:누락됨, 서버상태:수정됨 (업데이트)\n"
> " D wc/qax.c\n"
>
> #: ../svn/main.c:908
>
> Modified: branches/1.6.x/subversion/po/zh_CN.po
> URL: http://svn.collab.net/viewvc/svn/branches/1.6.x/subversion/po/zh_CN.po?pathrev=36625&r1=36624&r2=36625
> ==============================================================================
> --- branches/1.6.x/subversion/po/zh_CN.po Tue Mar 17 06:59:34 2009 (r36624)
> +++ branches/1.6.x/subversion/po/zh_CN.po Tue Mar 17 07:22:10 2009 (r36625)
> @@ -38,7 +38,7 @@ msgstr ""
> "Project-Id-Version: subversion 1.6\n"
> "Report-Msgid-Bugs-To: dev_at_subversion.tigris.org\n"
> "POT-Creation-Date: 2009-03-17 14:50+0100\n"
> -"PO-Revision-Date: 2009-03-17 21:31+0800\n"
> +"PO-Revision-Date: 2009-03-17 15:09+0100\n"
> "Last-Translator: Subversion Developers <dev_at_subversion.tigris.org>\n"
> "Language-Team: Simplified Chinese <dev_at_subversion.tigris.org>\n"
> "MIME-Version: 1.0\n"
> @@ -8502,7 +8502,7 @@ msgid ""
> " svn status\n"
> " M wc/bar.c\n"
> " ! C wc/qaz.c\n"
> -" > incoming edit, local missing\n"
> +" > local missing, incoming edit upon update\n"
> " D wc/qax.c\n"
> msgstr ""
> "显示工作副本中目录与文件的状态。\n"
> @@ -8585,7 +8585,7 @@ msgstr ""
> " svn status\n"
> " M wc/bar.c\n"
> " ! C wc/qaz.c\n"
> -" > incoming edit, local missing\n"
> +" > local missing, incoming edit upon update\n"
> " D wc/qax.c\n"
>
> #: ../svn/main.c:908
>
> Modified: branches/1.6.x/subversion/svn/main.c
> URL: http://svn.collab.net/viewvc/svn/branches/1.6.x/subversion/svn/main.c?pathrev=36625&r1=36624&r2=36625
> ==============================================================================
> --- branches/1.6.x/subversion/svn/main.c Tue Mar 17 06:59:34 2009 (r36624)
> +++ branches/1.6.x/subversion/svn/main.c Tue Mar 17 07:22:10 2009 (r36625)
> @@ -2,7 +2,7 @@
> * main.c: Subversion command line client.
> *
> * ====================================================================
> - * Copyright (c) 2000-2008 CollabNet. All rights reserved.
> + * Copyright (c) 2000-2009 CollabNet. All rights reserved.
> *
> * This software is licensed as described in the file COPYING, which
> * you should have received as part of this distribution. The terms
> @@ -899,7 +899,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
> " svn status\n"
> " M wc/bar.c\n"
> " ! C wc/qaz.c\n"
> - " > incoming edit, local missing\n"
> + " > local missing, incoming edit upon update\n"
> " D wc/qax.c\n"),
> { 'u', 'v', 'N', opt_depth, 'q', opt_no_ignore, opt_incremental, opt_xml,
> opt_ignore_externals, opt_changelist} },
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1341462
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1341695
Received on 2009-03-17 15:56:30 CET