Browse Source

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

- `.env.production.sample`:
  Our sample config file is very different from upstream since it is much more
  complete. Upstream added documentation for a few env variables.
  Copied the new variables/documentation from upstream.
- `app/lib/feed_manager.rb`:
  Upstream added a timeline type (hashtags), while glitch-soc already had an
  extra one (direct messages). Not really a conflict but textually close
  changes.
  Ported upstream's changes.
- `app/models/custom_emoji.rb`:
  Upstream upped the custom emoji size limit, while glitch-soc had configurable
  limits.
  Upped the default limits accordingly.
- `streaming/index.js`:
  Upstream reworked how hastags were normalized. Minor conflict due to
  glitch-soc's handling of instance-local posts.
  Ported upstream's changes.
main
Claire 3 weeks ago
parent
commit
cd87d7dcef
  1. 8
      .env.production.sample
  2. 6
      Gemfile
  3. 18
      Gemfile.lock
  4. 4
      app/controllers/admin/tags_controller.rb
  5. 2
      app/controllers/api/v1/featured_tags/suggestions_controller.rb
  6. 4
      app/controllers/api/v1/featured_tags_controller.rb
  7. 52
      app/controllers/api/v1/followed_tags_controller.rb
  8. 29
      app/controllers/api/v1/tags_controller.rb
  9. 2
      app/controllers/api/v1/trends/tags_controller.rb
  10. 1
      app/controllers/settings/featured_tags_controller.rb
  11. 15
      app/javascript/mastodon/actions/compose.js
  12. 9
      app/javascript/mastodon/locales/af.json
  13. 9
      app/javascript/mastodon/locales/ar.json
  14. 21
      app/javascript/mastodon/locales/ast.json
  15. 9
      app/javascript/mastodon/locales/bg.json
  16. 9
      app/javascript/mastodon/locales/bn.json
  17. 9
      app/javascript/mastodon/locales/br.json
  18. 9
      app/javascript/mastodon/locales/ca.json
  19. 9
      app/javascript/mastodon/locales/ckb.json
  20. 9
      app/javascript/mastodon/locales/co.json
  21. 9
      app/javascript/mastodon/locales/cs.json
  22. 19
      app/javascript/mastodon/locales/cy.json
  23. 15
      app/javascript/mastodon/locales/da.json
  24. 9
      app/javascript/mastodon/locales/de.json
  25. 8
      app/javascript/mastodon/locales/defaultMessages.json
  26. 9
      app/javascript/mastodon/locales/el.json
  27. 9
      app/javascript/mastodon/locales/en-GB.json
  28. 2
      app/javascript/mastodon/locales/en.json
  29. 137
      app/javascript/mastodon/locales/eo.json
  30. 9
      app/javascript/mastodon/locales/es-AR.json
  31. 9
      app/javascript/mastodon/locales/es-MX.json
  32. 9
      app/javascript/mastodon/locales/es.json
  33. 9
      app/javascript/mastodon/locales/et.json
  34. 9
      app/javascript/mastodon/locales/eu.json
  35. 9
      app/javascript/mastodon/locales/fa.json
  36. 9
      app/javascript/mastodon/locales/fi.json
  37. 11
      app/javascript/mastodon/locales/fr.json
  38. 9
      app/javascript/mastodon/locales/fy.json
  39. 9
      app/javascript/mastodon/locales/ga.json
  40. 9
      app/javascript/mastodon/locales/gd.json
  41. 9
      app/javascript/mastodon/locales/gl.json
  42. 13
      app/javascript/mastodon/locales/he.json
  43. 9
      app/javascript/mastodon/locales/hi.json
  44. 9
      app/javascript/mastodon/locales/hr.json
  45. 9
      app/javascript/mastodon/locales/hu.json
  46. 9
      app/javascript/mastodon/locales/hy.json
  47. 9
      app/javascript/mastodon/locales/id.json
  48. 9
      app/javascript/mastodon/locales/io.json
  49. 9
      app/javascript/mastodon/locales/is.json
  50. 9
      app/javascript/mastodon/locales/it.json
  51. 9
      app/javascript/mastodon/locales/ja.json
  52. 9
      app/javascript/mastodon/locales/ka.json
  53. 9
      app/javascript/mastodon/locales/kab.json
  54. 9
      app/javascript/mastodon/locales/kk.json
  55. 9
      app/javascript/mastodon/locales/kn.json
  56. 9
      app/javascript/mastodon/locales/ko.json
  57. 9
      app/javascript/mastodon/locales/ku.json
  58. 9
      app/javascript/mastodon/locales/kw.json
  59. 9
      app/javascript/mastodon/locales/lt.json
  60. 9
      app/javascript/mastodon/locales/lv.json
  61. 9
      app/javascript/mastodon/locales/mk.json
  62. 9
      app/javascript/mastodon/locales/ml.json
  63. 9
      app/javascript/mastodon/locales/mr.json
  64. 9
      app/javascript/mastodon/locales/ms.json
  65. 13
      app/javascript/mastodon/locales/nl.json
  66. 9
      app/javascript/mastodon/locales/nn.json
  67. 9
      app/javascript/mastodon/locales/no.json
  68. 9
      app/javascript/mastodon/locales/oc.json
  69. 9
      app/javascript/mastodon/locales/pa.json
  70. 9
      app/javascript/mastodon/locales/pl.json
  71. 9
      app/javascript/mastodon/locales/pt-BR.json
  72. 9
      app/javascript/mastodon/locales/pt-PT.json
  73. 9
      app/javascript/mastodon/locales/ro.json
  74. 11
      app/javascript/mastodon/locales/ru.json
  75. 9
      app/javascript/mastodon/locales/sa.json
  76. 9
      app/javascript/mastodon/locales/sc.json
  77. 761
      app/javascript/mastodon/locales/si.json
  78. 11
      app/javascript/mastodon/locales/sk.json
  79. 9
      app/javascript/mastodon/locales/sl.json
  80. 9
      app/javascript/mastodon/locales/sq.json
  81. 9
      app/javascript/mastodon/locales/sr-Latn.json
  82. 9
      app/javascript/mastodon/locales/sr.json
  83. 9
      app/javascript/mastodon/locales/sv.json
  84. 9
      app/javascript/mastodon/locales/szl.json
  85. 9
      app/javascript/mastodon/locales/ta.json
  86. 9
      app/javascript/mastodon/locales/tai.json
  87. 9
      app/javascript/mastodon/locales/te.json
  88. 9
      app/javascript/mastodon/locales/th.json
  89. 9
      app/javascript/mastodon/locales/tr.json
  90. 9
      app/javascript/mastodon/locales/tt.json
  91. 9
      app/javascript/mastodon/locales/ug.json
  92. 11
      app/javascript/mastodon/locales/uk.json
  93. 9
      app/javascript/mastodon/locales/ur.json
  94. 15
      app/javascript/mastodon/locales/vi.json
  95. 9
      app/javascript/mastodon/locales/zgh.json
  96. 9
      app/javascript/mastodon/locales/zh-CN.json
  97. 15
      app/javascript/mastodon/locales/zh-HK.json
  98. 9
      app/javascript/mastodon/locales/zh-TW.json
  99. 10
      app/lib/ascii_folding.rb
  100. 36
      app/lib/feed_manager.rb
  101. Some files were not shown because too many files have changed in this diff Show More

8
.env.production.sample

@ -289,3 +289,11 @@ MAX_REMOTE_EMOJI_SIZE=204800
# Optional hCaptcha support
# HCAPTCHA_SECRET_KEY=
# HCAPTCHA_SITE_KEY=
# IP and session retention
# -----------------------
# Make sure to modify the scheduling of ip_cleanup_scheduler in config/sidekiq.yml
# to be less than daily if you lower IP_RETENTION_PERIOD below two days (172800).
# -----------------------
IP_RETENTION_PERIOD=31556952
SESSION_RETENTION_PERIOD=31556952

6
Gemfile

@ -10,7 +10,7 @@ gem 'puma', '~> 5.6'
gem 'rails', '~> 6.1.6'
gem 'sprockets', '~> 3.7.2'
gem 'thor', '~> 1.2'
gem 'rack', '~> 2.2.3'
gem 'rack', '~> 2.2.4'
gem 'hamlit-rails', '~> 0.2'
gem 'pg', '~> 1.4'
@ -40,7 +40,7 @@ end
gem 'net-ldap', '~> 0.17'
gem 'omniauth-cas', '~> 2.0'
gem 'omniauth-saml', '~> 1.10'
gem 'gitlab-omniauth-openid-connect', '~>0.9.1', require: 'omniauth_openid_connect'
gem 'gitlab-omniauth-openid-connect', '~>0.10.0', require: 'omniauth_openid_connect'
gem 'omniauth', '~> 1.9'
gem 'omniauth-rails_csrf_protection', '~> 0.1'
@ -78,7 +78,7 @@ gem 'rqrcode', '~> 2.1'
gem 'ruby-progressbar', '~> 1.11'
gem 'sanitize', '~> 6.0'
gem 'scenic', '~> 1.6'
gem 'sidekiq', '~> 6.4'
gem 'sidekiq', '~> 6.5'
gem 'sidekiq-scheduler', '~> 4.0'
gem 'sidekiq-unique-jobs', '~> 7.1'
gem 'sidekiq-bulk', '~> 0.2.0'

18
Gemfile.lock

@ -270,9 +270,9 @@ GEM
fuubar (2.5.1)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
gitlab-omniauth-openid-connect (0.9.1)
gitlab-omniauth-openid-connect (0.10.0)
addressable (~> 2.7)
omniauth (~> 1.9)
omniauth (>= 1.9, < 3)
openid_connect (~> 1.2)
globalid (1.0.0)
activesupport (>= 5.0)
@ -415,7 +415,7 @@ GEM
concurrent-ruby (~> 1.0, >= 1.0.2)
sidekiq (>= 3.5)
statsd-ruby (~> 1.4, >= 1.4.0)
oj (3.13.14)
oj (3.13.16)
omniauth (1.9.1)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
@ -477,7 +477,7 @@ GEM
activesupport (>= 3.0.0)
raabro (1.4.0)
racc (1.6.0)
rack (2.2.3.1)
rack (2.2.4)
rack-attack (6.6.1)
rack (>= 1.0, < 3)
rack-cors (1.1.1)
@ -604,7 +604,7 @@ GEM
railties (>= 4.0.0)
securecompare (1.0.0)
semantic_range (3.0.0)
sidekiq (6.4.2)
sidekiq (6.5.1)
connection_pool (>= 2.2.2)
rack (~> 2.0)
redis (>= 4.2.0)
@ -686,7 +686,7 @@ GEM
validate_email (0.1.6)
activemodel (>= 3.0)
mail (>= 2.2.5)
validate_url (1.0.13)
validate_url (1.0.15)
activemodel (>= 3.0.0)
public_suffix
warden (1.2.9)
@ -768,7 +768,7 @@ DEPENDENCIES
fog-core (<= 2.1.0)
fog-openstack (~> 0.3)
fuubar (~> 2.5)
gitlab-omniauth-openid-connect (~> 0.9.1)
gitlab-omniauth-openid-connect (~> 0.10.0)
hamlit-rails (~> 0.2)
hcaptcha (~> 7.1)
hiredis (~> 0.6)
@ -811,7 +811,7 @@ DEPENDENCIES
pry-rails (~> 0.3)
puma (~> 5.6)
pundit (~> 2.2)
rack (~> 2.2.3)
rack (~> 2.2.4)
rack-attack (~> 6.6)
rack-cors (~> 1.1)
rails (~> 6.1.6)
@ -832,7 +832,7 @@ DEPENDENCIES
ruby-progressbar (~> 1.11)
sanitize (~> 6.0)
scenic (~> 1.6)
sidekiq (~> 6.4)
sidekiq (~> 6.5)
sidekiq-bulk (~> 0.2.0)
sidekiq-scheduler (~> 4.0)
sidekiq-unique-jobs (~> 7.1)

4
app/controllers/admin/tags_controller.rb

@ -16,6 +16,8 @@ module Admin
if @tag.update(tag_params.merge(reviewed_at: Time.now.utc))
redirect_to admin_tag_path(@tag.id), notice: I18n.t('admin.tags.updated_msg')
else
@time_period = (6.days.ago.to_date...Time.now.utc.to_date)
render :show
end
end
@ -27,7 +29,7 @@ module Admin
end
def tag_params
params.require(:tag).permit(:name, :trendable, :usable, :listable)
params.require(:tag).permit(:name, :display_name, :trendable, :usable, :listable)
end
end
end

2
app/controllers/api/v1/featured_tags/suggestions_controller.rb

@ -6,7 +6,7 @@ class Api::V1::FeaturedTags::SuggestionsController < Api::BaseController
before_action :set_recently_used_tags, only: :index
def index
render json: @recently_used_tags, each_serializer: REST::TagSerializer
render json: @recently_used_tags, each_serializer: REST::TagSerializer, relationships: TagRelationshipsPresenter.new(@recently_used_tags, current_user&.account_id)
end
private

4
app/controllers/api/v1/featured_tags_controller.rb

@ -13,9 +13,7 @@ class Api::V1::FeaturedTagsController < Api::BaseController
end
def create
@featured_tag = current_account.featured_tags.new(featured_tag_params)
@featured_tag.reset_data
@featured_tag.save!
@featured_tag = current_account.featured_tags.create!(featured_tag_params)
render json: @featured_tag, serializer: REST::FeaturedTagSerializer
end

52
app/controllers/api/v1/followed_tags_controller.rb

@ -0,0 +1,52 @@
# frozen_string_literal: true
class Api::V1::FollowedTagsController < Api::BaseController
TAGS_LIMIT = 100
before_action -> { doorkeeper_authorize! :follow, :read, :'read:follows' }, except: :show
before_action :require_user!
before_action :set_results
after_action :insert_pagination_headers, only: :show
def index
render json: @results.map(&:tag), each_serializer: REST::TagSerializer, relationships: TagRelationshipsPresenter.new(@results.map(&:tag), current_user&.account_id)
end
private
def set_results
@results = TagFollow.where(account: current_account).joins(:tag).eager_load(:tag).to_a_paginated_by_id(
limit_param(TAGS_LIMIT),
params_slice(:max_id, :since_id, :min_id)
)
end
def insert_pagination_headers
set_pagination_headers(next_path, prev_path)
end
def next_path
api_v1_followed_tags_url pagination_params(max_id: pagination_max_id) if records_continue?
end
def prev_path
api_v1_followed_tags_url pagination_params(since_id: pagination_since_id) unless @results.empty?
end
def pagination_max_id
@results.last.id
end
def pagination_since_id
@results.first.id
end
def records_continue?
@results.size == limit_param(TAG_LIMIT)
end
def pagination_params(core_params)
params.slice(:limit).permit(:limit).merge(core_params)
end
end

29
app/controllers/api/v1/tags_controller.rb

@ -0,0 +1,29 @@
# frozen_string_literal: true
class Api::V1::TagsController < Api::BaseController
before_action -> { doorkeeper_authorize! :follow, :write, :'write:follows' }, except: :show
before_action :require_user!, except: :show
before_action :set_or_create_tag
override_rate_limit_headers :follow, family: :follows
def show
render json: @tag, serializer: REST::TagSerializer
end
def follow
TagFollow.create!(tag: @tag, account: current_account, rate_limit: true)
render json: @tag, serializer: REST::TagSerializer
end
def unfollow
TagFollow.find_by(account: current_account, tag: @tag)&.destroy!
render json: @tag, serializer: REST::TagSerializer
end
private
def set_or_create_tag
@tag = Tag.find_normalized(params[:id]) || Tag.new(name: Tag.normalize(params[:id]), display_name: params[:id])
end
end

2
app/controllers/api/v1/trends/tags_controller.rb

@ -8,7 +8,7 @@ class Api::V1::Trends::TagsController < Api::BaseController
DEFAULT_TAGS_LIMIT = 10
def index
render json: @tags, each_serializer: REST::TagSerializer
render json: @tags, each_serializer: REST::TagSerializer, relationships: TagRelationshipsPresenter.new(@tags, current_user&.account_id)
end
private

1
app/controllers/settings/featured_tags_controller.rb

@ -11,7 +11,6 @@ class Settings::FeaturedTagsController < Settings::BaseController
def create
@featured_tag = current_account.featured_tags.new(featured_tag_params)
@featured_tag.reset_data
if @featured_tag.save
redirect_to settings_featured_tags_path

15
app/javascript/mastodon/actions/compose.js

@ -608,7 +608,20 @@ function insertIntoTagHistory(recognizedTags, text) {
const state = getState();
const oldHistory = state.getIn(['compose', 'tagHistory']);
const me = state.getIn(['meta', 'me']);
const names = recognizedTags.map(tag => text.match(new RegExp(`#${tag.name}`, 'i'))[0].slice(1));
// FIXME: Matching input hashtags with recognized hashtags has become more
// complicated because of new normalization rules, it's no longer just
// a case sensitivity issue
const names = recognizedTags.map(tag => {
const matches = text.match(new RegExp(`#${tag.name}`, 'i'));
if (matches && matches.length > 0) {
return matches[0].slice(1);
} else {
return tag.name;
}
});
const intersectedOldHistory = oldHistory.filter(name => names.findIndex(newName => newName.toLowerCase() === name.toLowerCase()) === -1);
names.push(...intersectedOldHistory.toJS());

9
app/javascript/mastodon/locales/af.json

@ -314,6 +314,7 @@
"navigation_bar.preferences": "Preferences",
"navigation_bar.public_timeline": "Federated timeline",
"navigation_bar.security": "Security",
"notification.admin.report": "{name} reported {target}",
"notification.admin.sign_up": "{name} signed up",
"notification.favourite": "{name} favourited your status",
"notification.follow": "{name} followed you",
@ -326,6 +327,7 @@
"notification.update": "{name} edited a post",
"notifications.clear": "Clear notifications",
"notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
"notifications.column_settings.admin.report": "New reports:",
"notifications.column_settings.admin.sign_up": "New sign-ups:",
"notifications.column_settings.alert": "Desktop notifications",
"notifications.column_settings.favourite": "Favourites:",
@ -431,6 +433,11 @@
"report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
"report.unfollow": "Unfollow @{name}",
"report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
"report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
"report_notification.categories.other": "Other",
"report_notification.categories.spam": "Spam",
"report_notification.categories.violation": "Rule violation",
"report_notification.open": "Open report",
"search.placeholder": "Search",
"search_popout.search_format": "Advanced search format",
"search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
@ -461,6 +468,7 @@
"status.embed": "Embed",
"status.favourite": "Favourite",
"status.filtered": "Filtered",
"status.hide": "Hide toot",
"status.history.created": "{name} created {date}",
"status.history.edited": "{name} edited {date}",
"status.load_more": "Load more",
@ -484,6 +492,7 @@
"status.report": "Report @{name}",
"status.sensitive_warning": "Sensitive content",
"status.share": "Share",
"status.show_filter_reason": "Show anyway",
"status.show_less": "Show less",
"status.show_less_all": "Show less for all",
"status.show_more": "Show more",

9
app/javascript/mastodon/locales/ar.json

@ -314,6 +314,7 @@
"navigation_bar.preferences": "التفضيلات",
"navigation_bar.public_timeline": "الخيط العام الموحد",
"navigation_bar.security": "الأمان",
"notification.admin.report": "{name} reported {target}",
"notification.admin.sign_up": "أنشأ {name} حسابًا",
"notification.favourite": ُعجِب {name} بمنشورك",
"notification.follow": "{name} يتابعك",
@ -326,6 +327,7 @@
"notification.update": "عدّلَ {name} منشورًا",
"notifications.clear": "امسح الإخطارات",
"notifications.clear_confirmation": "أمتأكد من أنك تود مسح جل الإخطارات الخاصة بك و المتلقاة إلى حد الآن ؟",
"notifications.column_settings.admin.report": "New reports:",
"notifications.column_settings.admin.sign_up": "التسجيلات الجديدة:",
"notifications.column_settings.alert": "إشعارات سطح المكتب",
"notifications.column_settings.favourite": "المُفَضَّلة:",
@ -431,6 +433,11 @@
"report.thanks.title_actionable": ُكرًا لَكَ على الإبلاغ، سَوفَ نَنظُرُ فِي هَذَا الأمر.",
"report.unfollow": "إلغاء متابعة @{name}",
"report.unfollow_explanation": "أنت تتابع هذا الحساب، لإزالة مَنشوراته من تغذيَتِكَ الرئيسة ألغ متابعته.",
"report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
"report_notification.categories.other": "Other",
"report_notification.categories.spam": "Spam",
"report_notification.categories.violation": "Rule violation",
"report_notification.open": "Open report",
"search.placeholder": "ابحث",
"search_popout.search_format": "نمط البحث المتقدم",
"search_popout.tips.full_text": "النص البسيط يقوم بعرض المنشورات التي كتبتها أو قمت بإرسالها أو ترقيتها أو تمت الإشارة إليك فيها من طرف آخرين ، بالإضافة إلى مطابقة أسماء المستخدمين وأسماء العرض وعلامات التصنيف.",
@ -461,6 +468,7 @@
"status.embed": "إدماج",
"status.favourite": "أضف إلى المفضلة",
"status.filtered": ُصفّى",
"status.hide": "Hide toot",
"status.history.created": "أنشأه {name} {date}",
"status.history.edited": "عدله {name} {date}",
"status.load_more": "حمّل المزيد",
@ -484,6 +492,7 @@
"status.report": "ابلِغ عن @{name}",
"status.sensitive_warning": "محتوى حساس",
"status.share": "مشاركة",
"status.show_filter_reason": "Show anyway",
"status.show_less": "اعرض أقلّ",
"status.show_less_all": "طي الكل",
"status.show_more": "أظهر المزيد",

21
app/javascript/mastodon/locales/ast.json

@ -33,7 +33,7 @@
"account.mute_notifications": "Mute notifications from @{name}",
"account.muted": "Muted",
"account.posts": "Barritos",
"account.posts_with_replies": "Barritos y rempuestes",
"account.posts_with_replies": "Artículos y rempuestes",
"account.report": "Report @{name}",
"account.requested": "Esperando pola aprobación. Calca pa encaboxar la solicitú de siguimientu",
"account.share": "Share @{name}'s profile",
@ -314,6 +314,7 @@
"navigation_bar.preferences": "Preferencies",
"navigation_bar.public_timeline": "Llinia temporal federada",
"navigation_bar.security": "Seguranza",
"notification.admin.report": "{name} reported {target}",
"notification.admin.sign_up": "{name} signed up",
"notification.favourite": "{name} favourited your status",
"notification.follow": "{name} siguióte",
@ -326,6 +327,7 @@
"notification.update": "{name} editó l'artículu",
"notifications.clear": "Llimpiar avisos",
"notifications.clear_confirmation": "¿De xuru que quies llimpiar dafechu tolos avisos?",
"notifications.column_settings.admin.report": "New reports:",
"notifications.column_settings.admin.sign_up": "New sign-ups:",
"notifications.column_settings.alert": "Avisos d'escritoriu",
"notifications.column_settings.favourite": "Favoritos:",
@ -413,14 +415,14 @@
"report.placeholder": "Comentarios adicionales",
"report.reasons.dislike": "I don't like it",
"report.reasons.dislike_description": "It is not something you want to see",
"report.reasons.other": "It's something else",
"report.reasons.other_description": "The issue does not fit into other categories",
"report.reasons.spam": "It's spam",
"report.reasons.other": "Ye daqué más",
"report.reasons.other_description": "La incidencia nun s'axusta a les demás categoríes",
"report.reasons.spam": "Ye spam",
"report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
"report.reasons.violation": "Incumple les regles del sirvidor",
"report.reasons.violation_description": "You are aware that it breaks specific rules",
"report.rules.subtitle": "Select all that apply",
"report.rules.title": "Which rules are being violated?",
"report.rules.title": "¿Qué regles s'incumplen?",
"report.statuses.subtitle": "Select all that apply",
"report.statuses.title": "Are there any posts that back up this report?",
"report.submit": "Unviar",
@ -431,6 +433,11 @@
"report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
"report.unfollow": "Unfollow @{name}",
"report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
"report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
"report_notification.categories.other": "Other",
"report_notification.categories.spam": "Spam",
"report_notification.categories.violation": "Rule violation",
"report_notification.open": "Open report",
"search.placeholder": "Buscar",
"search_popout.search_format": "Formatu de gueta avanzada",
"search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
@ -461,6 +468,7 @@
"status.embed": "Empotrar",
"status.favourite": "Favourite",
"status.filtered": "Filtered",
"status.hide": "Hide toot",
"status.history.created": "{name} created {date}",
"status.history.edited": "{name} edited {date}",
"status.load_more": "Cargar más",
@ -484,6 +492,7 @@
"status.report": "Report @{name}",
"status.sensitive_warning": "Conteníu sensible",
"status.share": "Share",
"status.show_filter_reason": "Show anyway",
"status.show_less": "Amosar menos",
"status.show_less_all": "Amosar menos en too",
"status.show_more": "Amosar más",
@ -509,7 +518,7 @@
"timeline_hint.resources.follows": "Follows",
"timeline_hint.resources.statuses": "Older posts",
"trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
"trends.trending_now": "Trending now",
"trends.trending_now": "En tendencia",
"ui.beforeunload": "El borrador va perdese si coles de Mastodon.",
"units.short.billion": "{count} B",
"units.short.million": "{count} M",

9
app/javascript/mastodon/locales/bg.json

@ -314,6 +314,7 @@
"navigation_bar.preferences": "Предпочитания",
"navigation_bar.public_timeline": "Публичен канал",
"navigation_bar.security": "Сигурност",
"notification.admin.report": "{name} reported {target}",
"notification.admin.sign_up": "{name} signed up",
"notification.favourite": "{name} хареса твоята публикация",
"notification.follow": "{name} те последва",
@ -326,6 +327,7 @@
"notification.update": "{name} edited a post",
"notifications.clear": "Изчистване на известия",
"notifications.clear_confirmation": "Сигурни ли сте, че искате да изчистите окончателно всичките си известия?",
"notifications.column_settings.admin.report": "New reports:",
"notifications.column_settings.admin.sign_up": "New sign-ups:",
"notifications.column_settings.alert": "Десктоп известия",
"notifications.column_settings.favourite": "Предпочитани:",
@ -431,6 +433,11 @@
"report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
"report.unfollow": "Unfollow @{name}",
"report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
"report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
"report_notification.categories.other": "Other",
"report_notification.categories.spam": "Spam",
"report_notification.categories.violation": "Rule violation",
"report_notification.open": "Open report",
"search.placeholder": "Търсене",
"search_popout.search_format": "Формат за разширено търсене",
"search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
@ -461,6 +468,7 @@
"status.embed": "Вграждане",
"status.favourite": "Предпочитани",
"status.filtered": "Филтрирано",
"status.hide": "Hide toot",
"status.history.created": "{name} created {date}",
"status.history.edited": "{name} edited {date}",
"status.load_more": "Зареждане на още",
@ -484,6 +492,7 @@
"status.report": "Докладване на @{name}",
"status.sensitive_warning": "Деликатно съдържание",
"status.share": "Споделяне",
"status.show_filter_reason": "Show anyway",
"status.show_less": "Покажи по-малко",
"status.show_less_all": "Покажи по-малко за всички",
"status.show_more": "Покажи повече",

9
app/javascript/mastodon/locales/bn.json

@ -314,6 +314,7 @@
"navigation_bar.preferences": "পছনদসমহ",
"navigation_bar.public_timeline": "যতবির সময়র",
"navigation_bar.security": "নিপত",
"notification.admin.report": "{name} reported {target}",
"notification.admin.sign_up": "{name} signed up",
"notification.favourite": "{name} আপনর কযকরম পছনদ করন",
"notification.follow": "{name} আপন অনসরণ করন",
@ -326,6 +327,7 @@
"notification.update": "{name} edited a post",
"notifications.clear": "পরজপনগলত",
"notifications.clear_confirmation": "আপনিিিিত পরজপনগলতন ?",
"notifications.column_settings.admin.report": "New reports:",
"notifications.column_settings.admin.sign_up": "New sign-ups:",
"notifications.column_settings.alert": "কমিউটরজপনগি",
"notifications.column_settings.favourite": "পছনর:",
@ -431,6 +433,11 @@
"report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
"report.unfollow": "Unfollow @{name}",
"report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
"report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
"report_notification.categories.other": "Other",
"report_notification.categories.spam": "Spam",
"report_notification.categories.violation": "Rule violation",
"report_notification.open": "Open report",
"search.placeholder": "অনসনন",
"search_popout.search_format": "বিিতভর পদধতি",
"search_popout.tips.full_text": "সরণ লিজলর হবরকম আপনর ল, পছনর ল, সমরথন কর, আপন উলখকর, যজছন সরকম কযবহরকর নম বশটগগ।",
@ -461,6 +468,7 @@
"status.embed": "এমবড করত",
"status.favourite": "পছনর করত",
"status.filtered": "ছকনিিত",
"status.hide": "Hide toot",
"status.history.created": "{name} created {date}",
"status.history.edited": "{name} edited {date}",
"status.load_more": "আরন",
@ -484,6 +492,7 @@
"status.report": "@{name} কিট করত",
"status.sensitive_warning": "সদনশল কি",
"status.share": "অনযদর জন",
"status.show_filter_reason": "Show anyway",
"status.show_less": "কম দখত",
"status.show_less_all": "সবগ কম দখত",
"status.show_more": "আর",

9
app/javascript/mastodon/locales/br.json

@ -314,6 +314,7 @@
"navigation_bar.preferences": "Gwellvezioù",
"navigation_bar.public_timeline": "Red-amzer kevreet",
"navigation_bar.security": "Diogelroez",
"notification.admin.report": "{name} reported {target}",
"notification.admin.sign_up": "{name} signed up",
"notification.favourite": "{name} en/he deus lakaet ho toud en e/he muiañ-karet",
"notification.follow": "heuliañ a ra {name} ac'hanoc'h",
@ -326,6 +327,7 @@
"notification.update": "{name} edited a post",
"notifications.clear": "Skarzhañ ar c'hemennoù",
"notifications.clear_confirmation": "Ha sur oc'h e fell deoc'h skarzhañ ho kemennoù penn-da-benn?",
"notifications.column_settings.admin.report": "New reports:",
"notifications.column_settings.admin.sign_up": "New sign-ups:",
"notifications.column_settings.alert": "Kemennoù war ar burev",
"notifications.column_settings.favourite": "Ar re vuiañ-karet:",
@ -431,6 +433,11 @@
"report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
"report.unfollow": "Unfollow @{name}",
"report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
"report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
"report_notification.categories.other": "Other",
"report_notification.categories.spam": "Spam",
"report_notification.categories.violation": "Rule violation",
"report_notification.open": "Open report",
"search.placeholder": "Klask",
"search_popout.search_format": "Framm klask araokaet",
"search_popout.tips.full_text": "Testenn simpl a adkas toudoù skrivet ganeoc'h, merket ganeoc'h evel miuañ-karet, toudoù skignet, pe e-lec'h oc'h bet meneget, met ivez anvioù skrammañ, anvioù implijer ha gêrioù-klik hag a glot.",
@ -461,6 +468,7 @@
"status.embed": "Enframmañ",
"status.favourite": "Muiañ-karet",
"status.filtered": "Silet",
"status.hide": "Hide toot",
"status.history.created": "{name} created {date}",
"status.history.edited": "{name} edited {date}",
"status.load_more": "Kargañ muioc'h",
@ -484,6 +492,7 @@
"status.report": "Disklêriañ @{name}",
"status.sensitive_warning": "Dalc'had kizidik",
"status.share": "Rannañ",
"status.show_filter_reason": "Show anyway",
"status.show_less": "Diskouez nebeutoc'h",
"status.show_less_all": "Diskouez nebeutoc'h evit an holl",
"status.show_more": "Diskouez muioc'h",

9
app/javascript/mastodon/locales/ca.json

@ -314,6 +314,7 @@
"navigation_bar.preferences": "Preferències",
"navigation_bar.public_timeline": "Línia de temps federada",
"navigation_bar.security": "Seguretat",
"notification.admin.report": "{name} ha reportat {target}",
"notification.admin.sign_up": "{name} s'ha registrat",
"notification.favourite": "{name} ha afavorit la teva publicació",
"notification.follow": "{name} et segueix",
@ -326,6 +327,7 @@
"notification.update": "{name} ha editat una publicació",
"notifications.clear": "Esborra les notificacions",
"notifications.clear_confirmation": "Segur que vols esborrar permanentment totes les teves notificacions?",
"notifications.column_settings.admin.report": "Nous informes:",
"notifications.column_settings.admin.sign_up": "Nous registres:",
"notifications.column_settings.alert": "Notificacions d'escriptori",
"notifications.column_settings.favourite": "Preferits:",
@ -431,6 +433,11 @@
"report.thanks.title_actionable": "Gràcies per denunciar-ho. Ho investigarem.",
"report.unfollow": "Deixa de seguir @{name}",
"report.unfollow_explanation": "Estàs seguint aquest compte. Per no veure les seves publicacions a la teva línia de temps d'Inici, deixa de seguir-lo.",
"report_notification.attached_statuses": "{count, plural, one {{count} publicació} other {{count} publicacions}} attached",
"report_notification.categories.other": "Altres",
"report_notification.categories.spam": "Contingut brossa",
"report_notification.categories.violation": "Violació de norma",
"report_notification.open": "Informe obert",
"search.placeholder": "Cerca",
"search_popout.search_format": "Format de cerca avançada",
"search_popout.tips.full_text": "El text simple recupera publicacions que has escrit, marcat com a preferides, que has impulsat o on t'han esmentat, així com els usuaris, els noms d'usuaris i les etiquetes.",
@ -461,6 +468,7 @@
"status.embed": "Incrusta",
"status.favourite": "Favorit",
"status.filtered": "Filtrat",
"status.hide": "Amaga publicació",
"status.history.created": "{name} ha creat {date}",
"status.history.edited": "{name} ha editat {date}",
"status.load_more": "Carregar-ne més",
@ -484,6 +492,7 @@
"status.report": "Denuncia @{name}",
"status.sensitive_warning": "Contingut sensible",
"status.share": "Comparteix",
"status.show_filter_reason": "Mostra igualment",
"status.show_less": "Mostrar-ne menys",
"status.show_less_all": "Mostrar-ne menys per a tot",
"status.show_more": "Mostrar-ne més",

9
app/javascript/mastodon/locales/ckb.json

@ -314,6 +314,7 @@
"navigation_bar.preferences": "پەسەندەکان",
"navigation_bar.public_timeline": "نووسراوەکانی هەمووشوێنێک",
"navigation_bar.security": "ئاسایش",
"notification.admin.report": "{name} reported {target}",
"notification.admin.sign_up": "{name} تۆمارکرا",
"notification.favourite": "{name} نووسراوەکەتی پەسەند کرد",
"notification.follow": "{name} دوای تۆ کەوت",
@ -326,6 +327,7 @@
"notification.update": "{name} پۆستێکی دەستکاریکرد",
"notifications.clear": "ئاگانامەکان بسڕیەوە",
"notifications.clear_confirmation": "ئایا دڵنیایت لەوەی دەتەوێت بە هەمیشەیی هەموو ئاگانامەکانت بسڕیتەوە?",
"notifications.column_settings.admin.report": "New reports:",
"notifications.column_settings.admin.sign_up": "چوونەژوورەوەی نوێ:",
"notifications.column_settings.alert": "ئاگانامەکانی پیشانگەرر ڕومێزی",
"notifications.column_settings.favourite": "دڵخوازترین:",
@ -431,6 +433,11 @@
"report.thanks.title_actionable": "سوپاس بۆ ڕاپۆرتکردن، ئێمە سەیری ئەم بابەتە دەکەین.",
"report.unfollow": "بەدوادانەچوو@{name}",
"report.unfollow_explanation": "تۆ شوێنکەوتووی ئەم هەژماررەی دەکەیت. بۆ ئەوەی چیتر نووسراوەکانیان لە هۆم فیدی خۆت نەبینی، بەدوایان مەچۆ.",
"report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
"report_notification.categories.other": "Other",
"report_notification.categories.spam": "Spam",
"report_notification.categories.violation": "Rule violation",
"report_notification.open": "Open report",
"search.placeholder": "گەڕان",
"search_popout.search_format": "شێوەی گەڕانی پێشکەوتوو",
"search_popout.tips.full_text": "گەڕانێکی دەقی سادە دەتوانێت توتەکانی ئێوە کە، نووسیوتانە،پەسەنتان کردووە، دووبارەتانکردووە، یان ئەو توتانە کە باسی ئێوەی تێدا کراوە پەیدا دەکا. هەروەها ناوی بەکارهێنەران، ناوی پیشاندراو و هەشتەگەکانیش لە خۆ دەگرێت.",
@ -461,6 +468,7 @@
"status.embed": "نیشتەجێ بکە",
"status.favourite": "دڵخواز",
"status.filtered": "پاڵاوتن",
"status.hide": "Hide toot",
"status.history.created": "{name} دروستکراوە لە{date}",
"status.history.edited": "{name} دروستکاریکراوە لە{date}",
"status.load_more": "زیاتر بار بکە",
@ -484,6 +492,7 @@
"status.report": "گوزارشت @{name}",
"status.sensitive_warning": "ناوەڕۆکی هەستیار",
"status.share": "هاوبەشی بکە",
"status.show_filter_reason": "Show anyway",
"status.show_less": "کەمتر نیشان بدە",
"status.show_less_all": "هەمووی بچووک بکەوە",
"status.show_more": "زیاتر نیشان بدە",

9
app/javascript/mastodon/locales/co.json

@ -314,6 +314,7 @@
"navigation_bar.preferences": "Preferenze",
"navigation_bar.public_timeline": "Linea pubblica glubale",
"navigation_bar.security": "Sicurità",
"notification.admin.report": "{name} reported {target}",
"notification.admin.sign_up": "{name} signed up",
"notification.favourite": "{name} hà aghjuntu u vostru statutu à i so favuriti",
"notification.follow": "{name} v'hà seguitatu",
@ -326,6 +327,7 @@
"notification.update": "{name} edited a post",
"notifications.clear": "Purgà e nutificazione",
"notifications.clear_confirmation": "Site sicuru·a che vulete toglie tutte ste nutificazione?",
"notifications.column_settings.admin.report": "New reports:",
"notifications.column_settings.admin.sign_up": "New sign-ups:",
"notifications.column_settings.alert": "Nutificazione nant'à l'urdinatore",
"notifications.column_settings.favourite": "Favuriti:",
@ -431,6 +433,11 @@
"report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
"report.unfollow": "Unfollow @{name}",
"report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
"report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
"report_notification.categories.other": "Other",
"report_notification.categories.spam": "Spam",
"report_notification.categories.violation": "Rule violation",
"report_notification.open": "Open report",
"search.placeholder": "Circà",
"search_popout.search_format": "Ricerca avanzata",
"search_popout.tips.full_text": "I testi simplici rimandanu i statuti ch'avete scritti, aghjunti à i vostri favuriti, spartuti o induve quelli site mintuvatu·a, è ancu i cugnomi, nomi pubblichi è hashtag chì currispondenu.",
@ -461,6 +468,7 @@
"status.embed": "Integrà",
"status.favourite": "Aghjunghje à i favuriti",
"status.filtered": "Filtratu",
"status.hide": "Hide toot",
"status.history.created": "{name} created {date}",
"status.history.edited": "{name} edited {date}",
"status.load_more": "Vede di più",
@ -484,6 +492,7 @@
"status.report": "Palisà @{name}",
"status.sensitive_warning": "Cuntinutu sensibile",
"status.share": "Sparte",
"status.show_filter_reason": "Show anyway",
"status.show_less": "Ripiegà",
"status.show_less_all": "Ripiegà tuttu",
"status.show_more": "Slibrà",

9
app/javascript/mastodon/locales/cs.json

@ -314,6 +314,7 @@
"navigation_bar.preferences": "Předvolby",
"navigation_bar.public_timeline": "Federovaná časová osa",
"navigation_bar.security": "Zabezpečení",
"notification.admin.report": "Uživatel {name} nahlásil {target}",
"notification.admin.sign_up": "Uživatel {name} se zaregistroval",
"notification.favourite": "Uživatel {name} si oblíbil váš příspěvek",
"notification.follow": "Uživatel {name} vás začal sledovat",
@ -326,6 +327,7 @@
"notification.update": "Uživatel {name} upravil příspěvek",
"notifications.clear": "Vymazat oznámení",
"notifications.clear_confirmation": "Opravdu chcete trvale smazat všechna vaše oznámení?",
"notifications.column_settings.admin.report": "Nová hlášení:",
"notifications.column_settings.admin.sign_up": "Nové registrace:",
"notifications.column_settings.alert": "Oznámení na počítači",
"notifications.column_settings.favourite": "Oblíbení:",
@ -431,6 +433,11 @@
"report.thanks.title_actionable": "Děkujeme za nahlášení, podíváme se na to.",
"report.unfollow": "Přestat sledovat @{name}",
"report.unfollow_explanation": "Tento účet sledujete. Abyste už neviděli jejich příspěvky ve své domácí časové ose, přestaňte je sledovat.",
"report_notification.attached_statuses": "{count, plural, one {{count} připojený příspěvek} few {{count} připojené příspěvky} many {{count} připojených příspěvků} other {{count} připojených příspěvků}}",
"report_notification.categories.other": "Ostatní",
"report_notification.categories.spam": "Spam",
"report_notification.categories.violation": "Porušení pravidla",
"report_notification.open": "Otevřít hlášení",
"search.placeholder": "Hledat",
"search_popout.search_format": "Pokročilé hledání",
"search_popout.tips.full_text": "Jednoduchý text vrací příspěvky, které jste napsali, oblíbili si, boostnuli, nebo vás v nich někdo zmínil, a také odpovídající přezdívky, zobrazovaná jména a hashtagy.",
@ -461,6 +468,7 @@
"status.embed": "Vložit na web",
"status.favourite": "Oblíbit",
"status.filtered": "Filtrováno",
"status.hide": "Skrýt příspěvek",
"status.history.created": "Uživatel {name} vytvořil {date}",
"status.history.edited": "Uživatel {name} upravil {date}",
"status.load_more": "Zobrazit více",
@ -484,6 +492,7 @@
"status.report": "Nahlásit @{name}",
"status.sensitive_warning": "Citlivý obsah",
"status.share": "Sdílet",
"status.show_filter_reason": "Přesto zobrazit",
"status.show_less": "Zobrazit méně",
"status.show_less_all": "Zobrazit méně pro všechny",
"status.show_more": "Zobrazit více",

19
app/javascript/mastodon/locales/cy.json

@ -92,10 +92,10 @@
"community.column_settings.local_only": "Lleol yn unig",
"community.column_settings.media_only": "Cyfryngau yn unig",
"community.column_settings.remote_only": "Anghysbell yn unig",
"compose.language.change": "Change language",
"compose.language.search": "Search languages...",
"compose.language.change": "Newid iaith",
"compose.language.search": "Chwilio ieithoedd...",
"compose_form.direct_message_warning_learn_more": "Dysgu mwy",
"compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
"compose_form.encryption_warning": "Dyw postiadau ar Mastodon ddim wedi'u hamgryptio o ben i ben. Peidiwch â rhannu unrhyw wybodaeth sensitif dros Mastodon.",
"compose_form.hashtag_warning": "Ni fydd y post hwn wedi ei restru o dan unrhyw hashnod gan ei fod heb ei restru. Dim ond postiadau cyhoeddus gellid chwilio amdanynt drwy hashnod.",
"compose_form.lock_disclaimer": "Nid yw eich cyfri wedi'i {locked}. Gall unrhyw un eich dilyn i weld eich postiadau dilynwyr-yn-unig.",
"compose_form.lock_disclaimer.lock": "wedi ei gloi",
@ -106,7 +106,7 @@
"compose_form.poll.remove_option": "Tynnu'r dewisiad",
"compose_form.poll.switch_to_multiple": "Newid pleidlais i adael mwy nag un dewis",
"compose_form.poll.switch_to_single": "Newid pleidlais i gyfyngu i un dewis",
"compose_form.publish": "Publish",
"compose_form.publish": "Cyhoeddi",
"compose_form.publish_loud": "{publish}!",
"compose_form.save_changes": "Cadw newidiadau",
"compose_form.sensitive.hide": "Marcio cyfryngau fel eu bod yn sensitif",
@ -149,7 +149,7 @@
"embed.instructions": "Gosodwch y post hwn ar eich gwefan drwy gopïo'r côd isod.",
"embed.preview": "Dyma sut olwg fydd arno:",
"emoji_button.activity": "Gweithgarwch",
"emoji_button.clear": "Clear",
"emoji_button.clear": "Clir",
"emoji_button.custom": "Unigryw",
"emoji_button.flags": "Baneri",
"emoji_button.food": "Bwyd a Diod",
@ -314,6 +314,7 @@
"navigation_bar.preferences": "Dewisiadau",
"navigation_bar.public_timeline": "Ffrwd y ffederasiwn",
"navigation_bar.security": "Diogelwch",
"notification.admin.report": "{name} reported {target}",
"notification.admin.sign_up": "Cofrestrodd {name}",
"notification.favourite": "Hoffodd {name} eich post",
"notification.follow": "Dilynodd {name} chi",
@ -326,6 +327,7 @@
"notification.update": "Golygodd {name} bost",
"notifications.clear": "Clirio hysbysiadau",
"notifications.clear_confirmation": "Ydych chi'n sicr eich bod am glirio'ch holl hysbysiadau am byth?",
"notifications.column_settings.admin.report": "Adroddiadau newydd:",
"notifications.column_settings.admin.sign_up": "Cofrestriadau newydd:",
"notifications.column_settings.alert": "Hysbysiadau bwrdd gwaith",
"notifications.column_settings.favourite": "Ffefrynnau:",
@ -431,6 +433,11 @@
"report.thanks.title_actionable": "Diolch am adrodd, byddwn yn ymchwilio i hyn.",
"report.unfollow": "Dad-ddilyn @{name}",
"report.unfollow_explanation": "Rydych chi'n dilyn y cyfrif hwn. I beidio â gweld eu postiadau yn eich porthiant cartref mwyach, dad-ddilynwch nhw.",
"report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
"report_notification.categories.other": "Arall",
"report_notification.categories.spam": "Sbam",
"report_notification.categories.violation": "Rule violation",
"report_notification.open": "Open report",
"search.placeholder": "Chwilio",
"search_popout.search_format": "Fformat chwilio uwch",
"search_popout.tips.full_text": "Mae testun syml yn dychwelyd postiadau yr ydych wedi ysgrifennu, hoffi, wedi'u hybio, neu wedi'ch crybwyll ynddynt, ynghyd a chyfateb a enwau defnyddwyr, enwau arddangos ac hashnodau.",
@ -461,6 +468,7 @@
"status.embed": "Plannu",
"status.favourite": "Hoffi",
"status.filtered": "Wedi'i hidlo",
"status.hide": "Hide toot",
"status.history.created": "{name} greuodd {date}",
"status.history.edited": "{name} olygodd {date}",
"status.load_more": "Llwythwch mwy",
@ -484,6 +492,7 @@
"status.report": "Adrodd @{name}",
"status.sensitive_warning": "Cynnwys sensitif",
"status.share": "Rhannu",
"status.show_filter_reason": "Show anyway",
"status.show_less": "Dangos llai",
"status.show_less_all": "Dangos llai i bawb",
"status.show_more": "Dangos mwy",

15
app/javascript/mastodon/locales/da.json

@ -92,8 +92,8 @@
"community.column_settings.local_only": "Kun lokalt",
"community.column_settings.media_only": "Kun medier",
"community.column_settings.remote_only": "Kun udefra",
"compose.language.change": "Change language",
"compose.language.search": "Search languages...",
"compose.language.change": "Skift sprog",
"compose.language.search": "Søg efter sprog...",
"compose_form.direct_message_warning_learn_more": "Få mere at vide",
"compose_form.encryption_warning": "Indlæg på Mastodon er ikke ende-til-ende krypteret. Del derfor ikke sensitiv information via Mastodon.",
"compose_form.hashtag_warning": "Da indlægget ikke er offentligt, vises det ikke under noget hashtag, idet kun offentlige indlæg kan søges via hashtags.",
@ -149,7 +149,7 @@
"embed.instructions": "Indlejr dette indlæg på dit websted ved at kopiere nedenstående kode.",
"embed.preview": "Sådan kommer det til at se ud:",
"emoji_button.activity": "Aktivitet",
"emoji_button.clear": "Clear",
"emoji_button.clear": "Ryd",
"emoji_button.custom": "Tilpasset",
"emoji_button.flags": "Flag",
"emoji_button.food": "Mad og drikke",
@ -314,6 +314,7 @@
"navigation_bar.preferences": "Præferencer",
"navigation_bar.public_timeline": "Fælles tidslinje",
"navigation_bar.security": "Sikkerhed",
"notification.admin.report": "{name} anmeldte {target}",
"notification.admin.sign_up": "{name} tilmeldte sig",
"notification.favourite": "{name} favoritmarkerede dit indlæg",
"notification.follow": "{name} begyndte at følge dig",
@ -326,6 +327,7 @@
"notification.update": "{name} redigerede et indlæg",
"notifications.clear": "Ryd notifikationer",
"notifications.clear_confirmation": "Sikker på, at du vil rydde alle dine notifikationer permanent?",
"notifications.column_settings.admin.report": "Nye anmeldelser:",
"notifications.column_settings.admin.sign_up": "Nye tilmeldinger:",
"notifications.column_settings.alert": "Computernotifikationer",
"notifications.column_settings.favourite": "Favoritter:",
@ -431,6 +433,11 @@
"report.thanks.title_actionable": "Tak for anmeldelsen, der vil blive set nærmere på dette.",
"report.unfollow": "Følg ikke længere @{name}",
"report.unfollow_explanation": "Denne konto følges. For at ophøre med at se vedkommendes indlæg på hjemmetidslinjen, vælg Følg ikke længere.",
"report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} poster}} vedhæftet",
"report_notification.categories.other": "Andre",
"report_notification.categories.spam": "Spam",
"report_notification.categories.violation": "Regelovertrædelse",
"report_notification.open": "Åbn anmeldelse",
"search.placeholder": "Søg",
"search_popout.search_format": "Avanceret søgeformat",
"search_popout.tips.full_text": "Simpel tekst returnerer indlæg, du har skrevet, favoritmarkeret, boostet eller som er nævnt i/matcher bruger- og profilnavne samt hashtags.",
@ -461,6 +468,7 @@
"status.embed": "Indlejr",
"status.favourite": "Favorit",
"status.filtered": "Filtreret",
"status.hide": "Skjul indlæg",
"status.history.created": "{name} oprettet {date}",
"status.history.edited": "{name} redigeret {date}",
"status.load_more": "Indlæs mere",
@ -484,6 +492,7 @@
"status.report": "Anmeld @{name}",
"status.sensitive_warning": "Følsomt indhold",
"status.share": "Del",
"status.show_filter_reason": "Vis alligevel",
"status.show_less": "Vis mindre",
"status.show_less_all": "Vis mindre for alle",
"status.show_more": "Vis mere",

9
app/javascript/mastodon/locales/de.json

@ -314,6 +314,7 @@
"navigation_bar.preferences": "Einstellungen",
"navigation_bar.public_timeline": "Föderierte Zeitleiste",
"navigation_bar.security": "Sicherheit",
"notification.admin.report": "{name} reported {target}",
"notification.admin.sign_up": "{name} hat sich registriert",
"notification.favourite": "{name} hat deinen Beitrag favorisiert",
"notification.follow": "{name} folgt dir",
@ -326,6 +327,7 @@
"notification.update": "{name} bearbeitete einen Beitrag",
"notifications.clear": "Mitteilungen löschen",
"notifications.clear_confirmation": "Bist du dir sicher, dass du alle Mitteilungen löschen möchtest?",
"notifications.column_settings.admin.report": "New reports:",
"notifications.column_settings.admin.sign_up": "Neue Anmeldungen:",
"notifications.column_settings.alert": "Desktop-Benachrichtigungen",
"notifications.column_settings.favourite": "Favorisierungen:",
@ -431,6 +433,11 @@
"report.thanks.title_actionable": "Vielen Dank für die Meldung, wir werden uns das ansehen.",
"report.unfollow": "@{name} entfolgen",
"report.unfollow_explanation": "Du folgst diesem Konto. Um die Beiträge nicht mehr auf deiner Startseite zu sehen, entfolge dem Konto.",
"report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
"report_notification.categories.other": "Other",
"report_notification.categories.spam": "Spam",
"report_notification.categories.violation": "Rule violation",
"report_notification.open": "Open report",
"search.placeholder": "Suche",
"search_popout.search_format": "Fortgeschrittenes Suchformat",
"search_popout.tips.full_text": "Einfache Texteingabe gibt Beiträge, die du geschrieben, favorisiert und geteilt hast zurück. Außerdem auch Beiträge in denen du erwähnt wurdest, aber auch passende Nutzernamen, Anzeigenamen oder Hashtags.",
@ -461,6 +468,7 @@
"status.embed": "Einbetten",
"status.favourite": "Favorisieren",
"status.filtered": "Gefiltert",
"status.hide": "Hide toot",
"status.history.created": "{name} erstellte {date}",
"status.history.edited": "{name} bearbeitete {date}",
"status.load_more": "Weitere laden",
@ -484,6 +492,7 @@
"status.report": "@{name} melden",
"status.sensitive_warning": "NSFW",
"status.share": "Teilen",
"status.show_filter_reason": "Show anyway",
"status.show_less": "Weniger anzeigen",
"status.show_less_all": "Alle Inhaltswarnungen zuklappen",
"status.show_more": "Mehr anzeigen",

8
app/javascript/mastodon/locales/defaultMessages.json

@ -612,6 +612,10 @@
"defaultMessage": "Copy link to status",
"id": "status.copy"
},
{
"defaultMessage": "Hide toot",
"id": "status.hide"
},
{
"defaultMessage": "Block domain {domain}",
"id": "account.block_domain"
@ -678,6 +682,10 @@
"defaultMessage": "Filtered",
"id": "status.filtered"
},
{
"defaultMessage": "Show anyway",
"id": "status.show_filter_reason"
},
{
"defaultMessage": "Pinned post",
"id": "status.pinned"

9
app/javascript/mastodon/locales/el.json

@ -314,6 +314,7 @@
"navigation_bar.preferences": "Προτιμήσεις",
"navigation_bar.public_timeline": "Ομοσπονδιακή ροή",
"navigation_bar.security": "Ασφάλεια",
"notification.admin.report": "{name} ανέφερε {target}",
"notification.admin.sign_up": "{name} έχει εγγραφεί",
"notification.favourite": "Ο/Η {name} σημείωσε ως αγαπημένη την κατάστασή σου",
"notification.follow": "Ο/Η {name} σε ακολούθησε",
@ -326,6 +327,7 @@
"notification.update": "{name} επεξεργάστηκε μια δημοσίευση",
"notifications.clear": "Καθαρισμός ειδοποιήσεων",
"notifications.clear_confirmation": "Σίγουρα θέλεις να καθαρίσεις όλες τις ειδοποιήσεις σου;",
"notifications.column_settings.admin.report": "Νέες αναφορές:",
"notifications.column_settings.admin.sign_up": "Νέες εγγραφές:",
"notifications.column_settings.alert": "Ειδοποιήσεις επιφάνειας εργασίας",
"notifications.column_settings.favourite": "Αγαπημένα:",
@ -431,6 +433,11 @@
"report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
"report.unfollow": "Unfollow @{name}",
"report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
"report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
"report_notification.categories.other": "Άλλες",
"report_notification.categories.spam": "Ανεπιθύμητα",
"report_notification.categories.violation": "Παραβίαση κανόνα",
"report_notification.open": "Open report",
"search.placeholder": "Αναζήτηση",
"search_popout.search_format": "Προχωρημένη αναζήτηση",
"search_popout.tips.full_text": "Απλό κείμενο που επιστρέφει καταστάσεις που έχεις γράψει, έχεις σημειώσει ως αγαπημένες, έχεις προωθήσει ή έχεις αναφερθεί σε αυτές, καθώς και όσα ονόματα χρηστών και ετικέτες ταιριάζουν.",
@ -461,6 +468,7 @@
"status.embed": "Ενσωμάτωσε",
"status.favourite": "Σημείωσε ως αγαπημένο",
"status.filtered": "Φιλτραρισμένα",
"status.hide": "Απόκρυψη toot",
"status.history.created": "{name} created {date}",
"status.history.edited": "{name} edited {date}",
"status.load_more": "Φόρτωσε περισσότερα",
@ -484,6 +492,7 @@
"status.report": "Κατάγγειλε @{name}",
"status.sensitive_warning": "Ευαίσθητο περιεχόμενο",
"status.share": "Μοιράσου",
"status.show_filter_reason": "Εμφάνιση παρ'όλα αυτά",
"status.show_less": "Δείξε λιγότερα",
"status.show_less_all": "Δείξε λιγότερα για όλα",
"status.show_more": "Δείξε περισσότερα",

9
app/javascript/mastodon/locales/en-GB.json

@ -314,6 +314,7 @@
"navigation_bar.preferences": "Preferences",
"navigation_bar.public_timeline": "Federated timeline",
"navigation_bar.security": "Security",
"notification.admin.report": "{name} reported {target}",
"notification.admin.sign_up": "{name} signed up",
"notification.favourite": "{name} favourited your status",