changeset 03af688c1a03 in weblate:default
details: https://hg.tryton.org/weblate?cmd=changeset;node=03af688c1a03
description:
Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.
Translation: Tryton/res
Translate-URL: https://translate.tryton.org/projects/tryton/res/
diffstat:
trytond/trytond/res/locale/ar.po | 38 +++++------------
trytond/trytond/res/locale/bg.po | 38 +++++------------
trytond/trytond/res/locale/ca.po | 76 +++++++++++++++++++++--------------
trytond/trytond/res/locale/cs.po | 38 +++++------------
trytond/trytond/res/locale/de.po | 72 ++++++++++++++++++++-------------
trytond/trytond/res/locale/el.po | 38 +++++------------
trytond/trytond/res/locale/es.po | 76 +++++++++++++++++++++--------------
trytond/trytond/res/locale/es_419.po | 38 +++++------------
trytond/trytond/res/locale/et.po | 72 ++++++++++++++++++++-------------
trytond/trytond/res/locale/eu.po | 38 +++++------------
trytond/trytond/res/locale/fa.po | 71 ++++++++++++++++++++-------------
trytond/trytond/res/locale/fi.po | 38 +++++------------
trytond/trytond/res/locale/fr.po | 73 +++++++++++++++++++++-------------
trytond/trytond/res/locale/hu.po | 38 +++++------------
trytond/trytond/res/locale/id.po | 50 +++++++++++------------
trytond/trytond/res/locale/it.po | 47 +++++++++------------
trytond/trytond/res/locale/ja.po | 38 +++++------------
trytond/trytond/res/locale/lo.po | 38 +++++------------
trytond/trytond/res/locale/lt.po | 63 ++++++++++++++++-------------
trytond/trytond/res/locale/nl.po | 72 ++++++++++++++++++++-------------
trytond/trytond/res/locale/pl.po | 61 ++++++++++++++++------------
trytond/trytond/res/locale/pt.po | 71 ++++++++++++++++++++-------------
trytond/trytond/res/locale/ro.po | 38 +++++------------
trytond/trytond/res/locale/ru.po | 38 +++++------------
trytond/trytond/res/locale/sl.po | 38 +++++------------
trytond/trytond/res/locale/tr.po | 38 +++++------------
trytond/trytond/res/locale/zh_CN.po | 72 ++++++++++++++++++++-------------
27 files changed, 681 insertions(+), 727 deletions(-)
diffs (2165 lines):
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/ar.po
--- a/trytond/trytond/res/locale/ar.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/ar.po Thu Oct 01 23:48:20 2020 +0000
@@ -448,6 +448,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr ""
@@ -510,41 +514,23 @@
msgid "User Warning"
msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
#, fuzzy
msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Reset Password"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
msgstr ""
msgctxt "selection:res.user.application,state:"
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/bg.po
--- a/trytond/trytond/res/locale/bg.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/bg.po Thu Oct 01 23:48:20 2020 +0000
@@ -450,6 +450,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "Група правила - Група"
@@ -514,41 +518,23 @@
msgid "User Warning"
msgstr "Потребителско предупреждение"
-msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
#, fuzzy
msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Reset Password"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
msgstr ""
msgctxt "selection:res.user.application,state:"
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/ca.po
--- a/trytond/trytond/res/locale/ca.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/ca.po Thu Oct 01 23:48:20 2020 +0000
@@ -442,6 +442,11 @@
msgid "Any view search"
msgstr "Qualsevol vista de cerca"
+#, fuzzy
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr "Vista de cerca pròpia"
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "Regla grup - Grup"
@@ -503,42 +508,23 @@
msgstr "Alerta usuari"
msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ", ha estat restablerta."
-
-msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Restableix la contrasenya"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr "La contrasenya del vostre compte,"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
+msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr "La contrasenya caducarà el"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
-msgstr "UTC"
-
+#, fuzzy
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr "Podeu connectar amb aquesta contrasenya temporal"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-"Heu d'establir una nova contrasenya des de les preferències del vostre "
-"usuari."
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr "a"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
-msgstr "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
+msgstr "La contrasenya caducarà el"
msgctxt "selection:res.user.application,state:"
msgid "Cancelled"
@@ -605,6 +591,36 @@
msgstr "Finalitza"
#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid ", has been reset."
+#~ msgstr ", ha estat restablerta."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "The password for your account,"
+#~ msgstr "La contrasenya del vostre compte,"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "UTC"
+#~ msgstr "UTC"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You can connect with this temporary password"
+#~ msgstr "Podeu connectar amb aquesta contrasenya temporal"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You must set a new one from the user's preferences."
+#~ msgstr ""
+#~ "Heu d'establir una nova contrasenya des de les preferències del vostre "
+#~ "usuari."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "to"
+#~ msgstr "a"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "tryton://"
+#~ msgstr "tryton://"
+
+#~ msgctxt "report:res.user.email_reset_password:"
#~ msgid "https://";
#~ msgstr "https://";
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/cs.po
--- a/trytond/trytond/res/locale/cs.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/cs.po Thu Oct 01 23:48:20 2020 +0000
@@ -452,6 +452,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr ""
@@ -514,41 +518,23 @@
msgid "User Warning"
msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
#, fuzzy
msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Reset Password"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
msgstr ""
msgctxt "selection:res.user.application,state:"
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/de.po
--- a/trytond/trytond/res/locale/de.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/de.po Thu Oct 01 23:48:20 2020 +0000
@@ -442,6 +442,11 @@
msgid "Any view search"
msgstr "Beliebige Suchansicht"
+#, fuzzy
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr "Eigene Suchansicht"
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "Gruppenregel - Gruppe"
@@ -503,40 +508,23 @@
msgstr "Benutzer Warnung"
msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ", wurde zurückgesetzt."
-
-msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Passwort zurücksetzen"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr "Das Passwort für Ihr Konto,"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
+msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr "Das Passwort wird ablaufen am"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
-msgstr "UTC"
-
+#, fuzzy
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr "Sie können sich mit diesem temporären Passwort anmelden"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr "Sie müssen ein neues in den Benutzer-Einstellungen eingeben."
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr "an"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
-msgstr "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
+msgstr "Das Passwort wird ablaufen am"
msgctxt "selection:res.user.application,state:"
msgid "Cancelled"
@@ -604,6 +592,34 @@
msgstr "Fertig"
#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid ", has been reset."
+#~ msgstr ", wurde zurückgesetzt."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "The password for your account,"
+#~ msgstr "Das Passwort für Ihr Konto,"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "UTC"
+#~ msgstr "UTC"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You can connect with this temporary password"
+#~ msgstr "Sie können sich mit diesem temporären Passwort anmelden"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You must set a new one from the user's preferences."
+#~ msgstr "Sie müssen ein neues in den Benutzer-Einstellungen eingeben."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "to"
+#~ msgstr "an"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "tryton://"
+#~ msgstr "tryton://"
+
+#~ msgctxt "report:res.user.email_reset_password:"
#~ msgid "https://";
#~ msgstr "https://";
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/el.po
--- a/trytond/trytond/res/locale/el.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/el.po Thu Oct 01 23:48:20 2020 +0000
@@ -449,6 +449,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr ""
@@ -511,41 +515,23 @@
msgid "User Warning"
msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
#, fuzzy
msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Reset Password"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
msgstr ""
msgctxt "selection:res.user.application,state:"
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/es.po
--- a/trytond/trytond/res/locale/es.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/es.po Thu Oct 01 23:48:20 2020 +0000
@@ -442,6 +442,11 @@
msgid "Any view search"
msgstr "Cualquier vista de búsqueda"
+#, fuzzy
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr "Vista de búsqueda propia"
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "Grupo de reglas - Grupo"
@@ -503,42 +508,23 @@
msgstr "Aviso usuario"
msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ", ha sido restablecida."
-
-msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Restablecer contraseña"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr "La contraseña de su cuenta,"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
+msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr "La contraseña caducará el"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
-msgstr "UTC"
-
+#, fuzzy
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr "Podéis conectar con esta contraseña temporal"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-"Debéis establecer una nueva contraseña desde las preferencias de vuestro "
-"usuario."
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr "a"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
-msgstr "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
+msgstr "La contraseña caducará el"
msgctxt "selection:res.user.application,state:"
msgid "Cancelled"
@@ -605,6 +591,36 @@
msgstr "Finalizar"
#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid ", has been reset."
+#~ msgstr ", ha sido restablecida."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "The password for your account,"
+#~ msgstr "La contraseña de su cuenta,"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "UTC"
+#~ msgstr "UTC"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You can connect with this temporary password"
+#~ msgstr "Podéis conectar con esta contraseña temporal"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You must set a new one from the user's preferences."
+#~ msgstr ""
+#~ "Debéis establecer una nueva contraseña desde las preferencias de vuestro "
+#~ "usuario."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "to"
+#~ msgstr "a"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "tryton://"
+#~ msgstr "tryton://"
+
+#~ msgctxt "report:res.user.email_reset_password:"
#~ msgid "https://";
#~ msgstr "https://";
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/es_419.po
--- a/trytond/trytond/res/locale/es_419.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/es_419.po Thu Oct 01 23:48:20 2020 +0000
@@ -440,6 +440,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr ""
@@ -504,39 +508,21 @@
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
msgstr ""
msgctxt "selection:res.user.application,state:"
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/et.po
--- a/trytond/trytond/res/locale/et.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/et.po Thu Oct 01 23:48:20 2020 +0000
@@ -443,6 +443,11 @@
msgid "Any view search"
msgstr "Kõigi vaate otsing"
+#, fuzzy
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr "Oma vaate otsing"
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "Reegli grupp - Grupp"
@@ -504,40 +509,23 @@
msgstr "Kasutaja hoiatus"
msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ", on lähtestatud."
-
-msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Salasõna lähtestamine"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr "Konto salasõna on,"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
+msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr "Salasõna aegub"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
-msgstr "UTC"
-
+#, fuzzy
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr "Saate kasutada ajutist salasõna"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr "Seadistage uus kasutaja eelistuste alt."
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr "kuni"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
-msgstr "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
+msgstr "Salasõna aegub"
msgctxt "selection:res.user.application,state:"
msgid "Cancelled"
@@ -605,6 +593,34 @@
msgstr "Lõpp"
#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid ", has been reset."
+#~ msgstr ", on lähtestatud."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "The password for your account,"
+#~ msgstr "Konto salasõna on,"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "UTC"
+#~ msgstr "UTC"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You can connect with this temporary password"
+#~ msgstr "Saate kasutada ajutist salasõna"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You must set a new one from the user's preferences."
+#~ msgstr "Seadistage uus kasutaja eelistuste alt."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "to"
+#~ msgstr "kuni"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "tryton://"
+#~ msgstr "tryton://"
+
+#~ msgctxt "report:res.user.email_reset_password:"
#~ msgid "https://";
#~ msgstr "https://";
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/eu.po
--- a/trytond/trytond/res/locale/eu.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/eu.po Thu Oct 01 23:48:20 2020 +0000
@@ -432,6 +432,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr ""
@@ -493,39 +497,21 @@
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
msgstr ""
msgctxt "selection:res.user.application,state:"
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/fa.po
--- a/trytond/trytond/res/locale/fa.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/fa.po Thu Oct 01 23:48:20 2020 +0000
@@ -443,6 +443,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "گروه قانون - گروه"
@@ -504,40 +508,23 @@
msgstr "هشدار کاربر"
msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr "، تنظیم مجدد شد."
-
-msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "بازنشانی کلمه عبور"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr "کلمه عبورحساب کاربری شما،"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
+msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr "کلمه عبور شما منقضی میشود در"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
-msgstr "UTC"
-
+#, fuzzy
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr "شما می توانید با این کلمه عبور موقت ارتباط برقرار کنید"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr "شما باید یک تزئین جدید برای ظاهرمحیط کاربری خود تنظیم کنید."
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr "به"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
-msgstr "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
+msgstr "کلمه عبور شما منقضی میشود در"
msgctxt "selection:res.user.application,state:"
msgid "Cancelled"
@@ -605,6 +592,34 @@
msgstr "تاریخ پایان"
#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid ", has been reset."
+#~ msgstr "، تنظیم مجدد شد."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "The password for your account,"
+#~ msgstr "کلمه عبورحساب کاربری شما،"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "UTC"
+#~ msgstr "UTC"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You can connect with this temporary password"
+#~ msgstr "شما می توانید با این کلمه عبور موقت ارتباط برقرار کنید"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You must set a new one from the user's preferences."
+#~ msgstr "شما باید یک تزئین جدید برای ظاهرمحیط کاربری خود تنظیم کنید."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "to"
+#~ msgstr "به"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "tryton://"
+#~ msgstr "tryton://"
+
+#~ msgctxt "report:res.user.email_reset_password:"
#~ msgid "https://";
#~ msgstr "https://";
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/fi.po
--- a/trytond/trytond/res/locale/fi.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/fi.po Thu Oct 01 23:48:20 2020 +0000
@@ -449,6 +449,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr ""
@@ -511,41 +515,23 @@
msgid "User Warning"
msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
#, fuzzy
msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Reset Password"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
msgstr ""
msgctxt "selection:res.user.application,state:"
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/fr.po
--- a/trytond/trytond/res/locale/fr.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/fr.po Thu Oct 01 23:48:20 2020 +0000
@@ -444,6 +444,11 @@
msgid "Any view search"
msgstr "N'importe quelle recherche de vue"
+#, fuzzy
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr "Recherche de vue propre"
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "Groupe de règle - Groupe"
@@ -505,40 +510,23 @@
msgstr "Avertissement utilisateur"
msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ", a été envoyé."
-
-msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Réinitialisation de mot de passe"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr "Le mot de passe pour votre compte,"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
+msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr "Le mot de passe expirera le"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
-msgstr "UTC"
-
+#, fuzzy
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr "Vous pouvez vous connecter avec ce mot de passe temporaire"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr "Vous devez en définir un nouveau depuis les préférences d'utilisateur."
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr "à"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
-msgstr "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
+msgstr "Le mot de passe expirera le"
msgctxt "selection:res.user.application,state:"
msgid "Cancelled"
@@ -605,6 +593,35 @@
msgstr "Terminer"
#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid ", has been reset."
+#~ msgstr ", a été envoyé."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "The password for your account,"
+#~ msgstr "Le mot de passe pour votre compte,"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "UTC"
+#~ msgstr "UTC"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You can connect with this temporary password"
+#~ msgstr "Vous pouvez vous connecter avec ce mot de passe temporaire"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You must set a new one from the user's preferences."
+#~ msgstr ""
+#~ "Vous devez en définir un nouveau depuis les préférences d'utilisateur."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "to"
+#~ msgstr "à"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "tryton://"
+#~ msgstr "tryton://"
+
+#~ msgctxt "report:res.user.email_reset_password:"
#~ msgid "https://";
#~ msgstr "https://";
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/hu.po
--- a/trytond/trytond/res/locale/hu.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/hu.po Thu Oct 01 23:48:20 2020 +0000
@@ -456,6 +456,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "Csoportszabály- csoport"
@@ -520,41 +524,23 @@
msgid "User Warning"
msgstr "Felhasználó figyelmeztetés"
-msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
#, fuzzy
msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Reset Password"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
msgstr ""
msgctxt "selection:res.user.application,state:"
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/id.po
--- a/trytond/trytond/res/locale/id.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/id.po Thu Oct 01 23:48:20 2020 +0000
@@ -439,6 +439,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr ""
@@ -500,41 +504,23 @@
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ", sudah diatur ulang."
-
-msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Atur Ulang Kata Sandi"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
-msgstr "UTC"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
+msgid "The password will expire at [1:%(datetime)s UTC]."
msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
-msgstr "tryton://"
-
msgctxt "selection:res.user.application,state:"
msgid "Cancelled"
msgstr ""
@@ -600,6 +586,18 @@
msgstr "Akhir"
#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid ", has been reset."
+#~ msgstr ", sudah diatur ulang."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "UTC"
+#~ msgstr "UTC"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "tryton://"
+#~ msgstr "tryton://"
+
+#~ msgctxt "report:res.user.email_reset_password:"
#~ msgid "https://";
#~ msgstr "https://";
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/it.po
--- a/trytond/trytond/res/locale/it.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/it.po Thu Oct 01 23:48:20 2020 +0000
@@ -445,6 +445,11 @@
msgid "Any view search"
msgstr "Qualsiasi ricerca vista"
+#, fuzzy
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr "Qualsiasi ricerca vista"
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "Regola Gruppo - Gruppo"
@@ -505,43 +510,25 @@
msgid "User Warning"
msgstr "Gruppi Utente"
-msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
#, fuzzy
msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Reset Password"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
-msgstr "UTC"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
+msgid "The password will expire at [1:%(datetime)s UTC]."
msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
-msgstr "tryton://"
-
msgctxt "selection:res.user.application,state:"
msgid "Cancelled"
msgstr "Annullato"
@@ -608,6 +595,14 @@
msgid "End"
msgstr "Fine"
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "UTC"
+#~ msgstr "UTC"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "tryton://"
+#~ msgstr "tryton://"
+
#, fuzzy
#~ msgctxt "field:ir.action-res.group,create_date:"
#~ msgid "Created at"
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/ja.po
--- a/trytond/trytond/res/locale/ja.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/ja.po Thu Oct 01 23:48:20 2020 +0000
@@ -449,6 +449,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr ""
@@ -511,41 +515,23 @@
msgid "User Warning"
msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
#, fuzzy
msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Reset Password"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
msgstr ""
msgctxt "selection:res.user.application,state:"
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/lo.po
--- a/trytond/trytond/res/locale/lo.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/lo.po Thu Oct 01 23:48:20 2020 +0000
@@ -450,6 +450,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "ກຸ່ມກົດລະບຽບ - ກຸ່ມ"
@@ -514,41 +518,23 @@
msgid "User Warning"
msgstr "ຄຳເຕືອນຜູ້ໃຊ້ງານ"
-msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
#, fuzzy
msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Reset Password"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
msgstr ""
msgctxt "selection:res.user.application,state:"
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/lt.po
--- a/trytond/trytond/res/locale/lt.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/lt.po Thu Oct 01 23:48:20 2020 +0000
@@ -448,6 +448,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "Grupės taisyklė - grupė"
@@ -509,40 +513,23 @@
msgstr "Perspėjimai naudotojui"
msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Atstatyti slaptažodį"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr "Jūsų paskyros slaptažodis"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
+msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr "Slaptažodžio galiojimas baigsis"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
-msgstr "UTC"
-
+#, fuzzy
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr "Galite prisijungti su šiuo laikinu slaptažodžiu"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr "Turite pasirinkti naują jūsų naudotojo nuostatose."
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr "į"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
-msgstr ""
+msgid "The password will expire at [1:%(datetime)s UTC]."
+msgstr "Slaptažodžio galiojimas baigsis"
msgctxt "selection:res.user.application,state:"
msgid "Cancelled"
@@ -608,6 +595,26 @@
msgid "End"
msgstr "Pabaigti"
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "The password for your account,"
+#~ msgstr "Jūsų paskyros slaptažodis"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "UTC"
+#~ msgstr "UTC"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You can connect with this temporary password"
+#~ msgstr "Galite prisijungti su šiuo laikinu slaptažodžiu"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You must set a new one from the user's preferences."
+#~ msgstr "Turite pasirinkti naują jūsų naudotojo nuostatose."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "to"
+#~ msgstr "į"
+
#, fuzzy
#~ msgctxt "field:ir.action-res.group,create_date:"
#~ msgid "Created at"
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/nl.po
--- a/trytond/trytond/res/locale/nl.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/nl.po Thu Oct 01 23:48:20 2020 +0000
@@ -444,6 +444,11 @@
msgid "Any view search"
msgstr "Elke weergave zoeken"
+#, fuzzy
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr "Eigen zoekfunctie"
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "Regelgroep - Groep"
@@ -505,40 +510,23 @@
msgstr "Gebruikerswaarschuwing"
msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ", is gereset."
-
-msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Reset wachtwoord"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr "Het wachtwoord voor uw account,"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
+msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr "Het wachtwoord verloopt op"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
-msgstr "UTC"
-
+#, fuzzy
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr "U kunt verbinding maken met dit tijdelijke wachtwoord"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr "U moet een nieuwe invoeren in de gebruikersinstellingen."
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr "aan"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
-msgstr "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
+msgstr "Het wachtwoord verloopt op"
msgctxt "selection:res.user.application,state:"
msgid "Cancelled"
@@ -605,6 +593,34 @@
msgstr "Einde"
#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid ", has been reset."
+#~ msgstr ", is gereset."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "The password for your account,"
+#~ msgstr "Het wachtwoord voor uw account,"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "UTC"
+#~ msgstr "UTC"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You can connect with this temporary password"
+#~ msgstr "U kunt verbinding maken met dit tijdelijke wachtwoord"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You must set a new one from the user's preferences."
+#~ msgstr "U moet een nieuwe invoeren in de gebruikersinstellingen."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "to"
+#~ msgstr "aan"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "tryton://"
+#~ msgstr "tryton://"
+
+#~ msgctxt "report:res.user.email_reset_password:"
#~ msgid "https://";
#~ msgstr "https://";
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/pl.po
--- a/trytond/trytond/res/locale/pl.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/pl.po Thu Oct 01 23:48:20 2020 +0000
@@ -447,6 +447,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "Grupa reguł - Grupa"
@@ -508,40 +512,23 @@
msgstr "Ostrzeżenie użytkownika"
msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Zresetuj hasło"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr "Hasło dla twojego konta,"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr "Hasło wygaśnie"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
-msgstr "UTC"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr "Możesz połączyć się za pomocą tymczasowego hasła"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
+#, fuzzy
msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr "do"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
-msgstr "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
+msgstr "Hasło wygaśnie"
msgctxt "selection:res.user.application,state:"
msgid "Cancelled"
@@ -608,6 +595,26 @@
msgstr "Koniec"
#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "The password for your account,"
+#~ msgstr "Hasło dla twojego konta,"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "UTC"
+#~ msgstr "UTC"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You can connect with this temporary password"
+#~ msgstr "Możesz połączyć się za pomocą tymczasowego hasła"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "to"
+#~ msgstr "do"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "tryton://"
+#~ msgstr "tryton://"
+
+#~ msgctxt "report:res.user.email_reset_password:"
#~ msgid "https://";
#~ msgstr "https://";
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/pt.po
--- a/trytond/trytond/res/locale/pt.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/pt.po Thu Oct 01 23:48:20 2020 +0000
@@ -443,6 +443,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "Regra Grupo - Grupo"
@@ -504,40 +508,23 @@
msgstr "Alerta de Usuário"
msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ", foi redefinida."
-
-msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Redefinir senha"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr "A senha para sua conta,"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
+msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr "A senha irá expirar em"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
-msgstr "UTC"
-
+#, fuzzy
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr "Você pode corrigir com esta senha temporária"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr "Você precisa definir uma nova senha nas preferências do usuário."
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr "para"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
-msgstr "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
+msgstr "A senha irá expirar em"
msgctxt "selection:res.user.application,state:"
msgid "Cancelled"
@@ -605,6 +592,34 @@
msgstr "Fim"
#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid ", has been reset."
+#~ msgstr ", foi redefinida."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "The password for your account,"
+#~ msgstr "A senha para sua conta,"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "UTC"
+#~ msgstr "UTC"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You can connect with this temporary password"
+#~ msgstr "Você pode corrigir com esta senha temporária"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You must set a new one from the user's preferences."
+#~ msgstr "Você precisa definir uma nova senha nas preferências do usuário."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "to"
+#~ msgstr "para"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "tryton://"
+#~ msgstr "tryton://"
+
+#~ msgctxt "report:res.user.email_reset_password:"
#~ msgid "https://";
#~ msgstr "https://";
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/ro.po
--- a/trytond/trytond/res/locale/ro.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/ro.po Thu Oct 01 23:48:20 2020 +0000
@@ -440,6 +440,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr ""
@@ -501,39 +505,21 @@
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
msgstr ""
msgctxt "selection:res.user.application,state:"
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/ru.po
--- a/trytond/trytond/res/locale/ru.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/ru.po Thu Oct 01 23:48:20 2020 +0000
@@ -450,6 +450,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "Правило группы - Группа"
@@ -514,41 +518,23 @@
msgid "User Warning"
msgstr "Внимание Пользователь"
-msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
#, fuzzy
msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Reset Password"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
msgstr ""
msgctxt "selection:res.user.application,state:"
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/sl.po
--- a/trytond/trytond/res/locale/sl.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/sl.po Thu Oct 01 23:48:20 2020 +0000
@@ -450,6 +450,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "Skupina pravila - Skupina"
@@ -514,41 +518,23 @@
msgid "User Warning"
msgstr "Uporabniško opozorilo"
-msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
#, fuzzy
msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Reset Password"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
msgstr ""
msgctxt "selection:res.user.application,state:"
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/tr.po
--- a/trytond/trytond/res/locale/tr.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/tr.po Thu Oct 01 23:48:20 2020 +0000
@@ -449,6 +449,10 @@
msgid "Any view search"
msgstr ""
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr ""
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr ""
@@ -511,41 +515,23 @@
msgid "User Warning"
msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ""
-
#, fuzzy
msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "Reset Password"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
msgstr ""
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr ""
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
msgstr ""
msgctxt "selection:res.user.application,state:"
diff -r ff85374dd5ec -r 03af688c1a03 trytond/trytond/res/locale/zh_CN.po
--- a/trytond/trytond/res/locale/zh_CN.po Thu Oct 01 23:47:14 2020 +0000
+++ b/trytond/trytond/res/locale/zh_CN.po Thu Oct 01 23:48:20 2020 +0000
@@ -439,6 +439,11 @@
msgid "Any view search"
msgstr "任意的视图搜索"
+#, fuzzy
+msgctxt "model:ir.rule.group,name:rule_group_view_search_common"
+msgid "Common view search"
+msgstr "自己的视图搜索"
+
msgctxt "model:ir.rule.group-res.group,name:"
msgid "Rule Group - Group"
msgstr "规则组 - 用户组"
@@ -500,40 +505,23 @@
msgstr "用户警告"
msgctxt "report:res.user.email_reset_password:"
-msgid ", has been reset."
-msgstr ", 哟经被重置."
-
-msgctxt "report:res.user.email_reset_password:"
msgid "Reset Password"
msgstr "重置密码"
msgctxt "report:res.user.email_reset_password:"
-msgid "The password for your account,"
-msgstr "你的账号的密码,"
+msgid ""
+"The password for your account, [1:%(login)s], has been reset.[2:]\n"
+" You must set a new one from the user's preferences.[3:]\n"
+" You can connect with this temporary password [4:"
+"%(password)s] to[5:]\n"
+" [6:tryton://%(host)s/%(database)s][7:]\n"
+" [8:%(host)s/#%(database)s]"
+msgstr ""
-msgctxt "report:res.user.email_reset_password:"
-msgid "The password will expire at"
-msgstr "密码过期时间是"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "UTC"
-msgstr "UTC"
-
+#, fuzzy
msgctxt "report:res.user.email_reset_password:"
-msgid "You can connect with this temporary password"
-msgstr "您可以使用此临时密码连接"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "You must set a new one from the user's preferences."
-msgstr "必须从用户首选项中设置一个新的."
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "to"
-msgstr "to"
-
-msgctxt "report:res.user.email_reset_password:"
-msgid "tryton://"
-msgstr "tryton://"
+msgid "The password will expire at [1:%(datetime)s UTC]."
+msgstr "密码过期时间是"
msgctxt "selection:res.user.application,state:"
msgid "Cancelled"
@@ -600,6 +588,34 @@
msgstr "完成"
#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid ", has been reset."
+#~ msgstr ", 哟经被重置."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "The password for your account,"
+#~ msgstr "你的账号的密码,"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "UTC"
+#~ msgstr "UTC"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You can connect with this temporary password"
+#~ msgstr "您可以使用此临时密码连接"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "You must set a new one from the user's preferences."
+#~ msgstr "必须从用户首选项中设置一个新的."
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "to"
+#~ msgstr "to"
+
+#~ msgctxt "report:res.user.email_reset_password:"
+#~ msgid "tryton://"
+#~ msgstr "tryton://"
+
+#~ msgctxt "report:res.user.email_reset_password:"
#~ msgid "https://";
#~ msgstr "https://";
