Fixed merge conflict

frappe/templates/pages/integrations/payment-success.html

@@ -3,7 +3,7 @@
 {% block title %}{{ _("Payment Success") }}{% endblock %}
 
 {%- block header -%}
-<h2>{{ _("Payment Success") }}<h2>
+<h2>{{ _("Payment Success") }}</h2>
 {% endblock %}
 
 {%- block page_content -%}

frappe/translations/es.csv

@@ -2842,4 +2842,4 @@ DocType: Translation,"If your data is in HTML, please copy paste the exact HTML
 apps/frappe/frappe/utils/csvutils.py +35,Unable to open attached file. Did you export it as CSV?,No se puede abrir el archivo adjunto. Ha exportado como CSV?
 DocType: DocField,Ignore User Permissions,Ignorar los permisos de usuario
 apps/frappe/frappe/core/doctype/user/user.py +736,Please ask your administrator to verify your sign-up,"Por favor, consulte a su administrador para verificar su registro"
-apps/frappe/frappe/public/js/integrations/razorpay.js +21,Show Log,Mostrar registro
+apps/frappe/frappe/public/js/integrations/razorpay.js +21,Show Log,Mostrar registro

frappe/translations/fi.csv

@@ -2831,4 +2831,4 @@ DocType: Translation,"If your data is in HTML, please copy paste the exact HTML
 apps/frappe/frappe/utils/csvutils.py +35,Unable to open attached file. Did you export it as CSV?,Ei voi avata liitetiedosto. Oletko viedä sen CSV?
 DocType: DocField,Ignore User Permissions,ohita käyttäjäoikeudet
 apps/frappe/frappe/core/doctype/user/user.py +736,Please ask your administrator to verify your sign-up,Pyydä ylläpitäjää tarkistaa rekisteröitymisen
-apps/frappe/frappe/public/js/integrations/razorpay.js +21,Show Log,Näytä loki
+apps/frappe/frappe/public/js/integrations/razorpay.js +21,Show Log,Näytä loki

frappe/translations/fr.csv

@@ -1213,7 +1213,7 @@ apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +129,"Import R
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +162,No Permissions set for this criteria.,Aucune Autorisations définies pour ce critère.
 DocType: Auto Email Report,Auto Email Report,Rapport par Email Automatique
 apps/frappe/frappe/core/page/usage_info/usage_info.html +51,Max Emails,Nombre Max d'E-mails
-apps/frappe/frappe/public/js/frappe/form/footer/timeline.js +574,Delete comment?,Supprimer le commentaire ?
+apps/frappe/frappe/public/js/frappe/form/footer/timeline.js +574,Delete comment?,Supprimer le commentaire ?
 DocType: Address Template,This format is used if country specific format is not found,Ce format est utilisé si un format spécifique au pays n'est pas trouvé
 apps/frappe/frappe/public/js/frappe/request.js +104,You do not have enough permissions to access this resource. Please contact your manager to get access.,Vous ne disposez pas de suffisamment d'autorisations pour accéder à cette ressource. Veuillez contacter votre responsable pour obtenir l'accès.
 DocType: Custom Field,Custom,Personnaliser
@@ -2130,7 +2130,7 @@ apps/frappe/frappe/printing/page/print_format_builder/print_format_builder.js +4
 apps/frappe/frappe/www/update-password.html +14,Old Password,Ancien Mot De Passe
 apps/frappe/frappe/website/doctype/blog_post/blog_post.py +102,Posts by {0},Messages de {0}
 apps/frappe/frappe/core/doctype/report/report.js +9,"To format columns, give column labels in the query.","Pour formater des colonnes, donnez des étiquettes de colonne dans la requête."
-apps/frappe/frappe/www/login.html +67,Don't have an account? Sign up,Vous n’avez pas encore de compte ? Inscrivez-vous
+apps/frappe/frappe/www/login.html +67,Don't have an account? Sign up,Vous n’avez pas encore de compte ? Inscrivez-vous
 apps/frappe/frappe/core/doctype/doctype/doctype.py +691,{0}: Cannot set Assign Amend if not Submittable,{0} : Impossible de définir ‘Assigner Modifier’ si non Soumissible
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +14,Edit Role Permissions,Modifier les Autorisations de Rôle
 DocType: Communication,Link DocType,DocType du Lien
@@ -2525,7 +2525,7 @@ apps/frappe/frappe/email/doctype/email_alert/email_alert.py +106,"Not allowed to
 apps/frappe/frappe/www/contact.py +54,New Message from Website Contact Page,Nouveau Message depuis la Page Contact du Site Web
 DocType: Email Alert,Reference Date,Date de Référence
 apps/frappe/frappe/public/js/frappe/desk.js +17,Some of the features might not work in your browser. Please update your browser to the latest version.,Certaines des fonctionnalités peuvent ne pas fonctionner dans votre navigateur. Veuillez mettre à jour votre navigateur vers la dernière version.
-apps/frappe/frappe/utils/bot.py +185,"Don't know, ask 'help'","Vous ne savez pas, demandez de l’ ‘aide’"
+apps/frappe/frappe/utils/bot.py +185,"Don't know, ask 'help'","Vous ne savez pas, demandez de l’ ‘aide’"
 DocType: DocType,Comments and Communications will be associated with this linked document,Commentaires et Communications seront associés à ce document lié
 apps/frappe/frappe/printing/page/print_format_builder/print_format_builder_sidebar.html +3,Filter...,Filtre ...
 DocType: Workflow State,bold,gras
@@ -2846,4 +2846,4 @@ DocType: Translation,"If your data is in HTML, please copy paste the exact HTML
 apps/frappe/frappe/utils/csvutils.py +35,Unable to open attached file. Did you export it as CSV?,Impossible d'ouvrir le fichier joint. L'avez-vous exporté au format CSV ?
 DocType: DocField,Ignore User Permissions,Ignorer les Autorisations des Utilisateurs
 apps/frappe/frappe/core/doctype/user/user.py +736,Please ask your administrator to verify your sign-up,Veuillez demander à votre administrateur de vérifier votre inscription
-apps/frappe/frappe/public/js/integrations/razorpay.js +21,Show Log,Afficher le Journal
+apps/frappe/frappe/public/js/integrations/razorpay.js +21,Show Log,Afficher le Journal

frappe/translations/it.csv

@@ -2845,4 +2845,4 @@ DocType: Translation,"If your data is in HTML, please copy paste the exact HTML
 apps/frappe/frappe/utils/csvutils.py +35,Unable to open attached file. Did you export it as CSV?,Impossibile aprire il file allegato. E' stato esportato in formato CSV?
 DocType: DocField,Ignore User Permissions,Ignora autorizzazioni utente
 apps/frappe/frappe/core/doctype/user/user.py +736,Please ask your administrator to verify your sign-up,Si prega di chiedere all'amministratore di verificare la tua iscrizione
-apps/frappe/frappe/public/js/integrations/razorpay.js +21,Show Log,Mostra registro
+apps/frappe/frappe/public/js/integrations/razorpay.js +21,Show Log,Mostra registro

frappe/translations/kn.csv

@@ -2909,4 +2909,4 @@ DocType: Translation,"If your data is in HTML, please copy paste the exact HTML
 apps/frappe/frappe/utils/csvutils.py +35,Unable to open attached file. Did you export it as CSV?,ಲಗತ್ತಿಸಲಾದ ಫೈಲ್ ತೆರೆಯಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ. ನೀವು CSV ಮಾಹಿತಿ ಇದು ರಫ್ತು ಮಾಡಲಿಲ್ಲ?
 DocType: DocField,Ignore User Permissions,ಬಳಕೆದಾರ ಅನುಮತಿಗಳು ನಿರ್ಲಕ್ಷಿಸು
 apps/frappe/frappe/core/doctype/user/user.py +736,Please ask your administrator to verify your sign-up,ನಿಮ್ಮ ಸೈನ್ ಅಪ್ ಪರಿಶೀಲಿಸಲು ದಯವಿಟ್ಟು ನಿಮ್ಮ ನಿರ್ವಾಹಕರಿಗೆ ತಿಳಿಸಿ
-apps/frappe/frappe/public/js/integrations/razorpay.js +21,Show Log,ಲಾಗ್ ಶೋ
+apps/frappe/frappe/public/js/integrations/razorpay.js +21,Show Log,ಲಾಗ್ ಶೋ

frappe/translations/pt-BR.csv

@@ -1601,4 +1601,4 @@ DocType: Web Form,Amount Field,Campo Valor
 DocType: Dropbox Settings,Send Notifications To,Enviar Notificações para
 DocType: Bulk Update,Max 500 records at a time,Máximo de  500 registros por vez
 apps/frappe/frappe/utils/csvutils.py +35,Unable to open attached file. Did you export it as CSV?,Foi impossível abrir o arquivo anexado. Você o exportou como CSV?
-DocType: DocField,Ignore User Permissions,Ignorar permissões de usuário
+DocType: DocField,Ignore User Permissions,Ignorar permissões de usuário