NaNtic/trytond-analytic_line_state
1
0
Fork 0
mirror of https://github.com/NaN-tic/trytond-analytic_line_state.git synced 2023-12-14 03:33:02 +01:00
Code Issues Projects Releases Wiki Activity

fix merge error in locale

Browse source
This commit is contained in:
?ngel ?lvarez 2015-04-13 15:02:52 +02:00
parent 4ede2341e2
commit 1aa914cb7f
2 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
locale/ca_ES.po
View file

@ -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."

13
locale/es_ES.po
View file

@ -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."