IO-2604 Merge in conflicted translations file.

This commit is contained in:
Patrick Fic
2025-07-22 10:25:04 -07:00
parent 2892fdbb58
commit c433103e1b

View File

@@ -2436,7 +2436,7 @@
"fields": { "fields": {
"createdby": "Created By", "createdby": "Created By",
"critical": "Critical", "critical": "Critical",
"pinned": "", "pinned": "Pinned",
"private": "Private", "private": "Private",
"text": "Contents", "text": "Contents",
"type": "Type", "type": "Type",
@@ -2455,7 +2455,7 @@
"addtorelatedro": "Add to Related ROs", "addtorelatedro": "Add to Related ROs",
"newnoteplaceholder": "Add a note...", "newnoteplaceholder": "Add a note...",
"notetoadd": "Note to Add", "notetoadd": "Note to Add",
"pinned_note": "", "pinned_note": "Pinned Note",
"systemnotes": "System Notes", "systemnotes": "System Notes",
"usernotes": "User Notes" "usernotes": "User Notes"
}, },
@@ -3890,7 +3890,6 @@
"state": "Province/State", "state": "Province/State",
"street1": "Street", "street1": "Street",
"street2": "Address 2", "street2": "Address 2",
"tags": "Tags",
"taxid": "Tax ID", "taxid": "Tax ID",
"terms": "Payment Terms", "terms": "Payment Terms",
"zip": "Zip/Postal Code" "zip": "Zip/Postal Code"