diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-05-21 16:30:24 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-05-21 16:30:24 -0500 |
| commit | 6dd676e00690e2bfd117e480461ca5a83c1a3a95 (patch) | |
| tree | f94c0f5311d9b995d78420c17f314a820c2ec6d8 | |
| parent | f93806ea55956f911e24e52d8aa339573e37dd00 (diff) | |
| parent | 810f92e697f0533a70f7d65b5079b34b5d74702f (diff) | |
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.
| -rw-r--r-- | app/javascript/mastodon/locales/pl.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 486971c6d..cca48eaf6 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -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ą", |