acetheking987/bsky-social-app
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Fix bad merge in translations (#2144)

Browse Source
This commit is contained in:
dan
2023-12-08 01:08:23 +00:00
committed by GitHub
parent 9d51886e43
commit 00731f62fe
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/locale/locales/cs/messages.po
+2 -2
View File
@@ -1328,7 +1328,7 @@ msgstr ""
#: src/view/screens/PreferencesHomeFeed.tsx:226 #: src/view/screens/PreferencesHomeFeed.tsx:226
#: src/view/screens/PreferencesHomeFeed.tsx:263 #: src/view/screens/PreferencesHomeFeed.tsx:263
msgid "No" msgid "No"
msgstr "<<<<<<< HEAD" msgstr ""
#: src/view/screens/ProfileFeed.tsx:636 #: src/view/screens/ProfileFeed.tsx:636
#: src/view/screens/ProfileList.tsx:740 #: src/view/screens/ProfileList.tsx:740
@@ -1989,7 +1989,7 @@ msgstr ""
#: src/view/screens/Settings.tsx:666 #: src/view/screens/Settings.tsx:666
msgid "Storybook" msgid "Storybook"
msgstr "<<<<<<< HEAD=======" msgstr ""
#: src/view/com/modals/AppealLabel.tsx:101 #: src/view/com/modals/AppealLabel.tsx:101
msgid "Submit" msgid "Submit"
src/locale/locales/en/messages.po
+2 -2
View File
@@ -1328,7 +1328,7 @@ msgstr ""
#: src/view/screens/PreferencesHomeFeed.tsx:226 #: src/view/screens/PreferencesHomeFeed.tsx:226
#: src/view/screens/PreferencesHomeFeed.tsx:263 #: src/view/screens/PreferencesHomeFeed.tsx:263
msgid "No" msgid "No"
msgstr "<<<<<<< HEAD" msgstr ""
#: src/view/screens/ProfileFeed.tsx:636 #: src/view/screens/ProfileFeed.tsx:636
#: src/view/screens/ProfileList.tsx:740 #: src/view/screens/ProfileList.tsx:740
@@ -1989,7 +1989,7 @@ msgstr ""
#: src/view/screens/Settings.tsx:666 #: src/view/screens/Settings.tsx:666
msgid "Storybook" msgid "Storybook"
msgstr "<<<<<<< HEAD=======" msgstr ""
#: src/view/com/modals/AppealLabel.tsx:101 #: src/view/com/modals/AppealLabel.tsx:101
msgid "Submit" msgid "Submit"
src/locale/locales/es/messages.po
+2 -2
View File
@@ -1328,7 +1328,7 @@ msgstr ""
#: src/view/screens/PreferencesHomeFeed.tsx:226 #: src/view/screens/PreferencesHomeFeed.tsx:226
#: src/view/screens/PreferencesHomeFeed.tsx:263 #: src/view/screens/PreferencesHomeFeed.tsx:263
msgid "No" msgid "No"
msgstr "<<<<<<< HEAD" msgstr ""
#: src/view/screens/ProfileFeed.tsx:636 #: src/view/screens/ProfileFeed.tsx:636
#: src/view/screens/ProfileList.tsx:740 #: src/view/screens/ProfileList.tsx:740
@@ -1989,7 +1989,7 @@ msgstr ""
#: src/view/screens/Settings.tsx:666 #: src/view/screens/Settings.tsx:666
msgid "Storybook" msgid "Storybook"
msgstr "<<<<<<< HEAD=======" msgstr ""
#: src/view/com/modals/AppealLabel.tsx:101 #: src/view/com/modals/AppealLabel.tsx:101
msgid "Submit" msgid "Submit"
src/locale/locales/fr/messages.po
+2 -2
View File
@@ -1328,7 +1328,7 @@ msgstr ""
#: src/view/screens/PreferencesHomeFeed.tsx:226 #: src/view/screens/PreferencesHomeFeed.tsx:226
#: src/view/screens/PreferencesHomeFeed.tsx:263 #: src/view/screens/PreferencesHomeFeed.tsx:263
msgid "No" msgid "No"
msgstr "<<<<<<< HEAD" msgstr ""
#: src/view/screens/ProfileFeed.tsx:636 #: src/view/screens/ProfileFeed.tsx:636
#: src/view/screens/ProfileList.tsx:740 #: src/view/screens/ProfileList.tsx:740
@@ -1989,7 +1989,7 @@ msgstr ""
#: src/view/screens/Settings.tsx:666 #: src/view/screens/Settings.tsx:666
msgid "Storybook" msgid "Storybook"
msgstr "<<<<<<< HEAD=======" msgstr ""
#: src/view/com/modals/AppealLabel.tsx:101 #: src/view/com/modals/AppealLabel.tsx:101
msgid "Submit" msgid "Submit"
src/locale/locales/hi/messages.po
+2 -2
View File
@@ -1320,7 +1320,7 @@ msgstr "अगली फोटो"
#: src/view/screens/PreferencesHomeFeed.tsx:226 #: src/view/screens/PreferencesHomeFeed.tsx:226
#: src/view/screens/PreferencesHomeFeed.tsx:263 #: src/view/screens/PreferencesHomeFeed.tsx:263
msgid "No" msgid "No"
msgstr "नहीं<<<<<<< HEAD" msgstr "नहीं"
#: src/view/screens/ProfileFeed.tsx:636 #: src/view/screens/ProfileFeed.tsx:636
#: src/view/screens/ProfileList.tsx:740 #: src/view/screens/ProfileList.tsx:740
@@ -1981,7 +1981,7 @@ msgstr "स्थिति पृष्ठ"
#: src/view/screens/Settings.tsx:666 #: src/view/screens/Settings.tsx:666
msgid "Storybook" msgid "Storybook"
msgstr "Storybook<<<<<<< HEAD=======" msgstr "Storybook"
#: src/view/com/modals/AppealLabel.tsx:101 #: src/view/com/modals/AppealLabel.tsx:101
msgid "Submit" msgid "Submit"