diff options
| author | dan <dan.abramov@gmail.com> | 2023-12-08 01:08:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-07 17:08:23 -0800 |
| commit | 00731f62fe3c650f1553527e5dc02fb582096886 (patch) | |
| tree | 1a7036741c3c444f179c8165905ea98a3a6cd8c5 /src | |
| parent | 9d51886e438b1676706009d91bdcf20e8df5dd58 (diff) | |
| download | voidsky-00731f62fe3c650f1553527e5dc02fb582096886.tar.zst | |
Fix bad merge in translations (#2144)
Diffstat (limited to 'src')
| -rw-r--r-- | src/locale/locales/cs/messages.po | 4 | ||||
| -rw-r--r-- | src/locale/locales/en/messages.po | 4 | ||||
| -rw-r--r-- | src/locale/locales/es/messages.po | 4 | ||||
| -rw-r--r-- | src/locale/locales/fr/messages.po | 4 | ||||
| -rw-r--r-- | src/locale/locales/hi/messages.po | 4 |
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" |