Add fr translation and fix some translation on the go

app/client/aclui/AccessRules.ts

@@ -1396,7 +1396,7 @@ class ObsRulePart extends Disposable {
             placeholder: dom.text((use) => {
               return (
                 this._ruleSet.isSoleCondition(use, this) ? t('Everyone') :
-                this._ruleSet.isLastCondition(use, this) ? t('EveryoneElse') :
+                this._ruleSet.isLastCondition(use, this) ? t('Everyone Else') :
                 t('EnterCondition')
               );
             }),
@@ -1445,7 +1445,7 @@ class ObsRulePart extends Disposable {
             wide ? cssCell4.cls('') : null,
             this._memoEditor = aclMemoEditor(this._memo,
               {
-                placeholder: t('MemoEditorPlaceholder'),
+                placeholder: t("Type a message..."),
               },
               dom.onKeyDown({
                 // Match the behavior of the formula editor.

app/client/components/RecordLayoutEditor.js

@@ -93,13 +93,13 @@ RecordLayoutEditor.prototype.buildEditorDom = function() {
   };
 
   return cssControls(
-    basicButton(t('AddField'), cssCollapseIcon('Collapse'),
+    basicButton(t('Add Field'), cssCollapseIcon('Collapse'),
       menu((ctl) => [
-        menuItem(() => addNewField(), t('CreateNewField')),
+        menuItem(() => addNewField(), t('Create New Field')),
         dom.maybe((use) => use(this._hiddenColumns).length > 0,
           () => menuDivider()),
         dom.forEach(this._hiddenColumns, (col) =>
-          menuItem(() => showField(col), t("ShowField", {label:col.label()}))
+          menuItem(() => showField(col), t("Show field {{- label}}", {label:col.label()}))
         ),
         testId('edit-layout-add-menu'),
       ]),
@@ -113,7 +113,7 @@ RecordLayoutEditor.prototype.buildEditorDom = function() {
 
 RecordLayoutEditor.prototype.buildFinishButtons = function() {
   return [
-    primaryButton(t('SaveLayout'),
+    primaryButton(t('Save Layout'),
       dom.on('click', () => commands.allCommands.accept.run()),
     ),
     basicButton(t('Cancel'),

app/client/ui/DocMenu.ts

@@ -293,8 +293,8 @@ function buildOtherSites(home: HomeModel) {
         const siteName = home.app.currentOrgName;
         return [
           dom('div',
-            personal ? t("You are on the {{siteName}} site. You also have access to the following sites:", {siteName}) :
-              t("You are on your personal site. You also have access to the following sites:"),
+            personal ? t("You are on your personal site. You also have access to the following sites:") :
+              t("You are on the {{siteName}} site. You also have access to the following sites:", {siteName}),
             testId('other-sites-message')
           ),
           css.otherSitesButtons(
@@ -306,7 +306,7 @@ function buildOtherSites(home: HomeModel) {
               )
             ),
             testId('other-sites-buttons')
-          )
+          ),
         ];
       })
     );

app/client/ui/MakeCopyMenu.ts

@@ -47,7 +47,7 @@ export async function replaceTrunkWithFork(user: FullUser|null, doc: Document, a
     buttonText = t("Overwrite");
     warningText = `${warningText} ${t("It will be overwritten, losing any content not in this document.")}`;
   } else if (cmp.summary === 'same') {
-    titleText = 'Original Looks Identical';
+    titleText = t('Original Looks Identical');
     warningText = `${warningText} ${t("However, it appears to be already identical.")}`;
   }
   confirmModal(titleText, buttonText,

app/client/ui/WelcomeQuestions.ts

@@ -65,15 +65,15 @@ export function showWelcomeQuestions(userPrefsObs: Observable<UserPrefs>): boole
 }
 
 const choices: Array<{icon: IconName, color: string, textKey: string}> = [
-  {icon: 'UseProduct', color: `${colors.lightGreen}`, textKey: 'ProductDevelopment' },
-  {icon: 'UseFinance', color: '#0075A2',              textKey: 'FinanceAccounting'  },
-  {icon: 'UseMedia',   color: '#F7B32B',              textKey: 'MediaProduction'    },
-  {icon: 'UseMonitor', color: '#F2545B',              textKey: 'ITTechnology'       },
+  {icon: 'UseProduct', color: `${colors.lightGreen}`, textKey: 'Product Development'  },
+  {icon: 'UseFinance', color: '#0075A2',              textKey: 'Finance & Accounting' },
+  {icon: 'UseMedia',   color: '#F7B32B',              textKey: 'Media Production'     },
+  {icon: 'UseMonitor', color: '#F2545B',              textKey: 'IT & Technology'      },
   {icon: 'UseChart',   color: '#7141F9',              textKey: 'Marketing'            },
   {icon: 'UseScience', color: '#231942',              textKey: 'Research'             },
   {icon: 'UseSales',   color: '#885A5A',              textKey: 'Sales'                },
   {icon: 'UseEducate', color: '#4A5899',              textKey: 'Education'            },
-  {icon: 'UseHr',      color: '#688047',              textKey: 'HRManagement'       },
+  {icon: 'UseHr',      color: '#688047',              textKey: 'HR & Management'      },
   {icon: 'UseOther',   color: '#929299',              textKey: 'Other'                },
 ];
 

static/locales/en.client.json

@@ -34,6 +34,7 @@
     "Save": "Save",
     "Saved": "Saved",
     "Special Rules": "Special Rules",
+    "Type a message...": "Type a message...",
     "User Attributes": "User Attributes",
     "View As": "View As"
   },
@@ -87,6 +88,8 @@
     "Create": "Create",
     "Remove": "Remove",
     "Remove API Key": "Remove API Key",
+    "This API key can be used to access this account anonymously via the API.": "This API key can be used to access this account anonymously via the API.",
+    "This API key can be used to access your account via the API. Don’t share your API key with anyone.": "This API key can be used to access your account via the API. Don’t share your API key with anyone.",
     "You're about to delete an API key. This will cause all future requests using this API key to be rejected. Do you still want to delete?": "You're about to delete an API key. This will cause all future requests using this API key to be rejected. Do you still want to delete?"
   },
   "App": {
@@ -426,6 +429,7 @@
     "Organization": "Organization",
     "Original Has Modifications": "Original Has Modifications",
     "Original Looks Unrelated": "Original Looks Unrelated",
+    "Original Looks Identical": "Original Looks Identical",
     "Overwrite": "Overwrite",
     "Replacing the original requires editing rights on the original document.": "Replacing the original requires editing rights on the original document.",
     "Sign up": "Sign up",
@@ -482,11 +486,11 @@
     "Updating record layout.": "Updating record layout."
   },
   "RecordLayoutEditor": {
-    "AddField": "AddField",
-    "Cancel": "Cancel",
-    "CreateNewField": "CreateNewField",
-    "SaveLayout": "SaveLayout",
-    "ShowField": "ShowField"
+    "Add Field": "Add Field",
+    "Create New Field": "Create New Field",
+    "Show field {{- label}}": "Show field {{- label}}",
+    "Save Layout": "Save Layout",
+    "Cancel": "Cancel"
   },
   "RefSelect": {
     "Add Column": "Add Column",
@@ -568,10 +572,10 @@
     "Use choice position": "Use choice position"
   },
   "SortFilterConfig": {
-    "Filter": "Filter",
+    "Filter": "FILTER",
     "Revert": "Revert",
     "Save": "Save",
-    "Sort": "Sort",
+    "Sort": "SORT",
     "Update Sort & Filter settings": "Update Sort & Filter settings"
   },
   "ThemeConfig": {
@@ -672,7 +676,16 @@
     "Select All": "Select All"
   },
   "WelcomeQuestions": {
+    "Education": "Education",
+    "Finance & Accounting": "Finance & Accounting",
+    "HR & Management": "HR & Management",
+    "IT & Technology": "IT & Technology",
+    "Marketing": "Marketing",
+    "Media Production": "Media Production",
     "Other": "Other",
+    "Product Development": "Product Development",
+    "Research": "Research",
+    "Sales": "Sales",
     "Type here": "Type here",
     "Welcome to Grist!": "Welcome to Grist!",
     "What brings you to Grist? Please help us serve you better.": "What brings you to Grist? Please help us serve you better."