Fix bad merge in translations (#2144)

zio/stable
dan 2023-12-08 01:08:23 +00:00 committed by GitHub
parent 9d51886e43
commit 00731f62fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"