mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases 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.
This commit is contained in:
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.local_timeline": "Lokalne",
"tabs_bar.notifications": "Powiadomienia", "tabs_bar.notifications": "Powiadomienia",
"tabs_bar.search": "Szukaj", "tabs_bar.search": "Szukaj",
"timeline.media": "Media", "timeline.media": "Zawartość multimedialna",
"timeline.posts": "Toots", "timeline.posts": "Wpisy",
"ui.beforeunload": "Utracisz tworzony wpis, jeżeli opuścisz Mastodona.", "ui.beforeunload": "Utracisz tworzony wpis, jeżeli opuścisz Mastodona.",
"upload_area.title": "Przeciągnij i upuść aby wysłać", "upload_area.title": "Przeciągnij i upuść aby wysłać",
"upload_button.label": "Dodaj zawartość multimedialną", "upload_button.label": "Dodaj zawartość multimedialną",