diff --git a/static/app-strings.json b/static/app-strings.json
index 81e649822..85ea452ad 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -192,7 +192,8 @@
   "Comments": "Comments",
   "Comment": "Comment",
   "Your comment": "Your comment",
-  "Post": "Post",
+  "Post --[button to submit something]--": "Post",
+  "Post --[noun, markdown post tab button]--": "Post",
   "Posting...": "Posting...",
   "Incompatible daemon": "Incompatible daemon",
   "Incompatible daemon running": "Incompatible daemon running",
diff --git a/ui/component/commentCreate/view.jsx b/ui/component/commentCreate/view.jsx
index 45bb59720..94754239e 100644
--- a/ui/component/commentCreate/view.jsx
+++ b/ui/component/commentCreate/view.jsx
@@ -120,7 +120,7 @@ export function CommentCreate(props: Props) {
           label={isFetchingChannels ? __('Comment') : undefined}
         />
         <div className="section__actions">
-          <Button disabled button="primary" label={__('Post')} requiresAuth={IS_WEB} />
+          <Button disabled button="primary" label={__('Post --[button to submit something]--')} requiresAuth={IS_WEB} />
         </div>
       </div>
     );
@@ -170,7 +170,7 @@ export function CommentCreate(props: Props) {
                 : __('Reply')
               : isPostingComment
               ? __('Posting...')
-              : __('Post')
+              : __('Post --[button to submit something]--')
           }
           requiresAuth={IS_WEB}
         />
diff --git a/ui/component/publishFile/view.jsx b/ui/component/publishFile/view.jsx
index 4bc6e4e74..74e0e5356 100644
--- a/ui/component/publishFile/view.jsx
+++ b/ui/component/publishFile/view.jsx
@@ -371,7 +371,7 @@ function PublishFile(props: Props) {
           )}
           {isPublishPost && (
             <PostEditor
-              label={__('Post')}
+              label={__('Post --[noun, markdown post tab button]--')}
               uri={uri}
               disabled={disabled}
               fileMimeType={fileMimeType}
diff --git a/ui/component/publishForm/view.jsx b/ui/component/publishForm/view.jsx
index 68492fbe5..5b5a0da98 100644
--- a/ui/component/publishForm/view.jsx
+++ b/ui/component/publishForm/view.jsx
@@ -34,6 +34,11 @@ import tempy from 'tempy';
 
 const MODES = Object.values(PUBLISH_MODES);
 
+const MODE_TO_I18N_STR = {
+  [PUBLISH_MODES.FILE]: 'File',
+  [PUBLISH_MODES.POST]: 'Post --[noun, markdown post tab button]--',
+};
+
 type Props = {
   disabled: boolean,
   tags: Array<Tag>,
@@ -339,7 +344,7 @@ function PublishForm(props: Props) {
               <Button
                 key={index}
                 icon={modeName}
-                label={__(String(modeName))}
+                label={__(MODE_TO_I18N_STR[String(modeName)] || '---')}
                 button="alt"
                 onClick={() => {
                   setMode(modeName);