diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-12-15 10:38:54 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-12-15 10:45:53 +0100 |
commit | 65e994b29b7c3b06dc61ab5eed35b571ebafdf94 (patch) | |
tree | 4cb922f9abb201278312210d678f43ab976b6aea /config/locales/eu.yml | |
parent | f0505a5b2e727da73c8aa651b804508a8187a3c4 (diff) | |
parent | 67b924e324220885b46d9e26c8beb6ee8d3cf8bf (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.
Diffstat (limited to 'config/locales/eu.yml')
-rw-r--r-- | config/locales/eu.yml | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 122b074eb..15307c76e 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -48,6 +48,7 @@ eu: other: jarraitzaile following: Jarraitzen joined: "%{date}(e)an elkartua" + last_active: azkenekoz aktiboa link_verified_on: 'Esteka honen jabetzaren egiaztaketa data: %{date}' media: Multimedia moved_html: "%{name} hona lekualdatu da %{new_profile_link}:" @@ -114,6 +115,7 @@ eu: media_attachments: Multimedia eranskinak memorialize: Bihurtu memoriala moderation: + active: Aktiboa all: Denak silenced: Isilarazita suspended: Kanporatua @@ -439,6 +441,14 @@ eu: proceed: Jarraitu title: Kanporatu %{acct} warning_html: 'Kontu hau kanporatzeak <strong>behin betiko</strong> ezabatuko ditu kontu honetako datuak, hauek barne:' + tags: + accounts: Kontuak + hidden: Ezkutatuta + hide: Ezkutatu direktoriotik + name: Traola + title: Traolak + unhide: Erakutsi direktorioan + visible: Ikusgai title: Administrazioa admin_mailer: new_report: @@ -517,6 +527,15 @@ eu: success_msg: Zure kontua ongi ezabatu da warning_html: Instantzia honetako edukiak ezabatzea besterik ezin da bermatu. Asko partekatu den edukiaren arrastoak geratzea izan liteke. Deskonektatuta dauden zerbitzariak edo zure eguneraketetatik harpidetza kendu duten zerbitzariek ez dituzte beraien datu-baseak eguneratuko. warning_title: Sakabanatutako edukiaren eskuragarritasuna + directories: + directory: Profilen direktorioa + explanation: Deskubritu erabiltzaileak interesen arabera + explore_mastodon: Esploratu %{title} + most_popular: Puri-purian + most_recently_active: Azkenaldian aktibo + people: + one: pertsona %{count} + other: "%{count} pertsona" errors: '403': Ez duzu orri hau ikusteko baimenik. '404': Bilatu duzun orria ez da existitzen. @@ -786,7 +805,7 @@ eu: stream_entries: pinned: Finkatutako toot-a reblogged: "(r)en bultzada" - sensitive_content: Eduki hunkigarria + sensitive_content: 'Kontuz: Eduki hunkigarria' terms: body_html: | <h2>Pribatutasun politika</h2> |