diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml
index 329b1796cc..89be88ddf9 100644
--- a/.github/workflows/l10n.yml
+++ b/.github/workflows/l10n.yml
@@ -4,16 +4,21 @@ on: pull_request
 jobs:
   l10n-extract-check:
     runs-on: ubuntu-latest
+
     name: Pot check
     steps:
-    - uses: actions/checkout@master
-    - name: Set up Node
-      uses: actions/setup-node@v1
-      with:
-        node-version: 12
-    - name: npm install
-      run: npm ci
-    - name: extract l10n files
-      run: npm run l10n:extract
-    - name: Check l10n file changes
-      run: bash -c "[[ ! \"`git status --porcelain l10n`\" ]] || ( echo 'Uncommited l10n changes. Run \`npm run l10n:extract\`.' && exit 1 )"
+      - uses: actions/checkout@v2
+
+      - name: Set up node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Extract l10n files
+        run: npm run l10n:extract
+
+      - name: Check l10n file changes
+        run: bash -c "[[ ! \"`git status --porcelain l10n`\" ]] || ( echo 'Uncommited l10n changes. Run \`npm run l10n:extract\`.' && exit 1 )"
diff --git a/build/extract-l10n.js b/build/extract-l10n.js
index dfba88c703..dcd9b06201 100644
--- a/build/extract-l10n.js
+++ b/build/extract-l10n.js
@@ -18,6 +18,11 @@ extractor
     ])
     .parseFilesGlob('./src/**/*.@(ts|js|vue)');
 
+// remove references to avoid conflicts
+extractor.getMessages().forEach((msg) => {
+    msg.references = [];
+});
+      
 extractor.savePotFile('./l10n/messages.pot');
 
 extractor.printStats();
diff --git a/l10n/messages.pot b/l10n/messages.pot
index ccfa285b84..63a6e780c9 100644
--- a/l10n/messages.pot
+++ b/l10n/messages.pot
@@ -2,128 +2,95 @@ msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: src/components/MultiselectTags/MultiselectTags.vue:170
 msgid "{tag} (invisible)"
 msgstr ""
 
-#: src/components/MultiselectTags/MultiselectTags.vue:173
 msgid "{tag} (restricted)"
 msgstr ""
 
-#: src/components/Actions/Actions.vue:254
 msgid "Actions"
 msgstr ""
 
-#: src/components/EmojiPicker/EmojiPicker.vue:176
 msgid "Activities"
 msgstr ""
 
-#: src/components/EmojiPicker/EmojiPicker.vue:174
 msgid "Animals & Nature"
 msgstr ""
 
-#: src/components/ColorPicker/ColorPicker.vue:145
 msgid "Choose"
 msgstr ""
 
-#: src/components/Modal/Modal.vue:117
 msgid "Close"
 msgstr ""
 
-#: src/components/EmojiPicker/EmojiPicker.vue:181
 msgid "Custom"
 msgstr ""
 
-#: src/components/EmojiPicker/EmojiPicker.vue:180
 msgid "Flags"
 msgstr ""
 
-#: src/components/EmojiPicker/EmojiPicker.vue:175
 msgid "Food & Drink"
 msgstr ""
 
-#: src/components/EmojiPicker/EmojiPicker.vue:171
 msgid "Frequently used"
 msgstr ""
 
-#: src/components/RichContenteditable/RichContenteditable.vue:255
 msgid "Message limit of {count} characters reached"
 msgstr ""
 
-#: src/components/Modal/Modal.vue:166
 msgid "Next"
 msgstr ""
 
-#: src/components/EmojiPicker/EmojiPicker.vue:168
 msgid "No emoji found"
 msgstr ""
 
-#: src/components/Multiselect/Multiselect.vue:174
-#: src/components/MultiselectTags/MultiselectTags.vue:78
-#: src/components/SettingsSelectGroup/SettingsSelectGroup.vue:38
 msgid "No results"
 msgstr ""
 
-#: src/components/EmojiPicker/EmojiPicker.vue:178
 msgid "Objects"
 msgstr ""
 
-#: src/components/Modal/Modal.vue:302
 msgid "Pause slideshow"
 msgstr ""
 
-#: src/components/EmojiPicker/EmojiPicker.vue:173
 msgid "People & Body"
 msgstr ""
 
-#: src/components/EmojiPicker/EmojiPicker.vue:153
 msgid "Pick an emoji"
 msgstr ""
 
-#: src/components/Modal/Modal.vue:144
 msgid "Previous"
 msgstr ""
 
-#: src/components/EmojiPicker/EmojiPicker.vue:167
 msgid "Search"
 msgstr ""
 
-#: src/components/EmojiPicker/EmojiPicker.vue:170
 msgid "Search results"
 msgstr ""
 
-#: src/components/MultiselectTags/MultiselectTags.vue:100
 msgid "Select a tag"
 msgstr ""
 
-#: src/components/AppNavigationSettings/AppNavigationSettings.vue:57
 msgid "Settings"
 msgstr ""
 
-#: src/components/AppSettingsDialog/AppSettingsDialog.vue:106
 msgid "Settings navigation"
 msgstr ""
 
-#: src/components/EmojiPicker/EmojiPicker.vue:172
 msgid "Smileys & Emotion"
 msgstr ""
 
-#: src/components/Modal/Modal.vue:302
 msgid "Start slideshow"
 msgstr ""
 
-#: src/components/EmojiPicker/EmojiPicker.vue:179
 msgid "Symbols"
 msgstr ""
 
-#: src/components/EmojiPicker/EmojiPicker.vue:177
 msgid "Travel & Places"
 msgstr ""
 
-#: src/components/SettingsSelectGroup/SettingsSelectGroup.vue:143
 msgid "Unable to search the group"
 msgstr ""
 
-#: src/components/RichContenteditable/RichContenteditable.vue:152
 msgid "Write message, @ to mention someone …"
 msgstr ""