tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.
This commit is contained in:
Thibaut Girka
2019-04-08 15:57:56 +02:00
parent 30500dff7c 3f036ac6b8
commit f5f6d23d55
80 changed files with 785 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app/javascript/mastodon/locales/defaultMessages.json
View File

@ -203,26 +203,6 @@
},
{
"descriptors": [
{
"defaultMessage": "Moments remaining",
"id": "time_remaining.moments"
},
{
"defaultMessage": "{number, plural, one {# second} other {# seconds}} left",
"id": "time_remaining.seconds"
},
{
"defaultMessage": "{number, plural, one {# minute} other {# minutes}} left",
"id": "time_remaining.minutes"
},
{
"defaultMessage": "{number, plural, one {# hour} other {# hours}} left",
"id": "time_remaining.hours"
},
{
"defaultMessage": "{number, plural, one {# day} other {# days}} left",
"id": "time_remaining.days"
},
{
"defaultMessage": "Closed",
"id": "poll.closed"
@ -263,6 +243,26 @@
{
"defaultMessage": "{number}d",
"id": "relative_time.days"
},
{
"defaultMessage": "Moments remaining",
"id": "time_remaining.moments"
},
{
"defaultMessage": "{number, plural, one {# second} other {# seconds}} left",
"id": "time_remaining.seconds"
},
{
"defaultMessage": "{number, plural, one {# minute} other {# minutes}} left",
"id": "time_remaining.minutes"
},
{
"defaultMessage": "{number, plural, one {# hour} other {# hours}} left",
"id": "time_remaining.hours"
},
{
"defaultMessage": "{number, plural, one {# day} other {# days}} left",
"id": "time_remaining.days"
}
],
"path": "app/javascript/mastodon/components/relative_timestamp.json"
@ -552,8 +552,8 @@
{
"descriptors": [
{
"defaultMessage": "You are blocked",
"id": "empty_column.account_timeline_blocked"
"defaultMessage": "Profile unavailable",
"id": "empty_column.account_unavailable"
},
{
"defaultMessage": "No toots here!",
@ -1256,8 +1256,8 @@
{
"descriptors": [
{
"defaultMessage": "You are blocked",
"id": "empty_column.account_timeline_blocked"
"defaultMessage": "Profile unavailable",
"id": "empty_column.account_unavailable"
},
{
"defaultMessage": "No one follows this user yet.",
@ -1269,8 +1269,8 @@
{
"descriptors": [
{
"defaultMessage": "You are blocked",
"id": "empty_column.account_timeline_blocked"
"defaultMessage": "Profile unavailable",
"id": "empty_column.account_unavailable"
},
{
"defaultMessage": "This user doesn't follow anyone yet.",