Skip to content
Permalink
Browse files

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

  • Loading branch information
ThibG committed Jan 13, 2020
2 parents 7ab12b7 + 3287ec8 commit 83f8bf48d91605fa63325b4d4acec717031da025
Showing with 311 additions and 245 deletions.
  1. +3 −3 Gemfile.lock
  2. +12 −12 app/javascript/mastodon/locales/ca.json
  3. +3 −3 app/javascript/mastodon/locales/co.json
  4. +3 −3 app/javascript/mastodon/locales/cs.json
  5. +17 −0 app/javascript/mastodon/locales/defaultMessages.json
  6. +3 −3 app/javascript/mastodon/locales/eo.json
  7. +3 −3 app/javascript/mastodon/locales/es-AR.json
  8. +37 −37 app/javascript/mastodon/locales/es.json
  9. +46 −46 app/javascript/mastodon/locales/et.json
  10. +3 −3 app/javascript/mastodon/locales/fr.json
  11. +3 −3 app/javascript/mastodon/locales/gl.json
  12. +3 −3 app/javascript/mastodon/locales/id.json
  13. +3 −3 app/javascript/mastodon/locales/is.json
  14. +2 −2 app/javascript/mastodon/locales/it.json
  15. +2 −2 app/javascript/mastodon/locales/ja.json
  16. +3 −3 app/javascript/mastodon/locales/ko.json
  17. +3 −3 app/javascript/mastodon/locales/pt-BR.json
  18. +3 −3 app/javascript/mastodon/locales/pt-PT.json
  19. +3 −3 app/javascript/mastodon/locales/ru.json
  20. +1 −1 app/javascript/mastodon/locales/th.json
  21. +3 −3 app/javascript/mastodon/locales/tr.json
  22. +3 −3 app/javascript/mastodon/locales/vi.json
  23. +1 −1 app/models/concerns/attachmentable.rb
  24. +42 −41 config/locales/ca.yml
  25. +1 −0 config/locales/co.yml
  26. +1 −0 config/locales/cs.yml
  27. +5 −5 config/locales/devise.ca.yml
  28. +2 −2 config/locales/devise.et.yml
  29. +0 −1 config/locales/doorkeeper.ar.yml
  30. +2 −3 config/locales/doorkeeper.ca.yml
  31. +0 −1 config/locales/doorkeeper.co.yml
  32. +0 −1 config/locales/doorkeeper.cs.yml
  33. +0 −1 config/locales/doorkeeper.de.yml
  34. +0 −1 config/locales/doorkeeper.el.yml
  35. +2 −1 config/locales/doorkeeper.eo.yml
  36. +0 −1 config/locales/doorkeeper.es-AR.yml
  37. +0 −1 config/locales/doorkeeper.es.yml
  38. +0 −1 config/locales/doorkeeper.et.yml
  39. +0 −1 config/locales/doorkeeper.eu.yml
  40. +0 −1 config/locales/doorkeeper.fa.yml
  41. +0 −1 config/locales/doorkeeper.gl.yml
  42. +0 −1 config/locales/doorkeeper.id.yml
  43. +0 −1 config/locales/doorkeeper.it.yml
  44. +0 −1 config/locales/doorkeeper.ja.yml
  45. +0 −1 config/locales/doorkeeper.kk.yml
  46. +0 −1 config/locales/doorkeeper.ko.yml
  47. +0 −1 config/locales/doorkeeper.pt-BR.yml
  48. +0 −1 config/locales/doorkeeper.pt-PT.yml
  49. +0 −1 config/locales/doorkeeper.ru.yml
  50. +0 −1 config/locales/doorkeeper.sv.yml
  51. +0 −1 config/locales/doorkeeper.ta.yml
  52. +0 −1 config/locales/doorkeeper.th.yml
  53. +0 −1 config/locales/doorkeeper.tr.yml
  54. +5 −0 config/locales/eo.yml
  55. +1 −0 config/locales/es-AR.yml
  56. +12 −12 config/locales/es.yml
  57. +1 −0 config/locales/et.yml
  58. +1 −0 config/locales/fa.yml
  59. +1 −0 config/locales/fr.yml
  60. +1 −0 config/locales/hu.yml
  61. +1 −0 config/locales/id.yml
  62. +48 −6 config/locales/is.yml
  63. +1 −0 config/locales/kk.yml
  64. +1 −1 config/locales/ko.yml
  65. +3 −2 config/locales/pt-BR.yml
  66. +1 −0 config/locales/pt-PT.yml
  67. +1 −1 config/locales/simple_form.ca.yml
  68. +2 −0 config/locales/simple_form.eo.yml
  69. +2 −0 config/locales/simple_form.is.yml
  70. +1 −1 config/locales/simple_form.ja.yml
  71. +1 −1 config/locales/simple_form.nl.yml
  72. +3 −0 config/locales/sv.yml
  73. +3 −0 config/locales/ta.yml
  74. +1 −0 config/locales/th.yml
  75. +2 −0 config/locales/vi.yml
@@ -430,7 +430,7 @@ GEM
parallel (1.19.1)
parallel_tests (2.30.0)
parallel
parser (2.6.5.0)
parser (2.7.0.2)
ast (~> 2.4.0)
parslet (1.8.2)
pastel (0.7.3)
@@ -462,7 +462,7 @@ GEM
pundit (2.1.0)
activesupport (>= 3.0.0)
raabro (1.1.6)
rack (2.0.8)
rack (2.1.1)
rack-attack (6.2.2)
rack (>= 1.0, < 3)
rack-cors (1.1.1)
@@ -572,7 +572,7 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-rails (2.4.0)
rubocop-rails (2.4.1)
rack (>= 1.1)
rubocop (>= 0.72.0)
ruby-progressbar (1.10.1)
@@ -1,7 +1,7 @@
{
"account.add_or_remove_from_list": "Afegir o Treure de les llistes",
"account.badges.bot": "Bot",
"account.badges.group": "Group",
"account.badges.group": "Grup",
"account.block": "Bloqueja @{name}",
"account.block_domain": "Amaga-ho tot de {domain}",
"account.blocked": "Bloquejat",
@@ -84,8 +84,8 @@
"compose_form.poll.duration": "Durada de l'enquesta",
"compose_form.poll.option_placeholder": "Opció {number}",
"compose_form.poll.remove_option": "Elimina aquesta opció",
"compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
"compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
"compose_form.poll.switch_to_multiple": "Canvía l’enquesta per a permetre diverses opcions",
"compose_form.poll.switch_to_single": "Canvía l’enquesta per a permetre una sola opció",
"compose_form.publish": "Tut",
"compose_form.publish_loud": "{publish}!",
"compose_form.sensitive.hide": "Marcar mèdia com a sensible",
@@ -110,7 +110,7 @@
"confirmations.mute.explanation": "Això amagarà les seves publicacions i les que els mencionen però encara els permetrà veure les teves i seguir-te.",
"confirmations.mute.message": "Estàs segur que vols silenciar {name}?",
"confirmations.redraft.confirm": "Esborrar i refer",
"confirmations.redraft.message": "Estàs segur que vols esborrar aquest tut i tornar a redactar-lo? Perdràs totes els impulsos i favorits, i les respostes al tut original es quedaran orfes.",
"confirmations.redraft.message": "Estàs segur que vols esborrar aquest tut i tornar a redactar-lo? Perdràs tots els impulsos i favorits, i les respostes al tut original es quedaran orfes.",
"confirmations.reply.confirm": "Respon",
"confirmations.reply.message": "Responen ara es sobreescriurà el missatge que estàs editant. Estàs segur que vols continuar?",
"confirmations.unfollow.confirm": "Deixa de seguir",
@@ -147,7 +147,7 @@
"empty_column.direct": "Encara no tens missatges directes. Quan enviïs o rebis un, es mostrarà aquí.",
"empty_column.domain_blocks": "Encara no hi ha dominis ocults.",
"empty_column.favourited_statuses": "Encara no has marcat com a favorit cap tut. Quan en facis, apareixerà aquí.",
"empty_column.favourites": "Ningú no ha marcat aquesta barritada com a preferit encara. Quan algú ho faci, apareixerà aquí.",
"empty_column.favourites": "Ningú no ha marcat aquest tut com a preferit encara. Quan algú ho faci, apareixerà aquí.",
"empty_column.follow_requests": "Encara no tens cap petició de seguiment. Quan rebis una, apareixerà aquí.",
"empty_column.hashtag": "Encara no hi ha res en aquesta etiqueta.",
"empty_column.home": "Encara no segueixes ningú. Visita {public} o fes cerca per començar i conèixer altres usuaris.",
@@ -181,8 +181,8 @@
"hashtag.column_settings.tag_mode.none": "Cap d’aquests",
"hashtag.column_settings.tag_toggle": "Inclou etiquetes addicionals per a aquesta columna",
"home.column_settings.basic": "Bàsic",
"home.column_settings.show_reblogs": "Mostrar impulsos",
"home.column_settings.show_replies": "Mostrar respostes",
"home.column_settings.show_reblogs": "Mostra els impulsos",
"home.column_settings.show_replies": "Mostra les respostes",
"intervals.full.days": "{number, plural, one {# dia} other {# dies}}",
"intervals.full.hours": "{number, plural, one {# hora} other {# hores}}",
"intervals.full.minutes": "{number, plural, one {# minut} other {# minuts}}",
@@ -211,7 +211,7 @@
"keyboard_shortcuts.description": "Descripció",
"keyboard_shortcuts.direct": "per obrir la columna de missatges directes",
"keyboard_shortcuts.down": "per baixar en la llista",
"keyboard_shortcuts.enter": "ampliar el tut",
"keyboard_shortcuts.enter": "per a obrir el tut",
"keyboard_shortcuts.favourite": "afavorir",
"keyboard_shortcuts.favourites": "per obrir la llista de favorits",
"keyboard_shortcuts.federated": "per obrir la línia de temps federada",
@@ -231,8 +231,8 @@
"keyboard_shortcuts.requests": "per a obrir la llista de sol·licituds de seguiment",
"keyboard_shortcuts.search": "per a centrar la cerca",
"keyboard_shortcuts.start": "per a obrir la columna \"Començar\"",
"keyboard_shortcuts.toggle_hidden": "per a mostrar/amagar text sota CW",
"keyboard_shortcuts.toggle_sensitivity": "per a mostrar/amagar mèdia",
"keyboard_shortcuts.toggle_hidden": "per a mostrar o amagar text sota CW",
"keyboard_shortcuts.toggle_sensitivity": "per a mostrar o amagar contingut multimèdia",
"keyboard_shortcuts.toot": "per a començar un tut nou de trinca",
"keyboard_shortcuts.unfocus": "descentrar l'àrea de composició de text/cerca",
"keyboard_shortcuts.up": "moure amunt en la llista",
@@ -298,7 +298,7 @@
"notifications.column_settings.poll": "Resultats de l’enquesta:",
"notifications.column_settings.push": "Notificacions push",
"notifications.column_settings.reblog": "Impulsos:",
"notifications.column_settings.show": "Mostrar en la columna",
"notifications.column_settings.show": "Mostra en la columna",
"notifications.column_settings.sound": "Reproduir so",
"notifications.filter.all": "Tots",
"notifications.filter.boosts": "Impulsos",
@@ -348,7 +348,7 @@
"search_popout.tips.user": "usuari",
"search_results.accounts": "Gent",
"search_results.hashtags": "Etiquetes",
"search_results.statuses": "Barritades",
"search_results.statuses": "Tuts",
"search_results.statuses_fts_disabled": "La cerca de tuts pel seu contingut no està habilitada en aquest servidor Mastodon.",
"search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
"status.admin_account": "Obre l'interfície de moderació per a @{name}",
@@ -1,7 +1,7 @@
{
"account.add_or_remove_from_list": "Aghjunghje o toglie da e liste",
"account.badges.bot": "Bot",
"account.badges.group": "Group",
"account.badges.group": "Gruppu",
"account.block": "Bluccà @{name}",
"account.block_domain": "Piattà tuttu da {domain}",
"account.blocked": "Bluccatu",
@@ -84,8 +84,8 @@
"compose_form.poll.duration": "Durata di u scandagliu",
"compose_form.poll.option_placeholder": "Scelta {number}",
"compose_form.poll.remove_option": "Toglie sta scelta",
"compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
"compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
"compose_form.poll.switch_to_multiple": "Cambià u scandagliu per accittà parechje scelte",
"compose_form.poll.switch_to_single": "Cambià u scandagliu per ùn accittà ch'una scelta",
"compose_form.publish": "Toot",
"compose_form.publish_loud": "{publish}!",
"compose_form.sensitive.hide": "Indicà u media cum'è sensibile",
@@ -1,7 +1,7 @@
{
"account.add_or_remove_from_list": "Přidat nebo odstranit ze seznamů",
"account.badges.bot": "Robot",
"account.badges.group": "Group",
"account.badges.group": "Skupina",
"account.block": "Zablokovat uživatele @{name}",
"account.block_domain": "Skrýt vše ze serveru {domain}",
"account.blocked": "Blokováno",
@@ -84,8 +84,8 @@
"compose_form.poll.duration": "Doba trvání ankety",
"compose_form.poll.option_placeholder": "Volba {number}",
"compose_form.poll.remove_option": "Odstranit tuto volbu",
"compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
"compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
"compose_form.poll.switch_to_multiple": "Povolit u ankety více možností",
"compose_form.poll.switch_to_single": "Povolit u ankety jedinou možnost",
"compose_form.publish": "Tootnout",
"compose_form.publish_loud": "{publish}!",
"compose_form.sensitive.hide": "Označit média jako citlivá",
@@ -1550,6 +1550,23 @@
],
"path": "app/javascript/mastodon/features/following/index.json"
},
{
"descriptors": [
{
"defaultMessage": "Close",
"id": "lightbox.close"
},
{
"defaultMessage": "Previous",
"id": "lightbox.previous"
},
{
"defaultMessage": "Next",
"id": "lightbox.next"
}
],
"path": "app/javascript/mastodon/features/getting_started/components/announcements.json"
},
{
"descriptors": [
{
@@ -1,7 +1,7 @@
{
"account.add_or_remove_from_list": "Aldoni al aŭ forigi el listoj",
"account.badges.bot": "Roboto",
"account.badges.group": "Group",
"account.badges.group": "Grupo",
"account.block": "Bloki @{name}",
"account.block_domain": "Kaŝi ĉion de {domain}",
"account.blocked": "Blokita",
@@ -84,8 +84,8 @@
"compose_form.poll.duration": "Balotenketa daŭro",
"compose_form.poll.option_placeholder": "Elekteblo {number}",
"compose_form.poll.remove_option": "Forigi ĉi tiu elekteblon",
"compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
"compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
"compose_form.poll.switch_to_multiple": "Ŝanĝi la balotenketon por permesi multajn elektojn",
"compose_form.poll.switch_to_single": "Ŝanĝi la balotenketon por permesi unu solan elekton",
"compose_form.publish": "Hup",
"compose_form.publish_loud": "{publish}!",
"compose_form.sensitive.hide": "Marki la aŭdovidaĵojn kiel tiklaj",
@@ -1,7 +1,7 @@
{
"account.add_or_remove_from_list": "Agregar o quitar de las listas",
"account.badges.bot": "Bot",
"account.badges.group": "Group",
"account.badges.group": "Grupo",
"account.block": "Bloquear a @{name}",
"account.block_domain": "Ocultar todo de {domain}",
"account.blocked": "Bloqueado",
@@ -84,8 +84,8 @@
"compose_form.poll.duration": "Duración de la encuesta",
"compose_form.poll.option_placeholder": "Opción {number}",
"compose_form.poll.remove_option": "Quitá esta opción",
"compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
"compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
"compose_form.poll.switch_to_multiple": "Cambiar encuesta para permitir opciones múltiples",
"compose_form.poll.switch_to_single": "Cambiar encuesta para permitir una sola opción",
"compose_form.publish": "Tootear",
"compose_form.publish_loud": "¡{publish}!",
"compose_form.sensitive.hide": "Marcar medio como sensible",

0 comments on commit 83f8bf4

Please sign in to comment.
You can’t perform that action at this time.