mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-15 22:56:42 +00:00
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: config/locales/pl.yml The conflict in config/locales/pl.yml concerns the themes key, which is not used in glitchsoc. Resolution: remove the themes key-related changes, i.e. accept-ours.
This commit is contained in:
commit
6dd676e006
|
@ -284,8 +284,8 @@
|
|||
"tabs_bar.local_timeline": "Lokalne",
|
||||
"tabs_bar.notifications": "Powiadomienia",
|
||||
"tabs_bar.search": "Szukaj",
|
||||
"timeline.media": "Media",
|
||||
"timeline.posts": "Toots",
|
||||
"timeline.media": "Zawartość multimedialna",
|
||||
"timeline.posts": "Wpisy",
|
||||
"ui.beforeunload": "Utracisz tworzony wpis, jeżeli opuścisz Mastodona.",
|
||||
"upload_area.title": "Przeciągnij i upuść aby wysłać",
|
||||
"upload_button.label": "Dodaj zawartość multimedialną",
|
||||
|
|
Loading…
Reference in a new issue