Bug#607381: Inaccurate translation for resolve command

[Laurent Bigonville]

Package: subversion
Version: 1.6.12dfsg-2
Severity: normal
Tags: l10n, patch

Hi,

The French and Japanese translation for the "resolve" command are
reporting wrong arguments for the --accept parameter.

Where two patches that should fix this issue.

Cheers

Laurent Bigonville
--- subversion-1.6.12dfsg.orig/subversion/po/fr.po
+++ subversion-1.6.12dfsg/subversion/po/fr.po
@@ -8595,7 +8595,7 @@
 "                             'theirs-conflict', 'mine-full', 'theirs-full')"
 msgstr ""
 "précise l'action de la résolution automatique de conflit\n"
-"    ('postpone', 'base', 'mine-conflict',\n"
+"    ('base', 'working', 'mine-conflict',\n"
 "     'theirs-conflict', 'mine-full', 'theirs-full')"
 
 #: ../svn/main.c:802

--- subversion-1.6.12dfsg.orig/subversion/po/ja.po
+++ subversion-1.6.12dfsg/subversion/po/ja.po
@@ -7951,7 +7951,8 @@
 "                             'edit', 'launch')"
 msgstr ""
 "自動競合解決の操作を指定します\n"
-"                            ('postpone', 'base', 'mine-full', 'theirs-full',\n"
+"                            ('postpone', 'base', 'mine-conflict',\n"
+"                             'theirs-conflict', 'mine-full', 'theirs-full',\n"
 "                             'edit', 'launch')"
 
 # * Description for 'svn --show-revs'
@@ -8936,8 +8937,8 @@
 "                             'theirs-conflict', 'mine-full', 'theirs-full')"
 msgstr ""
 "自動競合解決の操作を指定します\n"
-"                            ('postpone', 'base', 'mine-full', 'theirs-full',\n"
-"                             'edit', 'launch')"
+"                            ('base', 'working', 'mine-conflict',\n"
+"                             'theirs-conflict', 'mine-full', 'theirs-full')"
 
 # * Description for 'svn resolved'.
 # * "resolved: " is displayed at the head of the first line.