treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

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.
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
David Yip 2018-05-21 16:30:24 -05:00
parent f93806ea55 810f92e697
commit 6dd676e006
No known key found for this signature in database
GPG Key ID: 7DA0036508FCC0CC
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/locales/pl.json
View File

@ -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ą",