mirror of
https://github.com/NaN-tic/trytond-analytic_line_state.git
synced 2023-12-14 03:33:02 +01:00
fix merge error in locale
This commit is contained in:
parent
4ede2341e2
commit
1aa914cb7f
|
@ -1,4 +1,4 @@
|
|||
#
|
||||
#
|
||||
msgid ""
|
||||
msgstr "Content-Type: text/plain; charset=utf-8\n"
|
||||
|
||||
|
@ -77,17 +77,6 @@ msgstr ""
|
|||
|
||||
msgctxt "error:analytic_account.line:"
|
||||
msgid ""
|
||||
<<<<<<<
|
||||
"Currency of analytic line \"%s\" is different from the one of the related "
|
||||
"move line."
|
||||
msgstr ""
|
||||
"La moneda de la línia analítica \"%s\" és diferent a la del seu apunt "
|
||||
"relacionat."
|
||||
|
||||
msgctxt "error:analytic_account.line:"
|
||||
msgid ""
|
||||
=======
|
||||
>>>>>>>
|
||||
"The Analytic Line \"%(line)s\" is related to an Account Move Line of Account"
|
||||
" \"%(account)s\" which has the analytics forbidden for the Line's Analytic "
|
||||
"hierarchy."
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#
|
||||
#
|
||||
msgid ""
|
||||
msgstr "Content-Type: text/plain; charset=utf-8\n"
|
||||
|
||||
|
@ -77,17 +77,6 @@ msgstr ""
|
|||
|
||||
msgctxt "error:analytic_account.line:"
|
||||
msgid ""
|
||||
<<<<<<<
|
||||
"Currency of analytic line \"%s\" is different from the one of the related "
|
||||
"move line."
|
||||
msgstr ""
|
||||
"La moneda de la línea analítica \"%s\" es diferente a la del apunte "
|
||||
"relacionado."
|
||||
|
||||
msgctxt "error:analytic_account.line:"
|
||||
msgid ""
|
||||
=======
|
||||
>>>>>>>
|
||||
"The Analytic Line \"%(line)s\" is related to an Account Move Line of Account"
|
||||
" \"%(account)s\" which has the analytics forbidden for the Line's Analytic "
|
||||
"hierarchy."
|
||||
|
|
Loading…
Reference in a new issue