merged multiple heads

This commit is contained in:
resteve
2016-03-28 23:23:15 +02:00
14 changed files with 104 additions and 200 deletions

View File

@@ -10,14 +10,26 @@ msgctxt "error:close.statement:"
msgid "Statement %s already closed.\n"
msgstr "Extracte %s ja tancat.\n"
msgctxt "error:close.statement:"
msgid "Statement %s already closed. \n"
msgstr "Extracto %s ya cerrado.\n"
msgctxt "error:close.statement:"
msgid "Statement %s closed.\n"
msgstr "Extracte %s tancat.\n"
msgctxt "error:close.statement:"
msgid "Statement %s closed. \n"
msgstr "Extracte %s ja tancat.\n"
msgctxt "error:close.statement:"
msgid "Statement %s not found.\n"
msgstr "Extracte %s no trobat.\n"
msgctxt "error:close.statement:"
msgid "Statement %s not found. \n"
msgstr "Extracte %s no trobat.\n"
msgctxt "error:close.statement:"
msgid "User %s has not any device assigned yet.\n"
msgstr "L'usuari %s no té cap terminal assignat encara.\n"
@@ -26,10 +38,18 @@ msgctxt "error:open.statement:"
msgid "Statement %s already opened.\n"
msgstr "Extracte %s ja obert.\n"
msgctxt "error:open.statement:"
msgid "Statement %s already opened. \n"
msgstr "Extracte %s ja obert.\n"
msgctxt "error:open.statement:"
msgid "Statement %s opened.\n"
msgstr "Extracte %s obert.\n"
msgctxt "error:open.statement:"
msgid "Statement %s opened. \n"
msgstr "Extracte %s obert.\n"
msgctxt "error:open.statement:"
msgid "User %s has not any device assigned yet.\n"
msgstr "L'usuari %s no té cap terminal assignat encara.\n"
@@ -41,7 +61,7 @@ msgstr "No podeu tenir dos usuaris amb el mateix identificador d'entrada."
msgctxt "error:sale.payment:"
msgid "A customer invoice/refund from sale device has not been created."
msgstr ""
"Una factura / factura de devolució d'un terminal de venda no s'ha creat."
"Una factura/devolució d'un terminal de venda no s'ha creat."
msgctxt "error:sale.payment:"
msgid "A draft statement for \"%s\" payments has not been created."
@@ -57,6 +77,11 @@ msgctxt "error:sale.payment:"
msgid "You have not defined a sale device for your user."
msgstr "No heu definit un terminal de venda per al vostre usuari."
msgctxt "error:sale.sale:"
msgid "A customer invoice/refund from sale device has not been created."
msgstr ""
"Una factura/devolució d'un terminal de venda no s'ha creat."
msgctxt "error:sale.sale:"
msgid "Go to user preferences and select a shop (\"%s\")"
msgstr "Selecciona una botiga en les seves preferencies (\"%s\")."
@@ -241,10 +266,6 @@ msgctxt "model:close.statement.start,name:"
msgid "Close Statement"
msgstr "Tanca extracte"
msgctxt "model:ir.action,name:"
msgid "POS Device"
msgstr "Dispositiu TPV"
msgctxt "model:ir.action,name:act_sale_device"
msgid "Sale Device"
msgstr "Terminal de venda"
@@ -301,10 +322,6 @@ msgctxt "model:ir.sequence.type,name:"
msgid "Sale Pos"
msgstr "Venta TPV"
msgctxt "model:ir.ui.menu,name:"
msgid "POS Devices"
msgstr "Dispositius TPV"
msgctxt "model:ir.ui.menu,name:menu_close_statement"
msgid "Close Statements"
msgstr "Tanca extractes"

View File

@@ -220,7 +220,7 @@ msgstr "Pagos"
msgctxt "field:sale.sale,residual_amount:"
msgid "Residual Amount"
msgstr "Cambio"
msgstr "Saldo"
msgctxt "field:sale.sale,sale_device:"
msgid "Sale Device"
@@ -246,10 +246,6 @@ msgctxt "model:close.statement.start,name:"
msgid "Close Statement"
msgstr "Cerrar Estado de Cuenta"
msgctxt "model:ir.action,name:"
msgid "POS Device"
msgstr "Dispositivo POS"
msgctxt "model:ir.action,name:act_sale_device"
msgid "Sale Device"
msgstr "Terminal de Venta"
@@ -306,10 +302,6 @@ msgctxt "model:ir.sequence.type,name:"
msgid "Sale Pos"
msgstr "Venta TPV"
msgctxt "model:ir.ui.menu,name:"
msgid "POS Devices"
msgstr "Dispositivos POS"
msgctxt "model:ir.ui.menu,name:menu_close_statement"
msgid "Close Statements"
msgstr "Cerrar Estados de Cuenta"

View File

@@ -1,4 +1,4 @@
#
#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -7,15 +7,15 @@ msgid "Amount should be a positive or negative value."
msgstr "El importe debe ser una cantidad positiva o negativa."
msgctxt "error:close.statement:"
msgid "Statement %s already closed.\n"
msgid "Statement %s already closed. \n"
msgstr "Extracto %s ya cerrado.\n"
msgctxt "error:close.statement:"
msgid "Statement %s closed.\n"
msgstr "Extracto %s cerrado.\n"
msgid "Statement %s closed. \n"
msgstr "Extracto %s cerrado. \n"
msgctxt "error:close.statement:"
msgid "Statement %s not found.\n"
msgid "Statement %s not found. \n"
msgstr "Extracto %s no encontrado.\n"
msgctxt "error:close.statement:"
@@ -23,11 +23,11 @@ msgid "User %s has not any device assigned yet.\n"
msgstr "Usuario %s no tiene ningún terminal asignado todavía.\n"
msgctxt "error:open.statement:"
msgid "Statement %s already opened.\n"
msgid "Statement %s already opened. \n"
msgstr "Extracto %s ya abierto.\n"
msgctxt "error:open.statement:"
msgid "Statement %s opened.\n"
msgid "Statement %s opened. \n"
msgstr "Extracto %s abierto.\n"
msgctxt "error:open.statement:"
@@ -38,11 +38,6 @@ msgctxt "error:res.user:"
msgid "You can not have two users with the same login!"
msgstr "No puede tener dos usuarios con el mismo registro de entrada."
msgctxt "error:sale.payment:"
msgid "A customer invoice/refund from sale device has not been created."
msgstr ""
"Una factura/factura de devolución del terminal de venta no se ha creado."
msgctxt "error:sale.payment:"
msgid "A draft statement for \"%s\" payments has not been created."
msgstr "Un extracto borrador para \"%s\" pagos no se ha creado."
@@ -57,6 +52,10 @@ msgctxt "error:sale.payment:"
msgid "You have not defined a sale device for your user."
msgstr "No ha definido un terminal de venta para su usuario."
msgctxt "error:sale.sale:"
msgid "A customer invoice/refund from sale device has not been created."
msgstr "Una factura/devolución del terminal de venta no se ha creado."
msgctxt "error:sale.sale:"
msgid "Go to user preferences and select a shop (\"%s\")"
msgstr "Seleccione una tienda en sus preferencias (\"%s\")."
@@ -241,10 +240,6 @@ msgctxt "model:close.statement.start,name:"
msgid "Close Statement"
msgstr "Cerrar extracto"
msgctxt "model:ir.action,name:"
msgid "POS Device"
msgstr "Dispositivo TPV"
msgctxt "model:ir.action,name:act_sale_device"
msgid "Sale Device"
msgstr "Terminal de venta"
@@ -301,10 +296,6 @@ msgctxt "model:ir.sequence.type,name:"
msgid "Sale Pos"
msgstr "Venta TPV"
msgctxt "model:ir.ui.menu,name:"
msgid "POS Devices"
msgstr "Dispositivos TPV"
msgctxt "model:ir.ui.menu,name:menu_close_statement"
msgid "Close Statements"
msgstr "Cerrar extractos"
@@ -382,12 +373,12 @@ msgid "Sale Payment Form"
msgstr "Formulario de pago de venta"
msgctxt "view:sale.sale:"
msgid "Payments"
msgstr "Pagos"
msgid "Pay"
msgstr "Pagar"
msgctxt "view:sale.sale:"
msgid "_Pay"
msgstr "_Pagar"
msgid "Payments"
msgstr "Pagos"
msgctxt "wizard_button:close.statement,done,end:"
msgid "Done"