fix: i18n merge conflict

packages/app/i18n/en.pot

@@ -5,18 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-<<<<<<< HEAD
-<<<<<<< HEAD
-"POT-Creation-Date: 2020-01-29T07:22:55.986Z\n"
-"PO-Revision-Date: 2020-01-29T07:22:55.986Z\n"
-=======
-"POT-Creation-Date: 2019-11-29T10:59:48.425Z\n"
-"PO-Revision-Date: 2019-11-29T10:59:48.425Z\n"
->>>>>>> fix: pin to [email protected] (#495)
-=======
-"POT-Creation-Date: 2019-11-29T10:59:48.425Z\n"
-"PO-Revision-Date: 2019-11-29T10:59:48.425Z\n"
->>>>>>> 7949c85baae16d355758b4cb729b506ee778bd75
+"POT-Creation-Date: 2020-02-02T13:49:38.927Z\n"
+"PO-Revision-Date: 2020-02-02T13:49:38.927Z\n"
 
 msgid "Rename successful"
 msgstr ""
@@ -54,7 +44,7 @@ msgid ""
 "items. Only the first {{maxNumber}} items will be used and saved."
 msgstr ""
 
-msgid "Search dimensions"
+msgid "Filter dimensions"
 msgstr ""
 
 msgid "Download"
@@ -105,17 +95,10 @@ msgstr ""
 msgid "Hide"
 msgstr ""
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 msgid "Interpretations"
 msgstr ""
 
 msgid "{{total}} of {{axisMaxNumberOfItems}} selected"
-=======
-=======
->>>>>>> 7949c85baae16d355758b4cb729b506ee778bd75
-msgid "{{total}} of {{maxNumberOfItemsPerAxis}} selected"
->>>>>>> fix: pin to [email protected] (#495)
 msgstr ""
 
 msgid "{{total}} selected"
@@ -124,14 +107,7 @@ msgstr ""
 msgid "{{dimensionName}} is locked to {{axisName}} for {{visTypeName}}"
 msgstr ""
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 msgid "Columns"
-=======
-=======
->>>>>>> 7949c85baae16d355758b4cb729b506ee778bd75
-msgid "Move to"
->>>>>>> fix: pin to [email protected] (#495)
 msgstr ""
 
 msgid "Rows"
@@ -427,13 +403,13 @@ msgstr ""
 msgid "Skip rounding"
 msgstr ""
 
-msgid "Low to high"
+msgid "Custom sort order"
 msgstr ""
 
-msgid "High to low"
+msgid "Low to high"
 msgstr ""
 
-msgid "Custom sort order"
+msgid "High to low"
 msgstr ""
 
 msgid "Add a subtitle"