about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/locale/locales/cs/messages.po4
-rw-r--r--src/locale/locales/en/messages.po4
-rw-r--r--src/locale/locales/es/messages.po4
-rw-r--r--src/locale/locales/fr/messages.po4
-rw-r--r--src/locale/locales/hi/messages.po4
5 files changed, 10 insertions, 10 deletions
diff --git a/src/locale/locales/cs/messages.po b/src/locale/locales/cs/messages.po
index cc8065344..6242f57e0 100644
--- a/src/locale/locales/cs/messages.po
+++ b/src/locale/locales/cs/messages.po
@@ -1328,7 +1328,7 @@ msgstr ""
 #: src/view/screens/PreferencesHomeFeed.tsx:226
 #: src/view/screens/PreferencesHomeFeed.tsx:263
 msgid "No"
-msgstr "<<<<<<< HEAD"
+msgstr ""
 
 #: src/view/screens/ProfileFeed.tsx:636
 #: src/view/screens/ProfileList.tsx:740
@@ -1989,7 +1989,7 @@ msgstr ""
 
 #: src/view/screens/Settings.tsx:666
 msgid "Storybook"
-msgstr "<<<<<<< HEAD======="
+msgstr ""
 
 #: src/view/com/modals/AppealLabel.tsx:101
 msgid "Submit"
diff --git a/src/locale/locales/en/messages.po b/src/locale/locales/en/messages.po
index 6d212c380..c78f06235 100644
--- a/src/locale/locales/en/messages.po
+++ b/src/locale/locales/en/messages.po
@@ -1328,7 +1328,7 @@ msgstr ""
 #: src/view/screens/PreferencesHomeFeed.tsx:226
 #: src/view/screens/PreferencesHomeFeed.tsx:263
 msgid "No"
-msgstr "<<<<<<< HEAD"
+msgstr ""
 
 #: src/view/screens/ProfileFeed.tsx:636
 #: src/view/screens/ProfileList.tsx:740
@@ -1989,7 +1989,7 @@ msgstr ""
 
 #: src/view/screens/Settings.tsx:666
 msgid "Storybook"
-msgstr "<<<<<<< HEAD======="
+msgstr ""
 
 #: src/view/com/modals/AppealLabel.tsx:101
 msgid "Submit"
diff --git a/src/locale/locales/es/messages.po b/src/locale/locales/es/messages.po
index 2fed15ea0..b7169135a 100644
--- a/src/locale/locales/es/messages.po
+++ b/src/locale/locales/es/messages.po
@@ -1328,7 +1328,7 @@ msgstr ""
 #: src/view/screens/PreferencesHomeFeed.tsx:226
 #: src/view/screens/PreferencesHomeFeed.tsx:263
 msgid "No"
-msgstr "<<<<<<< HEAD"
+msgstr ""
 
 #: src/view/screens/ProfileFeed.tsx:636
 #: src/view/screens/ProfileList.tsx:740
@@ -1989,7 +1989,7 @@ msgstr ""
 
 #: src/view/screens/Settings.tsx:666
 msgid "Storybook"
-msgstr "<<<<<<< HEAD======="
+msgstr ""
 
 #: src/view/com/modals/AppealLabel.tsx:101
 msgid "Submit"
diff --git a/src/locale/locales/fr/messages.po b/src/locale/locales/fr/messages.po
index 5664a15a5..f6a018066 100644
--- a/src/locale/locales/fr/messages.po
+++ b/src/locale/locales/fr/messages.po
@@ -1328,7 +1328,7 @@ msgstr ""
 #: src/view/screens/PreferencesHomeFeed.tsx:226
 #: src/view/screens/PreferencesHomeFeed.tsx:263
 msgid "No"
-msgstr "<<<<<<< HEAD"
+msgstr ""
 
 #: src/view/screens/ProfileFeed.tsx:636
 #: src/view/screens/ProfileList.tsx:740
@@ -1989,7 +1989,7 @@ msgstr ""
 
 #: src/view/screens/Settings.tsx:666
 msgid "Storybook"
-msgstr "<<<<<<< HEAD======="
+msgstr ""
 
 #: src/view/com/modals/AppealLabel.tsx:101
 msgid "Submit"
diff --git a/src/locale/locales/hi/messages.po b/src/locale/locales/hi/messages.po
index d51dcf27f..10342b5ed 100644
--- a/src/locale/locales/hi/messages.po
+++ b/src/locale/locales/hi/messages.po
@@ -1320,7 +1320,7 @@ msgstr "अगली फोटो"
 #: src/view/screens/PreferencesHomeFeed.tsx:226
 #: src/view/screens/PreferencesHomeFeed.tsx:263
 msgid "No"
-msgstr "नहीं<<<<<<< HEAD"
+msgstr "नहीं"
 
 #: src/view/screens/ProfileFeed.tsx:636
 #: src/view/screens/ProfileList.tsx:740
@@ -1981,7 +1981,7 @@ msgstr "स्थिति पृष्ठ"
 
 #: src/view/screens/Settings.tsx:666
 msgid "Storybook"
-msgstr "Storybook<<<<<<< HEAD======="
+msgstr "Storybook"
 
 #: src/view/com/modals/AppealLabel.tsx:101
 msgid "Submit"