Author: stsp
Date: Fri Oct 26 08:06:43 2012
New Revision: 1402419
URL: http://svn.apache.org/viewvc?rev=1402419&view=rev
Log:
On the 1.6.x branch, merge r1402417 from trunk (obvious fix).
The merge had conflicts because the relevant lines aren't commented
out on this branch -- these were resolved in the obvious way.
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/subversion/po/es.po
subversion/branches/1.6.x/subversion/po/pt_BR.po
subversion/branches/1.6.x/subversion/po/zh_TW.po
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1402417
Modified: subversion/branches/1.6.x/subversion/po/es.po
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/po/es.po?rev=1402419&r1=1402418&r2=1402419&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/po/es.po [UTF-8] (original)
+++ subversion/branches/1.6.x/subversion/po/es.po [UTF-8] Fri Oct 26 08:06:43
2012
@@ -7321,7 +7321,7 @@ msgstr ""
" 'HEAD' lo último del repositorio\n"
" 'BASE' rev base del ítem de la c. de
trab.\n"
" 'COMMITTED' último commit en o antes de
BASE\n"
-" 'PREV' revisión justo antes de COMMITED"
+" 'PREV' revisión justo antes de
COMMITTED"
#: ../svn/main.c:140
msgid "read log message from file ARG"
Modified: subversion/branches/1.6.x/subversion/po/pt_BR.po
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/po/pt_BR.po?rev=1402419&r1=1402418&r2=1402419&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/po/pt_BR.po [UTF-8] (original)
+++ subversion/branches/1.6.x/subversion/po/pt_BR.po [UTF-8] Fri Oct 26
08:06:43 2012
@@ -7292,8 +7292,8 @@ msgstr ""
" '{' DATA '}' revisão no início da data\n"
" 'HEAD' último no repositório\n"
" 'BASE' revisão base do item da cópia de
trabalho\n"
-" 'COMMITED' último commit em ou antes de
BASE\n"
-" 'PREV' revisão exatamente antes de
COMMITED"
+" 'COMMITTED' último commit em ou antes de
BASE\n"
+" 'PREV' revisão exatamente antes de
COMMITTED"
#: ../svn/main.c:140
msgid "read log message from file ARG"
Modified: subversion/branches/1.6.x/subversion/po/zh_TW.po
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/po/zh_TW.po?rev=1402419&r1=1402418&r2=1402419&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/po/zh_TW.po [UTF-8] (original)
+++ subversion/branches/1.6.x/subversion/po/zh_TW.po [UTF-8] Fri Oct 26
08:06:43 2012
@@ -7438,7 +7438,7 @@ msgstr ""
" '{' DATE '}' 該日開始的修訂版\n"
" 'HEAD' 檔案庫最新版本\n"
" 'BASE' 該項目工作複本的基礎修訂版\n"
-" 'COMMITED' 位於或早於 BASE 的最後送交\n"
+" 'COMMITTED' 位於或早於 BASE 的最後送交\n"
" 'PREV' COMMITTED 之前的修訂版"
#: ../svn/main.c:140
