diff options
| author | feld <feld@feld.me> | 2023-06-02 15:41:40 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2023-06-02 15:41:40 +0000 |
| commit | 86b38dd14bece668e8fd4d244cbc8248aa96361f (patch) | |
| tree | eff0145d57fb490236a3d9c09ff03df87f0f99ca /priv | |
| parent | 2e45be2653f662f60e87fce56aa3c256e20bd1fb (diff) | |
| parent | e8d35256653d196fd7c0daba8673a74dfe40a8e8 (diff) | |
| download | pleroma-86b38dd14bece668e8fd4d244cbc8248aa96361f.tar.gz pleroma-86b38dd14bece668e8fd4d244cbc8248aa96361f.zip | |
Merge branch 'develop' into 'phoenix1.7'
# Conflicts:
# mix.exs
Diffstat (limited to 'priv')
| -rw-r--r-- | priv/gettext/en_test/LC_MESSAGES/default.po | 1 | ||||
| -rw-r--r-- | priv/gettext/en_test/LC_MESSAGES/errors.po | 1 | ||||
| -rw-r--r-- | priv/gettext/en_test/LC_MESSAGES/posix_errors.po | 1 | ||||
| -rw-r--r-- | priv/gettext/en_test/LC_MESSAGES/static_pages.po | 4 | ||||
| -rw-r--r-- | priv/gettext/ru/LC_MESSAGES/errors.po | 1 | ||||
| -rw-r--r-- | priv/gettext/zh_Hans/LC_MESSAGES/static_pages.po | 4 |
6 files changed, 0 insertions, 12 deletions
diff --git a/priv/gettext/en_test/LC_MESSAGES/default.po b/priv/gettext/en_test/LC_MESSAGES/default.po index 63db74608..037e14466 100644 --- a/priv/gettext/en_test/LC_MESSAGES/default.po +++ b/priv/gettext/en_test/LC_MESSAGES/default.po @@ -9,7 +9,6 @@ msgid "" msgstr "" "Language: en_test\n" -"Plural-Forms: nplurals=2\n" #, elixir-format #: lib/pleroma/web/api_spec/render_error.ex:122 diff --git a/priv/gettext/en_test/LC_MESSAGES/errors.po b/priv/gettext/en_test/LC_MESSAGES/errors.po index a40de7f8b..286bbb1aa 100644 --- a/priv/gettext/en_test/LC_MESSAGES/errors.po +++ b/priv/gettext/en_test/LC_MESSAGES/errors.po @@ -9,7 +9,6 @@ msgid "" msgstr "" "Language: en_test\n" -"Plural-Forms: nplurals=2\n" msgid "can't be blank" msgstr "" diff --git a/priv/gettext/en_test/LC_MESSAGES/posix_errors.po b/priv/gettext/en_test/LC_MESSAGES/posix_errors.po index 663fc5924..6ff9dc53d 100644 --- a/priv/gettext/en_test/LC_MESSAGES/posix_errors.po +++ b/priv/gettext/en_test/LC_MESSAGES/posix_errors.po @@ -9,7 +9,6 @@ msgid "" msgstr "" "Language: en_test\n" -"Plural-Forms: nplurals=2\n" msgid "eperm" msgstr "" diff --git a/priv/gettext/en_test/LC_MESSAGES/static_pages.po b/priv/gettext/en_test/LC_MESSAGES/static_pages.po index 1a3b7b355..daf312093 100644 --- a/priv/gettext/en_test/LC_MESSAGES/static_pages.po +++ b/priv/gettext/en_test/LC_MESSAGES/static_pages.po @@ -21,10 +21,6 @@ msgstr "" #~ ## #~ ## Use "mix gettext.extract --merge" or "mix gettext.merge" #~ ## to merge POT files into PO files. -#~ msgid "" -#~ msgstr "" -#~ "Language: en_test\n" -#~ "Plural-Forms: nplurals=2\n" #, elixir-format #: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:9 diff --git a/priv/gettext/ru/LC_MESSAGES/errors.po b/priv/gettext/ru/LC_MESSAGES/errors.po index 39f83e8a6..64218da6f 100644 --- a/priv/gettext/ru/LC_MESSAGES/errors.po +++ b/priv/gettext/ru/LC_MESSAGES/errors.po @@ -9,7 +9,6 @@ msgid "" msgstr "" "Language: ru\n" -"Plural-Forms: nplurals=3\n" msgid "can't be blank" msgstr "не может быть пустым" diff --git a/priv/gettext/zh_Hans/LC_MESSAGES/static_pages.po b/priv/gettext/zh_Hans/LC_MESSAGES/static_pages.po index cbd6feb60..809b13d47 100644 --- a/priv/gettext/zh_Hans/LC_MESSAGES/static_pages.po +++ b/priv/gettext/zh_Hans/LC_MESSAGES/static_pages.po @@ -24,10 +24,6 @@ msgstr "" ## ## Use "mix gettext.extract --merge" or "mix gettext.merge" ## to merge POT files into PO files. -#~ msgid "" -#~ msgstr "" -#~ "Language: zh_Hans\n" -#~ "Plural-Forms: nplurals=1\n" #: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:9 #, elixir-format |