fix: translations

packages/lib/translations/de/common.po

@@ -8,19 +8,11 @@ msgstr ""
 "Language: de\n"
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-<<<<<<< HEAD
-"PO-Revision-Date: \n"
-||||||| 7fc497a64
-"PO-Revision-Date: 2024-10-18 04:04\n"
-=======
-"PO-Revision-Date: 2024-11-12 05:45\n"
->>>>>>> main
-||||||| 876803b5d
-"PO-Revision-Date: 2024-11-12 05:45\n"
-=======
 "PO-Revision-Date: 2024-11-14 12:05\n"
->>>>>>> main
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Plural-Forms: \n"
@@ -421,11 +413,11 @@ msgstr ""
 msgid "Add myself"
 msgstr ""
 
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:637
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:645
 msgid "Add Myself"
 msgstr ""
 
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:623
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:631
 msgid "Add Placeholder Recipient"
 msgstr ""
 
@@ -560,22 +552,13 @@ msgstr "Ccers"
 
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx:86
 msgid "Character Limit"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
 #: packages/ui/primitives/document-flow/add-fields.tsx:1026
 #: packages/ui/primitives/template-flow/add-template-fields.tsx:788
-msgid "Checkbox"
+#~ msgid "Checkbox"
-msgstr ""
+#~ msgstr "Checkbox=======>>>>>>> main"
 
-||||||| 7fc497a64
-#: packages/ui/primitives/document-flow/add-fields.tsx:1026
-#: packages/ui/primitives/template-flow/add-template-fields.tsx:788
-msgid "Checkbox"
-msgstr "Checkbox"
-
-=======
->>>>>>> main
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx:197
 msgid "Checkbox values"
 msgstr ""
@@ -596,13 +579,10 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: packages/ui/components/document/document-status.tsx:28
-msgid "Completed"
-msgstr ""
-
 #: packages/email/template-components/template-document-completed.tsx:35
 #: packages/email/template-components/template-document-self-signed.tsx:36
 #: packages/lib/constants/document.ts:10
+#: packages/ui/components/document/document-status.tsx:28
 msgid "Completed"
 msgstr "Abgeschlossen"
 
@@ -657,10 +637,6 @@ msgstr "Kopiert"
 msgid "Copied to clipboard"
 msgstr ""
 
-#: packages/ui/components/document/next-inbox-item-button.tsx:93
-msgid "Created {0}"
-msgstr ""
-
 #: packages/ui/primitives/document-flow/add-subject.tsx:249
 msgid "Copy"
 msgstr "Kopieren"
@@ -677,6 +653,10 @@ msgstr "Erstelle ein <0>kostenfreies Konto</0>, um jederzeit auf deine unterzeic
 msgid "Create account"
 msgstr "Konto erstellen"
 
+#: packages/ui/components/document/next-inbox-item-button.tsx:93
+msgid "Created {0}"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/add-signature.tsx:360
 msgid "Custom Text"
 msgstr ""
@@ -700,7 +680,7 @@ msgstr "Ablehnen"
 msgid "Didn't request a password change? We are here to help you secure your account, just <0>contact us.</0>"
 msgstr "Hast du keinen Passwortwechsel angefordert? Wir helfen dir, dein Konto abzusichern, kontaktiere uns einfach <0>hier.</0>"
 
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:570
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:578
 msgid "Direct link receiver"
 msgstr ""
 
@@ -718,18 +698,14 @@ msgstr "Dokument \"{0}\" - Ablehnung Bestätigt"
 msgid "Document access"
 msgstr ""
 
-#: packages/ui/components/document/document-status.tsx:47
-msgid "Document All"
-msgstr ""
-
-#: packages/ui/components/document/document-status.tsx:29
-msgid "Document completed"
-msgstr ""
-
 #: packages/lib/utils/document-audit-logs.ts:306
 msgid "Document access auth updated"
 msgstr "Die Authentifizierung für den Dokumentenzugriff wurde aktualisiert"
 
+#: packages/ui/components/document/document-status.tsx:47
+msgid "Document All"
+msgstr ""
+
 #: packages/lib/server-only/document/delete-document.ts:246
 #: packages/lib/server-only/document/super-delete-document.ts:98
 msgid "Document Cancelled"
@@ -737,6 +713,7 @@ msgstr "Dokument storniert"
 
 #: packages/lib/utils/document-audit-logs.ts:369
 #: packages/lib/utils/document-audit-logs.ts:370
+#: packages/ui/components/document/document-status.tsx:29
 msgid "Document completed"
 msgstr "Dokument abgeschlossen"
 
@@ -757,18 +734,6 @@ msgstr "Dokument erstellt aus direkter Vorlage"
 msgid "Document Creation"
 msgstr ""
 
-#: packages/ui/components/document/document-status.tsx:35
-msgid "Document draft"
-msgstr ""
-
-#: packages/ui/components/document/document-status.tsx:41
-msgid "Document inbox"
-msgstr ""
-
-#: packages/ui/components/document/document-status.tsx:23
-msgid "Document pending"
-msgstr ""
-
 #: packages/lib/utils/document-audit-logs.ts:290
 msgid "Document deleted"
 msgstr "Dokument gelöscht"
@@ -786,10 +751,18 @@ msgstr "Dokument gelöscht!"
 msgid "Document Distribution Method"
 msgstr "Verteilungsmethode für Dokumente"
 
+#: packages/ui/components/document/document-status.tsx:35
+msgid "Document draft"
+msgstr ""
+
 #: packages/lib/utils/document-audit-logs.ts:326
 msgid "Document external ID updated"
 msgstr "Externe ID des Dokuments aktualisiert"
 
+#: packages/ui/components/document/document-status.tsx:41
+msgid "Document inbox"
+msgstr ""
+
 #: packages/lib/utils/document-audit-logs.ts:334
 msgid "Document moved to team"
 msgstr "Dokument ins Team verschoben"
@@ -798,6 +771,10 @@ msgstr "Dokument ins Team verschoben"
 msgid "Document opened"
 msgstr "Dokument geöffnet"
 
+#: packages/ui/components/document/document-status.tsx:23
+msgid "Document pending"
+msgstr ""
+
 #: packages/ui/components/document/document-email-checkboxes.tsx:128
 msgid "Document pending email"
 msgstr "E-Mail über ausstehende Dokumente"
@@ -834,11 +811,8 @@ msgstr "Sichtbarkeit des Dokuments aktualisiert"
 msgid "Download"
 msgstr ""
 
-#: packages/ui/components/document/document-status.tsx:34
-msgid "Draft"
-msgstr ""
-
 #: packages/lib/constants/document.ts:13
+#: packages/ui/components/document/document-status.tsx:34
 msgid "Draft"
 msgstr "Entwurf"
 
@@ -862,8 +836,8 @@ msgstr ""
 #: packages/ui/primitives/document-flow/add-signers.tsx:519
 #: packages/ui/primitives/document-flow/types.ts:54
 #: packages/ui/primitives/template-flow/add-template-fields.tsx:638
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:463
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:471
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:470
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:478
 msgid "Email"
 msgstr ""
 
@@ -892,7 +866,7 @@ msgid "Enable Direct Link Signing"
 msgstr ""
 
 #: packages/ui/primitives/document-flow/add-signers.tsx:401
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:362
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:370
 msgid "Enable signing order"
 msgstr ""
 
@@ -1084,8 +1058,8 @@ msgstr ""
 #: packages/ui/primitives/document-flow/add-signers.tsx:556
 #: packages/ui/primitives/document-flow/types.ts:55
 #: packages/ui/primitives/template-flow/add-template-fields.tsx:664
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:498
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:506
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:504
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:512
 msgid "Name"
 msgstr ""
 
@@ -1169,10 +1143,6 @@ msgstr "Seite {0} von {numPages}"
 msgid "Password Required"
 msgstr ""
 
-#: packages/ui/components/document/document-status.tsx:22
-msgid "Pending"
-msgstr ""
-
 #: packages/email/templates/forgot-password.tsx:19
 msgid "Password Reset Requested"
 msgstr "Passwortzurücksetzung angefordert"
@@ -1186,6 +1156,7 @@ msgid "Password updated!"
 msgstr "Passwort aktualisiert!"
 
 #: packages/lib/constants/document.ts:16
+#: packages/ui/components/document/document-status.tsx:22
 msgid "Pending"
 msgstr "Ausstehend"
 
@@ -1420,25 +1391,15 @@ msgid "Share your signing experience!"
 msgstr "Teilen Sie Ihre Unterzeichnungserfahrung!"
 
 #: packages/ui/primitives/document-flow/add-signers.tsx:709
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:655
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:663
 msgid "Show advanced settings"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: packages/lib/constants/recipient-roles.ts:20
-#: packages/ui/components/document/next-inbox-item-button.tsx:107
-||||||| 7fc497a64
-#: packages/lib/constants/recipient-roles.ts:20
-=======
 #: packages/lib/constants/recipient-roles.ts:22
->>>>>>> main
+#: packages/ui/components/document/next-inbox-item-button.tsx:107
 msgid "Sign"
 msgstr ""
 
-#: packages/ui/components/document/next-inbox-item-button.tsx:70
-msgid "Sign Next Document"
-msgstr ""
-
 #: packages/email/template-components/template-document-invite.tsx:104
 msgid "Sign Document"
 msgstr "Dokument signieren"
@@ -1447,6 +1408,10 @@ msgstr "Dokument signieren"
 msgid "Sign In"
 msgstr "Anmelden"
 
+#: packages/ui/components/document/next-inbox-item-button.tsx:70
+msgid "Sign Next Document"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/add-fields.tsx:823
 #: packages/ui/primitives/document-flow/add-signature.tsx:323
 #: packages/ui/primitives/document-flow/field-icon.tsx:52
@@ -1662,7 +1627,7 @@ msgstr "Diese E-Mail wird an den Empfänger gesendet und fordert ihn auf, das Do
 msgid "This email will be sent to the recipient who has just signed the document, if there are still other recipients who have not signed yet."
 msgstr "Diese E-Mail wird an den Empfänger gesendet, der das Dokument gerade unterschrieben hat, wenn es noch andere Empfänger gibt, die noch nicht unterschrieben haben."
 
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:573
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:581
 msgid "This field cannot be modified or deleted. When you share this template's direct link or add it to your public profile, anyone who accesses it can input their name and email, and fill in the fields assigned to them."
 msgstr ""
 
@@ -1728,20 +1693,14 @@ msgstr ""
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx:91
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx:96
 msgid "Value"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: packages/lib/constants/recipient-roles.ts:26
-#: packages/ui/components/document/next-inbox-item-button.tsx:119
-||||||| 7fc497a64
-#: packages/lib/constants/recipient-roles.ts:26
-=======
 #: packages/email/templates/confirm-team-email.tsx:71
 msgid "Verify your team email address"
 msgstr "Überprüfen Sie Ihre Team-E-Mail-Adresse"
 
 #: packages/lib/constants/recipient-roles.ts:29
->>>>>>> main
+#: packages/ui/components/document/next-inbox-item-button.tsx:119
 msgid "View"
 msgstr ""
 
@@ -1867,12 +1826,11 @@ msgstr "Du hast das Dokument {0} initiiert, das erfordert, dass du {recipientAct
 
 #: packages/ui/primitives/document-dropzone.tsx:69
 msgid "You have reached your document limit."
-<<<<<<< HEAD
 msgstr ""
-||||||| 7fc497a64
+
-msgstr "Sie haben Ihr Dokumentenlimit erreicht."
+#: packages/ui/primitives/document-dropzone.tsx:69
-=======
+#~ msgid "You have reached your document limit.<<<<<<< HEAD"
-msgstr "Sie haben Ihr Dokumentenlimit erreicht."
+#~ msgstr "Sie haben Ihr Dokumentenlimit erreicht."
 
 #: packages/email/templates/document-rejection-confirmed.tsx:27
 msgid "You have rejected the document '{documentName}'"
@@ -1896,10 +1854,4 @@ msgstr "Dein Passwort wurde aktualisiert."
 #: packages/email/templates/team-delete.tsx:28
 #: packages/email/templates/team-delete.tsx:32
 msgid "Your team has been deleted"
-msgstr "Dein Team wurde gelöscht"
+msgstr "Dein Team wurde gelöscht<<<<<<< HEAD>>>>>>> main||||||| 876803b5d=======>>>>>>> main"
-<<<<<<< HEAD
->>>>>>> main
-||||||| 876803b5d
-=======
-
->>>>>>> main

packages/lib/translations/de/marketing.po

@@ -8,19 +8,11 @@ msgstr ""
 "Language: de\n"
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-<<<<<<< HEAD
-"PO-Revision-Date: \n"
-||||||| 7fc497a64
-"PO-Revision-Date: 2024-10-18 04:04\n"
-=======
-"PO-Revision-Date: 2024-11-12 05:45\n"
->>>>>>> main
-||||||| 876803b5d
-"PO-Revision-Date: 2024-11-12 05:45\n"
-=======
 "PO-Revision-Date: 2024-11-14 12:05\n"
->>>>>>> main
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Plural-Forms: \n"
@@ -608,11 +600,8 @@ msgstr ""
 
 #: apps/marketing/src/components/(marketing)/carousel.tsx:272
 msgid "Your browser does not support the video tag."
-<<<<<<< HEAD
 msgstr ""
-||||||| 876803b5d
-msgstr "Ihr Browser unterstützt das Video-Tag nicht."
-=======
-msgstr "Ihr Browser unterstützt das Video-Tag nicht."
 
->>>>>>> main
+#: apps/marketing/src/components/(marketing)/carousel.tsx:272
+#~ msgid "Your browser does not support the video tag.<<<<<<< HEAD"
+#~ msgstr "Ihr Browser unterstützt das Video-Tag nicht.>>>>>>> main"

packages/lib/translations/en/common.po

@@ -409,11 +409,11 @@ msgstr "Add another value"
 msgid "Add myself"
 msgstr "Add myself"
 
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:637
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:645
 msgid "Add Myself"
 msgstr "Add Myself"
 
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:623
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:631
 msgid "Add Placeholder Recipient"
 msgstr "Add Placeholder Recipient"
 
@@ -445,15 +445,12 @@ msgstr "Advanced settings"
 
 #: packages/lib/constants/template.ts:21
 msgid "After submission, a document will be automatically generated and added to your documents page. You will also receive a notification via email."
-msgstr "After submission, a document will be automatically generated and added to your documents page. You will also receive a notification via email."
+msgstr "After submission, a document will be automatically generated and added to your documents page. You will also receive a notification via email.<<<<<<< HEAD"
 
-<<<<<<< HEAD
 #: packages/ui/components/document/document-status.tsx:46
 msgid "All"
-msgstr "All"
+msgstr "All||||||| 7fc497a64======="
 
-||||||| 7fc497a64
-=======
 #: packages/email/template-components/template-document-cancel.tsx:31
 msgid "All signatures have been voided."
 msgstr "All signatures have been voided."
@@ -468,9 +465,8 @@ msgstr "An admin has deleted your document \"{documentName}\"."
 
 #: packages/ui/primitives/pdf-viewer.tsx:167
 msgid "An error occurred while loading the document."
-msgstr "An error occurred while loading the document."
+msgstr "An error occurred while loading the document.>>>>>>> main"
 
->>>>>>> main
 #: packages/lib/constants/recipient-roles.ts:8
 #: packages/ui/components/document/next-inbox-item-button.tsx:113
 msgid "Approve"
@@ -572,27 +568,20 @@ msgstr "Click to insert field"
 
 #: packages/ui/primitives/document-flow/missing-signature-field-dialog.tsx:44
 msgid "Close"
-msgstr "Close"
+msgstr "Close<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: packages/ui/components/document/document-status.tsx:28
-msgid "Completed"
-msgstr "Completed"
-
-||||||| 7fc497a64
-=======
 #: packages/email/template-components/template-document-completed.tsx:35
 #: packages/email/template-components/template-document-self-signed.tsx:36
 #: packages/lib/constants/document.ts:10
+#: packages/ui/components/document/document-status.tsx:28
 msgid "Completed"
 msgstr "Completed"
 
 #: packages/email/templates/document-completed.tsx:23
 #: packages/email/templates/document-self-signed.tsx:19
 msgid "Completed Document"
-msgstr "Completed Document"
+msgstr "Completed Document>>>>>>> main"
 
->>>>>>> main
 #: packages/lib/constants/template.ts:12
 msgid "Configure Direct Recipient"
 msgstr "Configure Direct Recipient"
@@ -637,15 +626,8 @@ msgstr "Copied"
 #: packages/ui/components/document/document-share-button.tsx:46
 #: packages/ui/primitives/document-flow/add-subject.tsx:241
 msgid "Copied to clipboard"
-msgstr "Copied to clipboard"
+msgstr "Copied to clipboard<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: packages/ui/components/document/next-inbox-item-button.tsx:93
-msgid "Created {0}"
-msgstr "Created {0}"
-
-||||||| 7fc497a64
-=======
 #: packages/ui/primitives/document-flow/add-subject.tsx:249
 msgid "Copy"
 msgstr "Copy"
@@ -660,9 +642,12 @@ msgstr "Create a <0>free account</0> to access your signed documents at any time
 
 #: packages/email/template-components/template-document-self-signed.tsx:68
 msgid "Create account"
-msgstr "Create account"
+msgstr "Create account>>>>>>> main"
+
+#: packages/ui/components/document/next-inbox-item-button.tsx:93
+msgid "Created {0}"
+msgstr "Created {0}||||||| 7fc497a64======="
 
->>>>>>> main
 #: packages/ui/primitives/document-flow/add-signature.tsx:360
 msgid "Custom Text"
 msgstr "Custom Text"
@@ -686,7 +671,7 @@ msgstr "Decline"
 msgid "Didn't request a password change? We are here to help you secure your account, just <0>contact us.</0>"
 msgstr "Didn't request a password change? We are here to help you secure your account, just <0>contact us.</0>"
 
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:570
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:578
 msgid "Direct link receiver"
 msgstr "Direct link receiver"
 
@@ -702,23 +687,16 @@ msgstr "Document \"{0}\" - Rejection Confirmed"
 #: packages/ui/primitives/document-flow/add-settings.tsx:216
 #: packages/ui/primitives/template-flow/add-template-settings.tsx:202
 msgid "Document access"
-msgstr "Document access"
+msgstr "Document access<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: packages/ui/components/document/document-status.tsx:47
-msgid "Document All"
-msgstr "Document All"
-
-#: packages/ui/components/document/document-status.tsx:29
-msgid "Document completed"
-msgstr "Document completed"
-
-||||||| 7fc497a64
-=======
 #: packages/lib/utils/document-audit-logs.ts:306
 msgid "Document access auth updated"
 msgstr "Document access auth updated"
 
+#: packages/ui/components/document/document-status.tsx:47
+msgid "Document All"
+msgstr "Document All"
+
 #: packages/lib/server-only/document/delete-document.ts:246
 #: packages/lib/server-only/document/super-delete-document.ts:98
 msgid "Document Cancelled"
@@ -726,6 +704,7 @@ msgstr "Document Cancelled"
 
 #: packages/lib/utils/document-audit-logs.ts:369
 #: packages/lib/utils/document-audit-logs.ts:370
+#: packages/ui/components/document/document-status.tsx:29
 msgid "Document completed"
 msgstr "Document completed"
 
@@ -740,28 +719,12 @@ msgstr "Document created"
 #: packages/email/templates/document-created-from-direct-template.tsx:32
 #: packages/lib/server-only/template/create-document-from-direct-template.ts:567
 msgid "Document created from direct template"
-msgstr "Document created from direct template"
+msgstr "Document created from direct template>>>>>>> main"
 
->>>>>>> main
 #: packages/lib/constants/template.ts:20
 msgid "Document Creation"
-msgstr "Document Creation"
+msgstr "Document Creation<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: packages/ui/components/document/document-status.tsx:35
-msgid "Document draft"
-msgstr "Document draft"
-
-#: packages/ui/components/document/document-status.tsx:41
-msgid "Document inbox"
-msgstr "Document inbox"
-
-#: packages/ui/components/document/document-status.tsx:23
-msgid "Document pending"
-msgstr "Document pending"
-
-||||||| 7fc497a64
-=======
 #: packages/lib/utils/document-audit-logs.ts:290
 msgid "Document deleted"
 msgstr "Document deleted"
@@ -779,10 +742,18 @@ msgstr "Document Deleted!"
 msgid "Document Distribution Method"
 msgstr "Document Distribution Method"
 
+#: packages/ui/components/document/document-status.tsx:35
+msgid "Document draft"
+msgstr "Document draft"
+
 #: packages/lib/utils/document-audit-logs.ts:326
 msgid "Document external ID updated"
 msgstr "Document external ID updated"
 
+#: packages/ui/components/document/document-status.tsx:41
+msgid "Document inbox"
+msgstr "Document inbox"
+
 #: packages/lib/utils/document-audit-logs.ts:334
 msgid "Document moved to team"
 msgstr "Document moved to team"
@@ -791,6 +762,10 @@ msgstr "Document moved to team"
 msgid "Document opened"
 msgstr "Document opened"
 
+#: packages/ui/components/document/document-status.tsx:23
+msgid "Document pending"
+msgstr "Document pending||||||| 7fc497a64======="
+
 #: packages/ui/components/document/document-email-checkboxes.tsx:128
 msgid "Document pending email"
 msgstr "Document pending email"
@@ -823,23 +798,15 @@ msgid "Document visibility updated"
 msgstr "Document visibility updated"
 
 #: packages/email/template-components/template-document-completed.tsx:57
->>>>>>> main
 #: packages/ui/components/document/document-download-button.tsx:68
 msgid "Download"
-msgstr "Download"
+msgstr "Download<<<<<<< HEAD"
 
-<<<<<<< HEAD
+#: packages/lib/constants/document.ts:13
 #: packages/ui/components/document/document-status.tsx:34
 msgid "Draft"
-msgstr "Draft"
+msgstr "Draft>>>>>>> main"
 
-||||||| 7fc497a64
-=======
-#: packages/lib/constants/document.ts:13
-msgid "Draft"
-msgstr "Draft"
-
->>>>>>> main
 #: packages/ui/primitives/document-dropzone.tsx:162
 msgid "Drag & drop your PDF here."
 msgstr "Drag & drop your PDF here."
@@ -860,8 +827,8 @@ msgstr "Dropdown options"
 #: packages/ui/primitives/document-flow/add-signers.tsx:519
 #: packages/ui/primitives/document-flow/types.ts:54
 #: packages/ui/primitives/template-flow/add-template-fields.tsx:638
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:463
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:471
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:470
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:478
 msgid "Email"
 msgstr "Email"
 
@@ -890,7 +857,7 @@ msgid "Enable Direct Link Signing"
 msgstr "Enable Direct Link Signing"
 
 #: packages/ui/primitives/document-flow/add-signers.tsx:401
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:362
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:370
 msgid "Enable signing order"
 msgstr "Enable signing order"
 
@@ -1082,8 +1049,8 @@ msgstr "Min"
 #: packages/ui/primitives/document-flow/add-signers.tsx:556
 #: packages/ui/primitives/document-flow/types.ts:55
 #: packages/ui/primitives/template-flow/add-template-fields.tsx:664
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:498
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:506
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:504
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:512
 msgid "Name"
 msgstr "Name"
 
@@ -1165,15 +1132,8 @@ msgstr "Page {0} of {numPages}"
 
 #: packages/ui/primitives/document-password-dialog.tsx:62
 msgid "Password Required"
-msgstr "Password Required"
+msgstr "Password Required<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: packages/ui/components/document/document-status.tsx:22
-msgid "Pending"
-msgstr "Pending"
-
-||||||| 7fc497a64
-=======
 #: packages/email/templates/forgot-password.tsx:19
 msgid "Password Reset Requested"
 msgstr "Password Reset Requested"
@@ -1187,14 +1147,14 @@ msgid "Password updated!"
 msgstr "Password updated!"
 
 #: packages/lib/constants/document.ts:16
+#: packages/ui/components/document/document-status.tsx:22
 msgid "Pending"
 msgstr "Pending"
 
 #: packages/email/templates/document-pending.tsx:19
 msgid "Pending Document"
-msgstr "Pending Document"
+msgstr "Pending Document>>>>>>> main"
 
->>>>>>> main
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx:156
 msgid "Pick a number"
 msgstr "Pick a number"
@@ -1422,30 +1382,15 @@ msgid "Share your signing experience!"
 msgstr "Share your signing experience!"
 
 #: packages/ui/primitives/document-flow/add-signers.tsx:709
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:655
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:663
 msgid "Show advanced settings"
-msgstr "Show advanced settings"
+msgstr "Show advanced settings<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: packages/lib/constants/recipient-roles.ts:20
-#: packages/ui/components/document/next-inbox-item-button.tsx:107
-||||||| 7fc497a64
-#: packages/lib/constants/recipient-roles.ts:20
-=======
 #: packages/lib/constants/recipient-roles.ts:22
->>>>>>> main
+#: packages/ui/components/document/next-inbox-item-button.tsx:107
 msgid "Sign"
-msgstr "Sign"
+msgstr "Sign<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: packages/ui/components/document/next-inbox-item-button.tsx:70
-msgid "Sign Next Document"
-msgstr "Sign Next Document"
-
-#: packages/ui/primitives/document-flow/add-fields.tsx:818
-||||||| 7fc497a64
-#: packages/ui/primitives/document-flow/add-fields.tsx:818
-=======
 #: packages/email/template-components/template-document-invite.tsx:104
 msgid "Sign Document"
 msgstr "Sign Document"
@@ -1454,8 +1399,11 @@ msgstr "Sign Document"
 msgid "Sign In"
 msgstr "Sign In"
 
+#: packages/ui/components/document/next-inbox-item-button.tsx:70
+msgid "Sign Next Document"
+msgstr "Sign Next Document"
+
 #: packages/ui/primitives/document-flow/add-fields.tsx:823
->>>>>>> main
 #: packages/ui/primitives/document-flow/add-signature.tsx:323
 #: packages/ui/primitives/document-flow/field-icon.tsx:52
 #: packages/ui/primitives/document-flow/types.ts:49
@@ -1670,7 +1618,7 @@ msgstr "This email is sent to the recipient requesting them to sign the document
 msgid "This email will be sent to the recipient who has just signed the document, if there are still other recipients who have not signed yet."
 msgstr "This email will be sent to the recipient who has just signed the document, if there are still other recipients who have not signed yet."
 
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:573
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:581
 msgid "This field cannot be modified or deleted. When you share this template's direct link or add it to your public profile, anyone who accesses it can input their name and email, and fill in the fields assigned to them."
 msgstr "This field cannot be modified or deleted. When you share this template's direct link or add it to your public profile, anyone who accesses it can input their name and email, and fill in the fields assigned to them."
 
@@ -1736,20 +1684,14 @@ msgstr "Validation"
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx:91
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx:96
 msgid "Value"
-msgstr "Value"
+msgstr "Value<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: packages/lib/constants/recipient-roles.ts:26
-#: packages/ui/components/document/next-inbox-item-button.tsx:119
-||||||| 7fc497a64
-#: packages/lib/constants/recipient-roles.ts:26
-=======
 #: packages/email/templates/confirm-team-email.tsx:71
 msgid "Verify your team email address"
 msgstr "Verify your team email address"
 
 #: packages/lib/constants/recipient-roles.ts:29
->>>>>>> main
+#: packages/ui/components/document/next-inbox-item-button.tsx:119
 msgid "View"
 msgstr "View"
 

packages/lib/translations/en/web.po

@@ -743,7 +743,7 @@ msgstr "Banner Updated"
 msgid "Basic details"
 msgstr "Basic details"
 
-#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:72
+#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:74
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/billing/page.tsx:61
 #: apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx:117
 #: apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx:120
@@ -1527,19 +1527,15 @@ msgstr "Document resealed"
 
 #: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:327
 msgid "Document sent"
-msgstr "Document sent"
+msgstr "Document sent<<<<<<< HEAD"
 
-<<<<<<< HEAD
 #: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:133
-||||||| 7fc497a64
 #: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:132
-=======
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/documents/page.tsx:26
 #~ msgid "Document Settings"
 #~ msgstr "Document Settings"
 
-#: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:132
+#: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:133
->>>>>>> main
 msgid "Document Signed"
 msgstr "Document Signed"
 
@@ -1824,13 +1820,10 @@ msgstr "Enter your text here"
 #: apps/web/src/components/(dashboard)/layout/verify-email-banner.tsx:54
 #: apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx:101
 msgid "Error"
-msgstr "Error"
+msgstr "Error<<<<<<< HEAD"
 
-<<<<<<< HEAD
 #: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:143
-||||||| 7fc497a64
 #: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:142
-=======
 #: apps/web/src/components/forms/team-document-settings.tsx:77
 #~ msgid "Error updating global team settings"
 #~ msgstr "Error updating global team settings"
@@ -1839,8 +1832,7 @@ msgstr "Error"
 msgid "Everyone can access and view the document"
 msgstr "Everyone can access and view the document"
 
-#: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:142
+#: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:143
->>>>>>> main
 msgid "Everyone has signed"
 msgstr "Everyone has signed"
 
@@ -2237,6 +2229,10 @@ msgstr "Manage all teams you are currently associated with."
 msgid "Manage and view template"
 msgstr "Manage and view template"
 
+#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:136
+msgid "Manage billing"
+msgstr "Manage billing"
+
 #: apps/web/src/components/templates/manage-public-template-dialog.tsx:341
 msgid "Manage details for this public template"
 msgstr "Manage details for this public template"
@@ -2257,7 +2253,7 @@ msgstr "Manage passkeys"
 msgid "Manage subscription"
 msgstr "Manage subscription"
 
-#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:66
+#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:67
 msgid "Manage Subscription"
 msgstr "Manage Subscription"
 
@@ -3338,7 +3334,7 @@ msgstr "Site Settings"
 #: apps/web/src/app/(dashboard)/documents/delete-document-dialog.tsx:80
 #: apps/web/src/app/(dashboard)/documents/duplicate-document-dialog.tsx:72
 #: apps/web/src/app/(dashboard)/settings/billing/billing-plans.tsx:62
-#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:50
+#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:51
 #: apps/web/src/app/(dashboard)/settings/public-profile/public-profile-page-view.tsx:124
 #: apps/web/src/app/(dashboard)/settings/security/passkeys/user-passkeys-data-table-actions.tsx:73
 #: apps/web/src/app/(dashboard)/settings/security/passkeys/user-passkeys-data-table-actions.tsx:93
@@ -4458,7 +4454,7 @@ msgstr "Want to send slick signing links like this one? <0>Check out Documenso.<
 msgid "Want your own public profile?"
 msgstr "Want your own public profile?"
 
-#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:40
+#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:41
 #: apps/web/src/app/(teams)/t/[teamUrl]/layout-billing-banner.tsx:55
 #: apps/web/src/components/(teams)/team-billing-portal-button.tsx:31
 msgid "We are unable to proceed to the billing portal at this time. Please try again, or contact support."
@@ -4791,7 +4787,7 @@ msgstr "You are about to remove the following user from <0>{teamName}</0>."
 msgid "You are about to revoke access for team <0>{0}</0> ({1}) to use your email."
 msgstr "You are about to revoke access for team <0>{0}</0> ({1}) to use your email."
 
-#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:78
+#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:80
 msgid "You are currently on the <0>Free Plan</0>."
 msgstr "You are currently on the <0>Free Plan</0>."
 
@@ -4843,7 +4839,7 @@ msgstr "You cannot modify a team member who has a higher role than you."
 msgid "You cannot upload encrypted PDFs"
 msgstr "You cannot upload encrypted PDFs"
 
-#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:45
+#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:46
 msgid "You do not currently have a customer record, this should not happen. Please contact support for assistance."
 msgstr "You do not currently have a customer record, this should not happen. Please contact support for assistance."
 
@@ -4989,7 +4985,7 @@ msgstr "Your brand website URL"
 msgid "Your branding preferences have been updated"
 msgstr "Your branding preferences have been updated"
 
-#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:119
+#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:125
 msgid "Your current plan is past due. Please update your payment information."
 msgstr "Your current plan is past due. Please update your payment information."
 

packages/lib/translations/es/common.po

@@ -8,19 +8,11 @@ msgstr ""
 "Language: es\n"
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-<<<<<<< HEAD
-"PO-Revision-Date: \n"
-||||||| 7fc497a64
-"PO-Revision-Date: 2024-10-22 02:25\n"
-=======
-"PO-Revision-Date: 2024-11-12 05:45\n"
->>>>>>> main
-||||||| 876803b5d
-"PO-Revision-Date: 2024-11-12 05:45\n"
-=======
 "PO-Revision-Date: 2024-11-14 12:05\n"
->>>>>>> main
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Plural-Forms: \n"
@@ -421,11 +413,11 @@ msgstr ""
 msgid "Add myself"
 msgstr ""
 
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:637
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:645
 msgid "Add Myself"
 msgstr ""
 
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:623
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:631
 msgid "Add Placeholder Recipient"
 msgstr ""
 
@@ -560,22 +552,13 @@ msgstr "Ccers"
 
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx:86
 msgid "Character Limit"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
 #: packages/ui/primitives/document-flow/add-fields.tsx:1026
 #: packages/ui/primitives/template-flow/add-template-fields.tsx:788
-msgid "Checkbox"
+#~ msgid "Checkbox"
-msgstr ""
+#~ msgstr "Caja de verificación=======>>>>>>> main"
 
-||||||| 7fc497a64
-#: packages/ui/primitives/document-flow/add-fields.tsx:1026
-#: packages/ui/primitives/template-flow/add-template-fields.tsx:788
-msgid "Checkbox"
-msgstr "Caja de verificación"
-
-=======
->>>>>>> main
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx:197
 msgid "Checkbox values"
 msgstr ""
@@ -596,13 +579,10 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: packages/ui/components/document/document-status.tsx:28
-msgid "Completed"
-msgstr ""
-
 #: packages/email/template-components/template-document-completed.tsx:35
 #: packages/email/template-components/template-document-self-signed.tsx:36
 #: packages/lib/constants/document.ts:10
+#: packages/ui/components/document/document-status.tsx:28
 msgid "Completed"
 msgstr "Completado"
 
@@ -657,10 +637,6 @@ msgstr "Copiado"
 msgid "Copied to clipboard"
 msgstr ""
 
-#: packages/ui/components/document/next-inbox-item-button.tsx:93
-msgid "Created {0}"
-msgstr ""
-
 #: packages/ui/primitives/document-flow/add-subject.tsx:249
 msgid "Copy"
 msgstr "Copiar"
@@ -677,6 +653,10 @@ msgstr "Crea una <0>cuenta gratuita</0> para acceder a tus documentos firmados e
 msgid "Create account"
 msgstr "Crear cuenta"
 
+#: packages/ui/components/document/next-inbox-item-button.tsx:93
+msgid "Created {0}"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/add-signature.tsx:360
 msgid "Custom Text"
 msgstr ""
@@ -700,7 +680,7 @@ msgstr "Rechazar"
 msgid "Didn't request a password change? We are here to help you secure your account, just <0>contact us.</0>"
 msgstr "¿No solicitaste un cambio de contraseña? Estamos aquí para ayudarte a asegurar tu cuenta, solo <0>contáctanos.</0>"
 
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:570
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:578
 msgid "Direct link receiver"
 msgstr ""
 
@@ -718,18 +698,14 @@ msgstr "Documento \"{0}\" - Rechazo confirmado"
 msgid "Document access"
 msgstr ""
 
-#: packages/ui/components/document/document-status.tsx:47
-msgid "Document All"
-msgstr ""
-
-#: packages/ui/components/document/document-status.tsx:29
-msgid "Document completed"
-msgstr ""
-
 #: packages/lib/utils/document-audit-logs.ts:306
 msgid "Document access auth updated"
 msgstr "Se actualizó la autenticación de acceso al documento"
 
+#: packages/ui/components/document/document-status.tsx:47
+msgid "Document All"
+msgstr ""
+
 #: packages/lib/server-only/document/delete-document.ts:246
 #: packages/lib/server-only/document/super-delete-document.ts:98
 msgid "Document Cancelled"
@@ -737,6 +713,7 @@ msgstr "Documento cancelado"
 
 #: packages/lib/utils/document-audit-logs.ts:369
 #: packages/lib/utils/document-audit-logs.ts:370
+#: packages/ui/components/document/document-status.tsx:29
 msgid "Document completed"
 msgstr "Documento completado"
 
@@ -757,18 +734,6 @@ msgstr "Documento creado a partir de plantilla directa"
 msgid "Document Creation"
 msgstr ""
 
-#: packages/ui/components/document/document-status.tsx:35
-msgid "Document draft"
-msgstr ""
-
-#: packages/ui/components/document/document-status.tsx:41
-msgid "Document inbox"
-msgstr ""
-
-#: packages/ui/components/document/document-status.tsx:23
-msgid "Document pending"
-msgstr ""
-
 #: packages/lib/utils/document-audit-logs.ts:290
 msgid "Document deleted"
 msgstr "Documento eliminado"
@@ -786,10 +751,18 @@ msgstr "¡Documento eliminado!"
 msgid "Document Distribution Method"
 msgstr "Método de distribución de documentos"
 
+#: packages/ui/components/document/document-status.tsx:35
+msgid "Document draft"
+msgstr ""
+
 #: packages/lib/utils/document-audit-logs.ts:326
 msgid "Document external ID updated"
 msgstr "ID externo del documento actualizado"
 
+#: packages/ui/components/document/document-status.tsx:41
+msgid "Document inbox"
+msgstr ""
+
 #: packages/lib/utils/document-audit-logs.ts:334
 msgid "Document moved to team"
 msgstr "Documento movido al equipo"
@@ -798,6 +771,10 @@ msgstr "Documento movido al equipo"
 msgid "Document opened"
 msgstr "Documento abierto"
 
+#: packages/ui/components/document/document-status.tsx:23
+msgid "Document pending"
+msgstr ""
+
 #: packages/ui/components/document/document-email-checkboxes.tsx:128
 msgid "Document pending email"
 msgstr "Correo electrónico de documento pendiente"
@@ -834,11 +811,8 @@ msgstr "Visibilidad del documento actualizada"
 msgid "Download"
 msgstr ""
 
-#: packages/ui/components/document/document-status.tsx:34
-msgid "Draft"
-msgstr ""
-
 #: packages/lib/constants/document.ts:13
+#: packages/ui/components/document/document-status.tsx:34
 msgid "Draft"
 msgstr "Borrador"
 
@@ -862,8 +836,8 @@ msgstr ""
 #: packages/ui/primitives/document-flow/add-signers.tsx:519
 #: packages/ui/primitives/document-flow/types.ts:54
 #: packages/ui/primitives/template-flow/add-template-fields.tsx:638
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:463
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:471
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:470
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:478
 msgid "Email"
 msgstr ""
 
@@ -892,7 +866,7 @@ msgid "Enable Direct Link Signing"
 msgstr ""
 
 #: packages/ui/primitives/document-flow/add-signers.tsx:401
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:362
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:370
 msgid "Enable signing order"
 msgstr ""
 
@@ -1084,8 +1058,8 @@ msgstr ""
 #: packages/ui/primitives/document-flow/add-signers.tsx:556
 #: packages/ui/primitives/document-flow/types.ts:55
 #: packages/ui/primitives/template-flow/add-template-fields.tsx:664
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:498
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:506
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:504
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:512
 msgid "Name"
 msgstr ""
 
@@ -1169,10 +1143,6 @@ msgstr "Página {0} de {numPages}"
 msgid "Password Required"
 msgstr ""
 
-#: packages/ui/components/document/document-status.tsx:22
-msgid "Pending"
-msgstr ""
-
 #: packages/email/templates/forgot-password.tsx:19
 msgid "Password Reset Requested"
 msgstr "Solicitud de restablecimiento de contraseña"
@@ -1186,6 +1156,7 @@ msgid "Password updated!"
 msgstr "¡Contraseña actualizada!"
 
 #: packages/lib/constants/document.ts:16
+#: packages/ui/components/document/document-status.tsx:22
 msgid "Pending"
 msgstr "Pendiente"
 
@@ -1420,25 +1391,15 @@ msgid "Share your signing experience!"
 msgstr "¡Comparte tu experiencia de firma!"
 
 #: packages/ui/primitives/document-flow/add-signers.tsx:709
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:655
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:663
 msgid "Show advanced settings"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: packages/lib/constants/recipient-roles.ts:20
-#: packages/ui/components/document/next-inbox-item-button.tsx:107
-||||||| 7fc497a64
-#: packages/lib/constants/recipient-roles.ts:20
-=======
 #: packages/lib/constants/recipient-roles.ts:22
->>>>>>> main
+#: packages/ui/components/document/next-inbox-item-button.tsx:107
 msgid "Sign"
 msgstr ""
 
-#: packages/ui/components/document/next-inbox-item-button.tsx:70
-msgid "Sign Next Document"
-msgstr ""
-
 #: packages/email/template-components/template-document-invite.tsx:104
 msgid "Sign Document"
 msgstr "Firmar Documento"
@@ -1447,6 +1408,10 @@ msgstr "Firmar Documento"
 msgid "Sign In"
 msgstr "Iniciar sesión"
 
+#: packages/ui/components/document/next-inbox-item-button.tsx:70
+msgid "Sign Next Document"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/add-fields.tsx:823
 #: packages/ui/primitives/document-flow/add-signature.tsx:323
 #: packages/ui/primitives/document-flow/field-icon.tsx:52
@@ -1662,7 +1627,7 @@ msgstr "Este correo electrónico se envía al destinatario solicitando que firme
 msgid "This email will be sent to the recipient who has just signed the document, if there are still other recipients who have not signed yet."
 msgstr "Este correo electrónico se enviará al destinatario que acaba de firmar el documento, si todavía hay otros destinatarios que no han firmado."
 
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:573
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:581
 msgid "This field cannot be modified or deleted. When you share this template's direct link or add it to your public profile, anyone who accesses it can input their name and email, and fill in the fields assigned to them."
 msgstr ""
 
@@ -1728,20 +1693,14 @@ msgstr ""
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx:91
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx:96
 msgid "Value"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: packages/lib/constants/recipient-roles.ts:26
-#: packages/ui/components/document/next-inbox-item-button.tsx:119
-||||||| 7fc497a64
-#: packages/lib/constants/recipient-roles.ts:26
-=======
 #: packages/email/templates/confirm-team-email.tsx:71
 msgid "Verify your team email address"
 msgstr "Verifica tu dirección de correo electrónico del equipo"
 
 #: packages/lib/constants/recipient-roles.ts:29
->>>>>>> main
+#: packages/ui/components/document/next-inbox-item-button.tsx:119
 msgid "View"
 msgstr ""
 
@@ -1867,12 +1826,11 @@ msgstr "Has iniciado el documento {0} que requiere que {recipientActionVerb}."
 
 #: packages/ui/primitives/document-dropzone.tsx:69
 msgid "You have reached your document limit."
-<<<<<<< HEAD
 msgstr ""
-||||||| 7fc497a64
+
-msgstr "Ha alcanzado su límite de documentos."
+#: packages/ui/primitives/document-dropzone.tsx:69
-=======
+#~ msgid "You have reached your document limit.<<<<<<< HEAD"
-msgstr "Ha alcanzado su límite de documentos."
+#~ msgstr "Ha alcanzado su límite de documentos."
 
 #: packages/email/templates/document-rejection-confirmed.tsx:27
 msgid "You have rejected the document '{documentName}'"
@@ -1896,10 +1854,4 @@ msgstr "Tu contraseña ha sido actualizada."
 #: packages/email/templates/team-delete.tsx:28
 #: packages/email/templates/team-delete.tsx:32
 msgid "Your team has been deleted"
-msgstr "Tu equipo ha sido eliminado"
+msgstr "Tu equipo ha sido eliminado<<<<<<< HEAD>>>>>>> main||||||| 876803b5d=======>>>>>>> main"
-<<<<<<< HEAD
->>>>>>> main
-||||||| 876803b5d
-=======
-
->>>>>>> main

packages/lib/translations/es/marketing.po

@@ -8,19 +8,11 @@ msgstr ""
 "Language: es\n"
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-<<<<<<< HEAD
-"PO-Revision-Date: \n"
-||||||| 7fc497a64
-"PO-Revision-Date: 2024-10-22 02:25\n"
-=======
-"PO-Revision-Date: 2024-11-12 05:45\n"
->>>>>>> main
-||||||| 876803b5d
-"PO-Revision-Date: 2024-11-12 05:45\n"
-=======
 "PO-Revision-Date: 2024-11-14 12:05\n"
->>>>>>> main
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Plural-Forms: \n"
@@ -608,11 +600,8 @@ msgstr ""
 
 #: apps/marketing/src/components/(marketing)/carousel.tsx:272
 msgid "Your browser does not support the video tag."
-<<<<<<< HEAD
 msgstr ""
-||||||| 876803b5d
-msgstr "Tu navegador no soporta la etiqueta de video."
-=======
-msgstr "Tu navegador no soporta la etiqueta de video."
 
->>>>>>> main
+#: apps/marketing/src/components/(marketing)/carousel.tsx:272
+#~ msgid "Your browser does not support the video tag.<<<<<<< HEAD"
+#~ msgstr "Tu navegador no soporta la etiqueta de video.>>>>>>> main"

packages/lib/translations/es/web.po

@@ -8,19 +8,11 @@ msgstr ""
 "Language: es\n"
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-<<<<<<< HEAD
-"PO-Revision-Date: \n"
-||||||| 7fc497a64
-"PO-Revision-Date: 2024-10-22 02:26\n"
-=======
-"PO-Revision-Date: 2024-11-12 05:45\n"
->>>>>>> main
-||||||| 876803b5d
-"PO-Revision-Date: 2024-11-12 05:45\n"
-=======
 "PO-Revision-Date: 2024-11-14 12:05\n"
->>>>>>> main
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Plural-Forms: \n"
@@ -107,17 +99,8 @@ msgstr ""
 msgid "{0} direct signing templates"
 msgstr ""
 
-#: apps/web/src/app/(recipient)/d/[token]/direct-template.tsx:66
-<<<<<<< HEAD
-msgid "{0} document"
-msgstr ""
-||||||| 7fc497a64
-msgid "{0} document"
-msgstr "{0} documento"
-=======
 #~ msgid "{0} document"
-#~ msgstr "{0} document"
+#~ msgstr "{0} document>>>>>>> main"
->>>>>>> main
 
 #: apps/web/src/app/(dashboard)/documents/upload-document.tsx:146
 msgid "{0} of {1} documents remaining this month."
@@ -127,17 +110,8 @@ msgstr ""
 msgid "{0} Recipient(s)"
 msgstr ""
 
-#: apps/web/src/app/(recipient)/d/[token]/direct-template.tsx:67
-<<<<<<< HEAD
-msgid "{0} the document to complete the process."
-msgstr ""
-||||||| 7fc497a64
-msgid "{0} the document to complete the process."
-msgstr "{0} el documento para completar el proceso."
-=======
 #~ msgid "{0} the document to complete the process."
-#~ msgstr "{0} the document to complete the process."
+#~ msgstr "{0} the document to complete the process.>>>>>>> main"
->>>>>>> main
 
 #: apps/web/src/app/(signing)/sign/[token]/text-field.tsx:292
 msgid "{charactersRemaining, plural, one {1 character remaining} other {{charactersRemaining} characters remaining}}"
@@ -366,21 +340,11 @@ msgstr ""
 
 #: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:171
 msgid "Add Signers"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:179
-msgid "Add Subject"
-msgstr ""
-||||||| 7fc497a64
-#: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:179
-msgid "Add Subject"
-msgstr "Agregar Asunto"
-=======
 #: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:180
 #~ msgid "Add Subject"
-#~ msgstr "Add Subject"
+#~ msgstr "Add Subject>>>>>>> main"
->>>>>>> main
 
 #: apps/web/src/components/(teams)/dialogs/add-team-email-dialog.tsx:133
 msgid "Add team email"
@@ -392,21 +356,11 @@ msgstr ""
 
 #: apps/web/src/app/(dashboard)/templates/use-template-dialog.tsx:220
 msgid "Add the recipients to create the document with"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:180
-msgid "Add the subject and message you wish to send to signers."
-msgstr ""
-||||||| 7fc497a64
-#: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:180
-msgid "Add the subject and message you wish to send to signers."
-msgstr "Agrega el asunto y el mensaje que deseas enviar a los firmantes."
-=======
 #: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:181
 #~ msgid "Add the subject and message you wish to send to signers."
-#~ msgstr "Add the subject and message you wish to send to signers."
+#~ msgstr "Add the subject and message you wish to send to signers.>>>>>>> main"
->>>>>>> main
 
 #: apps/web/src/components/(teams)/dialogs/create-team-checkout-dialog.tsx:152
 msgid "Adding and removing seats will adjust your invoice accordingly."
@@ -791,7 +745,7 @@ msgstr ""
 msgid "Basic details"
 msgstr ""
 
-#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:72
+#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:74
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/billing/page.tsx:61
 #: apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx:117
 #: apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx:120
@@ -1242,20 +1196,12 @@ msgstr ""
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx:100
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/webhooks/page.tsx:93
 msgid "Created on {0}"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx:100
-msgid "Created on{0}"
+#~ msgid "Created on{0}"
-msgstr ""
+#~ msgstr "Creado el{0}=======>>>>>>> main"
 
-||||||| 7fc497a64
-#: apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx:100
-msgid "Created on{0}"
-msgstr "Creado el{0}"
-
-=======
->>>>>>> main
 #: apps/web/src/components/forms/password.tsx:107
 msgid "Current Password"
 msgstr ""
@@ -1587,19 +1533,15 @@ msgstr ""
 
 #: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:327
 msgid "Document sent"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
 #: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:133
-||||||| 7fc497a64
 #: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:132
-=======
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/documents/page.tsx:26
 #~ msgid "Document Settings"
 #~ msgstr "Document Settings"
 
-#: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:132
+#: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:133
->>>>>>> main
 msgid "Document Signed"
 msgstr ""
 
@@ -1884,13 +1826,10 @@ msgstr ""
 #: apps/web/src/components/(dashboard)/layout/verify-email-banner.tsx:54
 #: apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx:101
 msgid "Error"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
 #: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:143
-||||||| 7fc497a64
 #: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:142
-=======
 #: apps/web/src/components/forms/team-document-settings.tsx:77
 #~ msgid "Error updating global team settings"
 #~ msgstr "Error updating global team settings"
@@ -1899,8 +1838,7 @@ msgstr ""
 msgid "Everyone can access and view the document"
 msgstr "Todos pueden acceder y ver el documento"
 
-#: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:142
+#: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:143
->>>>>>> main
 msgid "Everyone has signed"
 msgstr ""
 
@@ -1919,20 +1857,12 @@ msgstr ""
 #: apps/web/src/app/(dashboard)/settings/tokens/page.tsx:71
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx:104
 msgid "Expires on {0}"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx:107
-msgid "Expires on{0}"
+#~ msgid "Expires on{0}"
-msgstr ""
+#~ msgstr "Expira el{0}=======>>>>>>> main"
 
-||||||| 7fc497a64
-#: apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx:107
-msgid "Expires on{0}"
-msgstr "Expira el{0}"
-
-=======
->>>>>>> main
 #: apps/web/src/app/(dashboard)/admin/documents/[id]/admin-actions.tsx:42
 msgid "Failed to reseal document"
 msgstr ""
@@ -2309,6 +2239,10 @@ msgstr ""
 msgid "Manage and view template"
 msgstr "Gestionar y ver plantilla"
 
+#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:136
+msgid "Manage billing"
+msgstr ""
+
 #: apps/web/src/components/templates/manage-public-template-dialog.tsx:341
 msgid "Manage details for this public template"
 msgstr ""
@@ -2329,7 +2263,7 @@ msgstr ""
 msgid "Manage subscription"
 msgstr ""
 
-#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:66
+#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:67
 msgid "Manage Subscription"
 msgstr ""
 
@@ -3410,7 +3344,7 @@ msgstr ""
 #: apps/web/src/app/(dashboard)/documents/delete-document-dialog.tsx:80
 #: apps/web/src/app/(dashboard)/documents/duplicate-document-dialog.tsx:72
 #: apps/web/src/app/(dashboard)/settings/billing/billing-plans.tsx:62
-#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:50
+#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:51
 #: apps/web/src/app/(dashboard)/settings/public-profile/public-profile-page-view.tsx:124
 #: apps/web/src/app/(dashboard)/settings/security/passkeys/user-passkeys-data-table-actions.tsx:73
 #: apps/web/src/app/(dashboard)/settings/security/passkeys/user-passkeys-data-table-actions.tsx:93
@@ -4530,7 +4464,7 @@ msgstr ""
 msgid "Want your own public profile?"
 msgstr ""
 
-#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:40
+#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:41
 #: apps/web/src/app/(teams)/t/[teamUrl]/layout-billing-banner.tsx:55
 #: apps/web/src/components/(teams)/team-billing-portal-button.tsx:31
 msgid "We are unable to proceed to the billing portal at this time. Please try again, or contact support."
@@ -4863,7 +4797,7 @@ msgstr ""
 msgid "You are about to revoke access for team <0>{0}</0> ({1}) to use your email."
 msgstr ""
 
-#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:78
+#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:80
 msgid "You are currently on the <0>Free Plan</0>."
 msgstr ""
 
@@ -4915,7 +4849,7 @@ msgstr ""
 msgid "You cannot upload encrypted PDFs"
 msgstr ""
 
-#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:45
+#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:46
 msgid "You do not currently have a customer record, this should not happen. Please contact support for assistance."
 msgstr ""
 
@@ -5061,7 +4995,7 @@ msgstr "La URL de tu sitio web de marca"
 msgid "Your branding preferences have been updated"
 msgstr "Tus preferencias de marca han sido actualizadas"
 
-#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:119
+#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:125
 msgid "Your current plan is past due. Please update your payment information."
 msgstr ""
 
@@ -5195,11 +5129,9 @@ msgstr ""
 #: apps/web/src/app/(dashboard)/settings/tokens/page.tsx:53
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx:86
 msgid "Your tokens will be shown here once you create them."
-<<<<<<< HEAD
 msgstr ""
-||||||| 876803b5d
-msgstr "Tus tokens se mostrarán aquí una vez que los crees."
-=======
-msgstr "Tus tokens se mostrarán aquí una vez que los crees."
 
->>>>>>> main
+#: apps/web/src/app/(dashboard)/settings/tokens/page.tsx:53
+#: apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx:86
+#~ msgid "Your tokens will be shown here once you create them.<<<<<<< HEAD"
+#~ msgstr "Tus tokens se mostrarán aquí una vez que los crees.>>>>>>> main"

packages/lib/translations/fr/common.po

@@ -8,19 +8,11 @@ msgstr ""
 "Language: fr\n"
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-<<<<<<< HEAD
-"PO-Revision-Date: \n"
-||||||| 7fc497a64
-"PO-Revision-Date: 2024-10-18 04:04\n"
-=======
-"PO-Revision-Date: 2024-11-12 05:45\n"
->>>>>>> main
-||||||| 876803b5d
-"PO-Revision-Date: 2024-11-12 05:45\n"
-=======
 "PO-Revision-Date: 2024-11-14 12:05\n"
->>>>>>> main
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Plural-Forms: \n"
@@ -421,11 +413,11 @@ msgstr ""
 msgid "Add myself"
 msgstr ""
 
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:637
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:645
 msgid "Add Myself"
 msgstr ""
 
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:623
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:631
 msgid "Add Placeholder Recipient"
 msgstr ""
 
@@ -560,22 +552,13 @@ msgstr "Ccers"
 
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx:86
 msgid "Character Limit"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
 #: packages/ui/primitives/document-flow/add-fields.tsx:1026
 #: packages/ui/primitives/template-flow/add-template-fields.tsx:788
-msgid "Checkbox"
+#~ msgid "Checkbox"
-msgstr ""
+#~ msgstr "Case à cocher=======>>>>>>> main"
 
-||||||| 7fc497a64
-#: packages/ui/primitives/document-flow/add-fields.tsx:1026
-#: packages/ui/primitives/template-flow/add-template-fields.tsx:788
-msgid "Checkbox"
-msgstr "Case à cocher"
-
-=======
->>>>>>> main
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx:197
 msgid "Checkbox values"
 msgstr ""
@@ -596,13 +579,10 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: packages/ui/components/document/document-status.tsx:28
-msgid "Completed"
-msgstr ""
-
 #: packages/email/template-components/template-document-completed.tsx:35
 #: packages/email/template-components/template-document-self-signed.tsx:36
 #: packages/lib/constants/document.ts:10
+#: packages/ui/components/document/document-status.tsx:28
 msgid "Completed"
 msgstr "Terminé"
 
@@ -657,10 +637,6 @@ msgstr "Copié"
 msgid "Copied to clipboard"
 msgstr ""
 
-#: packages/ui/components/document/next-inbox-item-button.tsx:93
-msgid "Created {0}"
-msgstr ""
-
 #: packages/ui/primitives/document-flow/add-subject.tsx:249
 msgid "Copy"
 msgstr "Copier"
@@ -677,6 +653,10 @@ msgstr "Créez un <0>compte gratuit</0> pour accéder à vos documents signés
 msgid "Create account"
 msgstr "Créer un compte"
 
+#: packages/ui/components/document/next-inbox-item-button.tsx:93
+msgid "Created {0}"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/add-signature.tsx:360
 msgid "Custom Text"
 msgstr ""
@@ -700,7 +680,7 @@ msgstr "Décliner"
 msgid "Didn't request a password change? We are here to help you secure your account, just <0>contact us.</0>"
 msgstr "Vous n'avez pas demandé de changement de mot de passe ? Nous sommes ici pour vous aider à sécuriser votre compte, il suffit de <0>nous contacter.</0>"
 
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:570
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:578
 msgid "Direct link receiver"
 msgstr ""
 
@@ -718,18 +698,14 @@ msgstr "Document \"{0}\" - Rejet Confirmé"
 msgid "Document access"
 msgstr ""
 
-#: packages/ui/components/document/document-status.tsx:47
-msgid "Document All"
-msgstr ""
-
-#: packages/ui/components/document/document-status.tsx:29
-msgid "Document completed"
-msgstr ""
-
 #: packages/lib/utils/document-audit-logs.ts:306
 msgid "Document access auth updated"
 msgstr "L'authentification d'accès au document a été mise à jour"
 
+#: packages/ui/components/document/document-status.tsx:47
+msgid "Document All"
+msgstr ""
+
 #: packages/lib/server-only/document/delete-document.ts:246
 #: packages/lib/server-only/document/super-delete-document.ts:98
 msgid "Document Cancelled"
@@ -737,6 +713,7 @@ msgstr "Document Annulé"
 
 #: packages/lib/utils/document-audit-logs.ts:369
 #: packages/lib/utils/document-audit-logs.ts:370
+#: packages/ui/components/document/document-status.tsx:29
 msgid "Document completed"
 msgstr "Document terminé"
 
@@ -757,18 +734,6 @@ msgstr "Document créé à partir d'un modèle direct"
 msgid "Document Creation"
 msgstr ""
 
-#: packages/ui/components/document/document-status.tsx:35
-msgid "Document draft"
-msgstr ""
-
-#: packages/ui/components/document/document-status.tsx:41
-msgid "Document inbox"
-msgstr ""
-
-#: packages/ui/components/document/document-status.tsx:23
-msgid "Document pending"
-msgstr ""
-
 #: packages/lib/utils/document-audit-logs.ts:290
 msgid "Document deleted"
 msgstr "Document supprimé"
@@ -786,10 +751,18 @@ msgstr "Document Supprimé !"
 msgid "Document Distribution Method"
 msgstr "Méthode de distribution du document"
 
+#: packages/ui/components/document/document-status.tsx:35
+msgid "Document draft"
+msgstr ""
+
 #: packages/lib/utils/document-audit-logs.ts:326
 msgid "Document external ID updated"
 msgstr "ID externe du document mis à jour"
 
+#: packages/ui/components/document/document-status.tsx:41
+msgid "Document inbox"
+msgstr ""
+
 #: packages/lib/utils/document-audit-logs.ts:334
 msgid "Document moved to team"
 msgstr "Document déplacé vers l'équipe"
@@ -798,6 +771,10 @@ msgstr "Document déplacé vers l'équipe"
 msgid "Document opened"
 msgstr "Document ouvert"
 
+#: packages/ui/components/document/document-status.tsx:23
+msgid "Document pending"
+msgstr ""
+
 #: packages/ui/components/document/document-email-checkboxes.tsx:128
 msgid "Document pending email"
 msgstr "E-mail de document en attente"
@@ -834,11 +811,8 @@ msgstr "Visibilité du document mise à jour"
 msgid "Download"
 msgstr ""
 
-#: packages/ui/components/document/document-status.tsx:34
-msgid "Draft"
-msgstr ""
-
 #: packages/lib/constants/document.ts:13
+#: packages/ui/components/document/document-status.tsx:34
 msgid "Draft"
 msgstr "Brouillon"
 
@@ -862,8 +836,8 @@ msgstr ""
 #: packages/ui/primitives/document-flow/add-signers.tsx:519
 #: packages/ui/primitives/document-flow/types.ts:54
 #: packages/ui/primitives/template-flow/add-template-fields.tsx:638
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:463
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:471
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:470
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:478
 msgid "Email"
 msgstr ""
 
@@ -892,7 +866,7 @@ msgid "Enable Direct Link Signing"
 msgstr ""
 
 #: packages/ui/primitives/document-flow/add-signers.tsx:401
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:362
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:370
 msgid "Enable signing order"
 msgstr ""
 
@@ -1084,8 +1058,8 @@ msgstr ""
 #: packages/ui/primitives/document-flow/add-signers.tsx:556
 #: packages/ui/primitives/document-flow/types.ts:55
 #: packages/ui/primitives/template-flow/add-template-fields.tsx:664
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:498
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:506
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:504
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:512
 msgid "Name"
 msgstr ""
 
@@ -1169,10 +1143,6 @@ msgstr "Page {0} sur {numPages}"
 msgid "Password Required"
 msgstr ""
 
-#: packages/ui/components/document/document-status.tsx:22
-msgid "Pending"
-msgstr ""
-
 #: packages/email/templates/forgot-password.tsx:19
 msgid "Password Reset Requested"
 msgstr "Réinitialisation du mot de passe demandée"
@@ -1186,6 +1156,7 @@ msgid "Password updated!"
 msgstr "Mot de passe mis à jour !"
 
 #: packages/lib/constants/document.ts:16
+#: packages/ui/components/document/document-status.tsx:22
 msgid "Pending"
 msgstr "En attente"
 
@@ -1420,25 +1391,15 @@ msgid "Share your signing experience!"
 msgstr "Partagez votre expérience de signature !"
 
 #: packages/ui/primitives/document-flow/add-signers.tsx:709
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:655
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:663
 msgid "Show advanced settings"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: packages/lib/constants/recipient-roles.ts:20
-#: packages/ui/components/document/next-inbox-item-button.tsx:107
-||||||| 7fc497a64
-#: packages/lib/constants/recipient-roles.ts:20
-=======
 #: packages/lib/constants/recipient-roles.ts:22
->>>>>>> main
+#: packages/ui/components/document/next-inbox-item-button.tsx:107
 msgid "Sign"
 msgstr ""
 
-#: packages/ui/components/document/next-inbox-item-button.tsx:70
-msgid "Sign Next Document"
-msgstr ""
-
 #: packages/email/template-components/template-document-invite.tsx:104
 msgid "Sign Document"
 msgstr "Signer le document"
@@ -1447,6 +1408,10 @@ msgstr "Signer le document"
 msgid "Sign In"
 msgstr "Se connecter"
 
+#: packages/ui/components/document/next-inbox-item-button.tsx:70
+msgid "Sign Next Document"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/add-fields.tsx:823
 #: packages/ui/primitives/document-flow/add-signature.tsx:323
 #: packages/ui/primitives/document-flow/field-icon.tsx:52
@@ -1662,7 +1627,7 @@ msgstr "Cet e-mail est envoyé au destinataire lui demandant de signer le docume
 msgid "This email will be sent to the recipient who has just signed the document, if there are still other recipients who have not signed yet."
 msgstr "Cet e-mail sera envoyé au destinataire qui vient de signer le document, s'il y a encore d'autres destinataires qui n'ont pas signé."
 
-#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:573
+#: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx:581
 msgid "This field cannot be modified or deleted. When you share this template's direct link or add it to your public profile, anyone who accesses it can input their name and email, and fill in the fields assigned to them."
 msgstr ""
 
@@ -1728,24 +1693,14 @@ msgstr ""
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx:91
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx:96
 msgid "Value"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: packages/lib/constants/recipient-roles.ts:26
-#: packages/ui/components/document/next-inbox-item-button.tsx:119
-msgid "View"
-msgstr ""
-||||||| 7fc497a64
-#: packages/lib/constants/recipient-roles.ts:26
-msgid "View"
-msgstr "Vue"
-=======
 #: packages/email/templates/confirm-team-email.tsx:71
 msgid "Verify your team email address"
-msgstr "Vérifiez votre adresse e-mail d'équipe"
+msgstr "Vérifiez votre adresse e-mail d'équipe>>>>>>> main"
->>>>>>> main
 
 #: packages/lib/constants/recipient-roles.ts:29
+#: packages/ui/components/document/next-inbox-item-button.tsx:119
 msgid "View"
 msgstr "Voir"
 
@@ -1786,12 +1741,11 @@ msgstr "Spectateurs"
 
 #: packages/lib/constants/recipient-roles.ts:31
 msgid "Viewing"
-<<<<<<< HEAD
 msgstr ""
-||||||| 7fc497a64
+
-msgstr "Visionnage"
+#: packages/lib/constants/recipient-roles.ts:31
-=======
+#~ msgid "Viewing<<<<<<< HEAD"
-msgstr "Consultation"
+#~ msgstr "Consultation"
 
 #: packages/email/template-components/template-document-pending.tsx:31
 msgid "Waiting for others"
@@ -1823,8 +1777,7 @@ msgstr "Bienvenue sur Documenso !"
 
 #: packages/lib/utils/document-audit-logs.ts:258
 msgid "You"
-msgstr "Vous"
+msgstr "Vous>>>>>>> main"
->>>>>>> main
 
 #: packages/ui/primitives/document-flow/send-document-action-dialog.tsx:44
 msgid "You are about to send this document to the recipients. Are you sure you want to continue?"
@@ -1877,12 +1830,11 @@ msgstr "Vous avez initié le document {0} qui nécessite que vous {recipientActi
 
 #: packages/ui/primitives/document-dropzone.tsx:69
 msgid "You have reached your document limit."
-<<<<<<< HEAD
 msgstr ""
-||||||| 7fc497a64
+
-msgstr "Vous avez atteint votre limite de documents."
+#: packages/ui/primitives/document-dropzone.tsx:69
-=======
+#~ msgid "You have reached your document limit.<<<<<<< HEAD"
-msgstr "Vous avez atteint votre limite de documents."
+#~ msgstr "Vous avez atteint votre limite de documents."
 
 #: packages/email/templates/document-rejection-confirmed.tsx:27
 msgid "You have rejected the document '{documentName}'"
@@ -1906,10 +1858,4 @@ msgstr "Votre mot de passe a été mis à jour."
 #: packages/email/templates/team-delete.tsx:28
 #: packages/email/templates/team-delete.tsx:32
 msgid "Your team has been deleted"
-msgstr "Votre équipe a été supprimée"
+msgstr "Votre équipe a été supprimée<<<<<<< HEAD>>>>>>> main||||||| 876803b5d=======>>>>>>> main"
-<<<<<<< HEAD
->>>>>>> main
-||||||| 876803b5d
-=======
-
->>>>>>> main

packages/lib/translations/fr/marketing.po

@@ -8,19 +8,11 @@ msgstr ""
 "Language: fr\n"
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-<<<<<<< HEAD
-"PO-Revision-Date: \n"
-||||||| 7fc497a64
-"PO-Revision-Date: 2024-10-18 04:04\n"
-=======
-"PO-Revision-Date: 2024-11-12 05:45\n"
->>>>>>> main
-||||||| 876803b5d
-"PO-Revision-Date: 2024-11-12 05:45\n"
-=======
 "PO-Revision-Date: 2024-11-14 12:05\n"
->>>>>>> main
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Plural-Forms: \n"
@@ -608,11 +600,8 @@ msgstr ""
 
 #: apps/marketing/src/components/(marketing)/carousel.tsx:272
 msgid "Your browser does not support the video tag."
-<<<<<<< HEAD
 msgstr ""
-||||||| 876803b5d
-msgstr "Votre navigateur ne prend pas en charge la balise vidéo."
-=======
-msgstr "Votre navigateur ne prend pas en charge la balise vidéo."
 
->>>>>>> main
+#: apps/marketing/src/components/(marketing)/carousel.tsx:272
+#~ msgid "Your browser does not support the video tag.<<<<<<< HEAD"
+#~ msgstr "Votre navigateur ne prend pas en charge la balise vidéo.>>>>>>> main"

packages/lib/translations/fr/web.po

@@ -8,19 +8,11 @@ msgstr ""
 "Language: fr\n"
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-<<<<<<< HEAD
-"PO-Revision-Date: \n"
-||||||| 7fc497a64
-"PO-Revision-Date: 2024-10-18 04:04\n"
-=======
-"PO-Revision-Date: 2024-11-12 05:45\n"
->>>>>>> main
-||||||| 876803b5d
-"PO-Revision-Date: 2024-11-12 05:45\n"
-=======
 "PO-Revision-Date: 2024-11-14 12:05\n"
->>>>>>> main
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
+"PO-Revision-Date: 2024-11-14 12:05\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Plural-Forms: \n"
@@ -107,17 +99,8 @@ msgstr ""
 msgid "{0} direct signing templates"
 msgstr ""
 
-#: apps/web/src/app/(recipient)/d/[token]/direct-template.tsx:66
-<<<<<<< HEAD
-msgid "{0} document"
-msgstr ""
-||||||| 7fc497a64
-msgid "{0} document"
-msgstr "{0} document"
-=======
 #~ msgid "{0} document"
-#~ msgstr "{0} document"
+#~ msgstr "{0} document>>>>>>> main"
->>>>>>> main
 
 #: apps/web/src/app/(dashboard)/documents/upload-document.tsx:146
 msgid "{0} of {1} documents remaining this month."
@@ -127,17 +110,8 @@ msgstr ""
 msgid "{0} Recipient(s)"
 msgstr ""
 
-#: apps/web/src/app/(recipient)/d/[token]/direct-template.tsx:67
-<<<<<<< HEAD
-msgid "{0} the document to complete the process."
-msgstr ""
-||||||| 7fc497a64
-msgid "{0} the document to complete the process."
-msgstr "{0} le document pour compléter le processus."
-=======
 #~ msgid "{0} the document to complete the process."
-#~ msgstr "{0} the document to complete the process."
+#~ msgstr "{0} the document to complete the process.>>>>>>> main"
->>>>>>> main
 
 #: apps/web/src/app/(signing)/sign/[token]/text-field.tsx:292
 msgid "{charactersRemaining, plural, one {1 character remaining} other {{charactersRemaining} characters remaining}}"
@@ -366,21 +340,11 @@ msgstr ""
 
 #: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:171
 msgid "Add Signers"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:179
-msgid "Add Subject"
-msgstr ""
-||||||| 7fc497a64
-#: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:179
-msgid "Add Subject"
-msgstr "Ajouter un sujet"
-=======
 #: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:180
 #~ msgid "Add Subject"
-#~ msgstr "Add Subject"
+#~ msgstr "Add Subject>>>>>>> main"
->>>>>>> main
 
 #: apps/web/src/components/(teams)/dialogs/add-team-email-dialog.tsx:133
 msgid "Add team email"
@@ -392,21 +356,11 @@ msgstr ""
 
 #: apps/web/src/app/(dashboard)/templates/use-template-dialog.tsx:220
 msgid "Add the recipients to create the document with"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
-#: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:180
-msgid "Add the subject and message you wish to send to signers."
-msgstr ""
-||||||| 7fc497a64
-#: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:180
-msgid "Add the subject and message you wish to send to signers."
-msgstr "Ajouter le sujet et le message que vous souhaitez envoyer aux signataires."
-=======
 #: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:181
 #~ msgid "Add the subject and message you wish to send to signers."
-#~ msgstr "Add the subject and message you wish to send to signers."
+#~ msgstr "Add the subject and message you wish to send to signers.>>>>>>> main"
->>>>>>> main
 
 #: apps/web/src/components/(teams)/dialogs/create-team-checkout-dialog.tsx:152
 msgid "Adding and removing seats will adjust your invoice accordingly."
@@ -791,7 +745,7 @@ msgstr ""
 msgid "Basic details"
 msgstr ""
 
-#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:72
+#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:74
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/billing/page.tsx:61
 #: apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx:117
 #: apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx:120
@@ -1242,20 +1196,12 @@ msgstr ""
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx:100
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/webhooks/page.tsx:93
 msgid "Created on {0}"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx:100
-msgid "Created on{0}"
+#~ msgid "Created on{0}"
-msgstr ""
+#~ msgstr "Créé le{0}=======>>>>>>> main"
 
-||||||| 7fc497a64
-#: apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx:100
-msgid "Created on{0}"
-msgstr "Créé le{0}"
-
-=======
->>>>>>> main
 #: apps/web/src/components/forms/password.tsx:107
 msgid "Current Password"
 msgstr ""
@@ -1587,19 +1533,15 @@ msgstr ""
 
 #: apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx:327
 msgid "Document sent"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
 #: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:133
-||||||| 7fc497a64
 #: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:132
-=======
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/documents/page.tsx:26
 #~ msgid "Document Settings"
 #~ msgstr "Document Settings"
 
-#: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:132
+#: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:133
->>>>>>> main
 msgid "Document Signed"
 msgstr ""
 
@@ -1884,13 +1826,10 @@ msgstr ""
 #: apps/web/src/components/(dashboard)/layout/verify-email-banner.tsx:54
 #: apps/web/src/components/(dashboard)/settings/webhooks/create-webhook-dialog.tsx:101
 msgid "Error"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
 #: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:143
-||||||| 7fc497a64
 #: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:142
-=======
 #: apps/web/src/components/forms/team-document-settings.tsx:77
 #~ msgid "Error updating global team settings"
 #~ msgstr "Error updating global team settings"
@@ -1899,8 +1838,7 @@ msgstr ""
 msgid "Everyone can access and view the document"
 msgstr "Tout le monde peut accéder et voir le document"
 
-#: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:142
+#: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:143
->>>>>>> main
 msgid "Everyone has signed"
 msgstr ""
 
@@ -1919,20 +1857,12 @@ msgstr ""
 #: apps/web/src/app/(dashboard)/settings/tokens/page.tsx:71
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx:104
 msgid "Expires on {0}"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
-<<<<<<< HEAD
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx:107
-msgid "Expires on{0}"
+#~ msgid "Expires on{0}"
-msgstr ""
+#~ msgstr "Expire le{0}=======>>>>>>> main"
 
-||||||| 7fc497a64
-#: apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx:107
-msgid "Expires on{0}"
-msgstr "Expire le{0}"
-
-=======
->>>>>>> main
 #: apps/web/src/app/(dashboard)/admin/documents/[id]/admin-actions.tsx:42
 msgid "Failed to reseal document"
 msgstr ""
@@ -2309,6 +2239,10 @@ msgstr ""
 msgid "Manage and view template"
 msgstr "Gérer et afficher le modèle"
 
+#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:136
+msgid "Manage billing"
+msgstr ""
+
 #: apps/web/src/components/templates/manage-public-template-dialog.tsx:341
 msgid "Manage details for this public template"
 msgstr ""
@@ -2329,7 +2263,7 @@ msgstr ""
 msgid "Manage subscription"
 msgstr ""
 
-#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:66
+#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:67
 msgid "Manage Subscription"
 msgstr ""
 
@@ -3410,7 +3344,7 @@ msgstr ""
 #: apps/web/src/app/(dashboard)/documents/delete-document-dialog.tsx:80
 #: apps/web/src/app/(dashboard)/documents/duplicate-document-dialog.tsx:72
 #: apps/web/src/app/(dashboard)/settings/billing/billing-plans.tsx:62
-#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:50
+#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:51
 #: apps/web/src/app/(dashboard)/settings/public-profile/public-profile-page-view.tsx:124
 #: apps/web/src/app/(dashboard)/settings/security/passkeys/user-passkeys-data-table-actions.tsx:73
 #: apps/web/src/app/(dashboard)/settings/security/passkeys/user-passkeys-data-table-actions.tsx:93
@@ -4530,7 +4464,7 @@ msgstr ""
 msgid "Want your own public profile?"
 msgstr ""
 
-#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:40
+#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:41
 #: apps/web/src/app/(teams)/t/[teamUrl]/layout-billing-banner.tsx:55
 #: apps/web/src/components/(teams)/team-billing-portal-button.tsx:31
 msgid "We are unable to proceed to the billing portal at this time. Please try again, or contact support."
@@ -4863,7 +4797,7 @@ msgstr ""
 msgid "You are about to revoke access for team <0>{0}</0> ({1}) to use your email."
 msgstr ""
 
-#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:78
+#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:80
 msgid "You are currently on the <0>Free Plan</0>."
 msgstr ""
 
@@ -4915,7 +4849,7 @@ msgstr ""
 msgid "You cannot upload encrypted PDFs"
 msgstr ""
 
-#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:45
+#: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:46
 msgid "You do not currently have a customer record, this should not happen. Please contact support for assistance."
 msgstr ""
 
@@ -5061,7 +4995,7 @@ msgstr "L'URL de votre site web de marque"
 msgid "Your branding preferences have been updated"
 msgstr "Vos préférences de branding ont été mises à jour"
 
-#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:119
+#: apps/web/src/app/(dashboard)/settings/billing/page.tsx:125
 msgid "Your current plan is past due. Please update your payment information."
 msgstr ""
 
@@ -5195,11 +5129,9 @@ msgstr ""
 #: apps/web/src/app/(dashboard)/settings/tokens/page.tsx:53
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx:86
 msgid "Your tokens will be shown here once you create them."
-<<<<<<< HEAD
 msgstr ""
-||||||| 876803b5d
-msgstr "Vos jetons seront affichés ici une fois que vous les aurez créés."
-=======
-msgstr "Vos jetons seront affichés ici une fois que vous les aurez créés."
 
->>>>>>> main
+#: apps/web/src/app/(dashboard)/settings/tokens/page.tsx:53
+#: apps/web/src/app/(teams)/t/[teamUrl]/settings/tokens/page.tsx:86
+#~ msgid "Your tokens will be shown here once you create them.<<<<<<< HEAD"
+#~ msgstr "Vos jetons seront affichés ici une fois que vous les aurez créés.>>>>>>> main"