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

Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
This commit is contained in:
Thibaut Girka
2019-04-10 09:16:08 +02:00
89 changed files with 482 additions and 383 deletions

View File

@ -498,7 +498,6 @@ ar:
warning: كن حذرا مع هذه البيانات. لا تقم أبدا بمشاركتها مع الآخَرين !
your_token: رمز نفاذك
auth:
agreement_html: بمجرد النقر على "التسجيل" أسفله، فإنك تُصرِّح قبول <a href="%{rules_path}">قواعد مثيل الخادوم</a> و <a href="%{terms_path}">شروط الخدمة التي نوفرها لك</a>.
change_password: الكلمة السرية
confirm_email: تأكيد عنوان البريد الإلكتروني
delete_account: حذف حساب
@ -813,9 +812,7 @@ ar:
migrate: تهجير الحساب
notifications: الإخطارات
preferences: التفضيلات
settings: الإعدادات
two_factor_authentication: المُصادقة بخُطوَتَيْن
your_apps: تطبيقاتك
statuses:
attached:
description: 'مُرفَق : %{attached}'

View File

@ -123,7 +123,6 @@ ast:
invalid_url: La URL apurrida nun ye válida
warning: Ten curiáu con estos datos, ¡enxamás nun los compartas con naide!
auth:
agreement_html: Faciendo clic en «Aniciar sesión» aceutes siguir <a href="%{rules_path}"> les regles de la instancia</a> y <a href="%{terms_path}">los nuesos términos del serviciu</a>.
change_password: Contraseña
delete_account: Desaniciu de la cuenta
delete_account_html: Si deseyes desaniciar la to cuenta, pues <a href="%{path}">siguir equí</a>. Va pidísete la confirmación.
@ -301,7 +300,6 @@ ast:
import: Importación
notifications: Avisos
preferences: Preferencies
settings: Axustes
two_factor_authentication: Autenticación en dos pasos
statuses:
attached:

View File

@ -122,7 +122,6 @@ bg:
export: Експортиране на данни
import: Импортиране
preferences: Предпочитания
settings: Настройки
two_factor_authentication: Двустепенно удостоверяване
statuses:
open_in_web: Отвори в уеб

View File

@ -507,7 +507,6 @@ ca:
warning: Aneu amb compte amb aquestes dades. No les compartiu mai amb ningú!
your_token: El teu identificador d'accés
auth:
agreement_html: Al fer clic en "Registre" acceptes respectar <a href="%{rules_path}">les normes del servidor</a> i <a href="%{terms_path}">els nostres termes del servei</a>.
apply_for_account: Demana una invitació
change_password: Contrasenya
checkbox_agreement_html: Estic d'acord amb les <a href="%{rules_path}" target="_blank">normes del servidor</a> i <a href="%{terms_path}" target="_blank"> els termes del servei</a>
@ -868,9 +867,7 @@ ca:
notifications: Notificacions
preferences: Preferències
relationships: Seguits i seguidors
settings: Configuració
two_factor_authentication: Autenticació de dos factors
your_apps: Les teves aplicacions
statuses:
attached:
description: 'Adjunt: %{attached}'

View File

@ -134,6 +134,7 @@ co:
moderation_notes: Note di muderazione
most_recent_activity: Attività più ricente
most_recent_ip: IP più ricente
no_account_selected: Nisun contu hè statu cambiatu postu ch'ùn c'eranu micca selezziunati
no_limits_imposed: Nisuna limita imposta
not_subscribed: Micca abbunatu
outbox_url: URL di loutbox
@ -512,7 +513,6 @@ co:
warning: Abbadate à quessi dati. Ùn i date à nisunu!
your_token: Rigenerà a fiscia daccessu
auth:
agreement_html: Cliccà "Arregistrassi" quì sottu vole dì chì site daccunsentu per siguità <a href="%{rules_path}">e regule di u servore</a> è <a href="%{terms_path}">e cundizione dusu</a>.
apply_for_account: Dumandà un'invitazione
change_password: Chjave daccessu
checkbox_agreement_html: Sò d'accunsentu cù e <a href="%{rules_path}" target="_blank">regule di u servore</a> è i <a href="%{terms_path}" target="_blank">termini di u serviziu</a>
@ -873,9 +873,7 @@ co:
notifications: Nutificazione
preferences: Priferenze
relationships: Abbunamenti è abbunati
settings: Parametri
two_factor_authentication: Identificazione à dui fattori
your_apps: E vostre applicazione
statuses:
attached:
description: 'Aghjuntu: %{attached}'

View File

@ -518,7 +518,6 @@ cs:
warning: Buďte s těmito daty velmi opatrní. Nikdy je s nikým nesdílejte!
your_token: Váš přístupový token
auth:
agreement_html: Kliknutím na tlačítko „Registrovat“ souhlasíte s následováním <a href="%{rules_path}">pravidel tohoto serveru</a> a <a href="%{terms_path}">našich podmínek používání</a>.
apply_for_account: Vyžádat si pozvánku
change_password: Heslo
checkbox_agreement_html: Souhlasím s <a href="%{rules_path}" target="_blank">pravidly serveru</a> a <a href="%{terms_path}" target="_blank">podmínkami používání</a>
@ -884,9 +883,7 @@ cs:
notifications: Oznámení
preferences: Předvolby
relationships: Sledovaní a sledující
settings: Nastavení
two_factor_authentication: Dvoufázové ověřování
your_apps: Vaše aplikace
statuses:
attached:
description: 'Přiloženo: %{attached}'

View File

@ -506,7 +506,6 @@ cy:
warning: Byddwch yn ofalus a'r data hyn. Peidiwch a'i rannu byth!
your_token: Eich tocyn mynediad
auth:
agreement_html: Wrth glicio "Cofrestru" isod yr ydych yn cytuno i ddilyn <a href="%{rules_path}">y rheolau ar gyfer yr achos hwn</a> a <a href="%{terms_path}">ein termau gwasanaeth</a>.
change_password: Cyfrinair
confirm_email: Cadarnhau e-bost
delete_account: Dileu cyfrif
@ -813,9 +812,7 @@ cy:
migrate: Mudo cyfrif
notifications: Hysbysiadau
preferences: Dewisiadau
settings: Gosodiadau
two_factor_authentication: Awdurdodi dau-gam
your_apps: Eich rhaglenni
statuses:
attached:
description: 'Ynghlwm: %{attached}'

View File

@ -432,7 +432,6 @@ da:
warning: Vær meget forsigtig med disse data. Del dem aldrig med nogen!
your_token: Din adgangs token
auth:
agreement_html: Ved at oprette dig erklærer du dig enig i at følge <a href="%{rules_path}">serverens regler</a> og <a href="%{terms_path}">vores servicevilkår</a>.
change_password: Kodeord
confirm_email: Bekræft email
delete_account: Slet konto
@ -701,9 +700,7 @@ da:
migrate: Konto migrering
notifications: Notifikationer
preferences: Præferencer
settings: Indstillinger
two_factor_authentication: To-faktor godkendelse
your_apps: Dine applikationer
statuses:
attached:
description: 'Vedhæftede: %{attached}'

View File

@ -511,7 +511,6 @@ de:
warning: Sei mit diesen Daten sehr vorsichtig. Teile sie mit niemandem!
your_token: Dein Zugangs-Token
auth:
agreement_html: Indem du dich registrierst, erklärst du dich mit den untenstehenden <a href="%{rules_path}">Regeln des Servers</a> und der <a href="%{terms_path}">Datenschutzerklärung</a> einverstanden.
apply_for_account: Eine Einladung anfragen
change_password: Passwort
checkbox_agreement_html: Ich akzeptiere die <a href="%{rules_path}" target="_blank">Server-Regeln</a> und die <a href="%{terms_path}" target="_blank">Nutzungsbedingungen</a>
@ -869,9 +868,7 @@ de:
notifications: Benachrichtigungen
preferences: Einstellungen
relationships: Folgende und Follower
settings: Einstellungen
two_factor_authentication: Zwei-Faktor-Auth
your_apps: Deine Anwendungen
statuses:
attached:
description: 'Angehängt: %{attached}'

View File

@ -506,7 +506,6 @@ el:
warning: Μεγάλη προσοχή με αυτά τα στοιχεία. Μην τα μοιραστείς ποτέ με κανέναν!
your_token: Το διακριτικό πρόσβασής σου (access token)
auth:
agreement_html: Επιλέγοντας το "Εγγραφή", συμφωνείς πως δέχεσαι <a href="%{rules_path}">τους κανόνες αυτού του κόμβου</a> και <a href="%{terms_path}">τους όρους χρήσης του</a>.
apply_for_account: Αίτηση πρόσκλησης
change_password: Συνθηματικό
checkbox_agreement_html: Συμφωνώ με τους <a href="%{rules_path}" target="_blank">κανονισμούς του κόμβου</a> και <a href="%{terms_path}" target="_blank">τους όρους χρήσης</a>
@ -860,9 +859,7 @@ el:
notifications: Ειδοποιήσεις
preferences: Προτιμήσεις
relationships: Ακολουθεί και ακολουθείται
settings: Ρυθμίσεις
two_factor_authentication: Πιστοποίηση 2 παραγόντων (2FA)
your_apps: Οι εφαρμογές σου
statuses:
attached:
description: 'Συνημμένα: %{attached}'

View File

@ -134,6 +134,7 @@ en:
moderation_notes: Moderation notes
most_recent_activity: Most recent activity
most_recent_ip: Most recent IP
no_account_selected: No accounts were changed as none were selected
no_limits_imposed: No limits imposed
not_subscribed: Not subscribed
outbox_url: Outbox URL
@ -515,7 +516,6 @@ en:
warning: Be very careful with this data. Never share it with anyone!
your_token: Your access token
auth:
agreement_html: By clicking "Sign up" below you agree to follow <a href="%{rules_path}">the rules of the server</a> and <a href="%{terms_path}">our terms of service</a>.
apply_for_account: Request an invite
change_password: Password
checkbox_agreement_html: I agree to the <a href="%{rules_path}" target="_blank">server rules</a> and <a href="%{terms_path}" target="_blank">terms of service</a>
@ -864,6 +864,8 @@ en:
revoke_success: Session successfully revoked
title: Sessions
settings:
account: Account
account_settings: Account settings
authorized_apps: Authorized apps
back: Back to Mastodon
delete: Account deletion
@ -874,13 +876,13 @@ en:
flavours: Flavours
identity_proofs: Identity proofs
import: Import
import_and_export: Import and export
migrate: Account migration
notifications: Notifications
preferences: Preferences
profile: Profile
relationships: Follows and followers
settings: Settings
two_factor_authentication: Two-factor Auth
your_apps: Your applications
statuses:
attached:
description: 'Attached: %{attached}'

View File

@ -506,7 +506,6 @@ en_GB:
warning: Be very careful with this data. Never share it with anyone!
your_token: Your access token
auth:
agreement_html: By clicking "Sign up" below you agree to follow <a href="%{rules_path}">the rules of the server</a> and <a href="%{terms_path}">our terms of service</a>.
apply_for_account: Request an invite
change_password: Password
checkbox_agreement_html: I agree to the <a href="%{rules_path}" target="_blank">server rules</a> and <a href="%{terms_path}" target="_blank">terms of service</a>
@ -855,9 +854,7 @@ en_GB:
notifications: Notifications
preferences: Preferences
relationships: Follows and followers
settings: Settings
two_factor_authentication: Two-factor Auth
your_apps: Your applications
statuses:
attached:
description: 'Attached: %{attached}'

View File

@ -507,7 +507,6 @@ eo:
warning: Estu tre atenta kun ĉi tiu datumo. Neniam diskonigu ĝin al iu ajn!
your_token: Via alira ĵetono
auth:
agreement_html: Klakante “Registriĝi” sube, vi konsentas kun <a href="%{rules_path}">la reguloj de la servilo</a> kaj <a href="%{terms_path}">niaj uzkondiĉoj</a>.
apply_for_account: Peti inviton
change_password: Pasvorto
checkbox_agreement_html: Mi samopinii al la <a href="%{rules_path}" target="_blank">Servo reguloj</a> kaj <a href="%{terms_path}" target="_blank">kondiĉo al servadon</a>
@ -870,9 +869,7 @@ eo:
notifications: Sciigoj
preferences: Preferoj
relationships: Follows and followers
settings: Agordoj
two_factor_authentication: Dufaktora aŭtentigo
your_apps: Viaj aplikaĵoj
statuses:
attached:
description: 'Ligita: %{attached}'

View File

@ -437,7 +437,6 @@ es:
warning: Ten mucho cuidado con estos datos. ¡No los compartas con nadie!
your_token: Tu token de acceso
auth:
agreement_html: Al hacer click en "Registrarse" acepta seguir <a href="%{rules_path}">las reglas de la instancia</a> y <a href="%{terms_path}">nuestros términos de servicio</a>.
change_password: Contraseña
confirm_email: Confirmar email
delete_account: Borrar cuenta
@ -706,9 +705,7 @@ es:
migrate: Migración de cuenta
notifications: Notificaciones
preferences: Preferencias
settings: Ajustes
two_factor_authentication: Autenticación de dos factores
your_apps: Tus aplicaciones
statuses:
attached:
description: 'Adjunto: %{attached}'

View File

@ -481,7 +481,6 @@ eu:
warning: Kontuz datu hauekin, ez partekatu inoiz inorekin!
your_token: Zure sarbide token-a
auth:
agreement_html: '"Izena eman" botoia sakatzean <a href="%{rules_path}">zerbitzariaren arauak</a> eta <a href="%{terms_path}">erabilera baldintzak</a> onartzen dituzu.'
change_password: Pasahitza
confirm_email: Berretsi e-mail helbidea
delete_account: Ezabatu kontua
@ -788,9 +787,7 @@ eu:
migrate: Kontuaren migrazioa
notifications: Jakinarazpenak
preferences: Hobespenak
settings: Ezarpenak
two_factor_authentication: Bi faktoreetako autentifikazioa
your_apps: Zure aplikazioak
statuses:
attached:
description: 'Erantsita: %{attached}'

View File

@ -506,7 +506,6 @@ fa:
warning: خیلی مواظب این اطلاعات باشید و آن را به هیچ کس ندهید!
your_token: کد دسترسی شما
auth:
agreement_html: با کلیک روی دکمهٔ عضو شدن، شما <a href="%{rules_path}">قوانین این سرور</a> و <a href="%{terms_path}">شرایط استفادهٔ</a> ما را می‌پذیرید.
apply_for_account: درخواست دعوت‌نامه
change_password: رمز
checkbox_agreement_html: من <a href="%{rules_path}" target="_blank">قانون‌های این سرور</a> و <a href="%{terms_path}" target="_blank">شرایط کاربری</a> را می‌پذیرم
@ -861,9 +860,7 @@ fa:
notifications: اعلان‌ها
preferences: ترجیحات
relationships: پیگیری‌ها و پیگیران
settings: تنظیمات
two_factor_authentication: ورود دومرحله‌ای
your_apps: برنامهٔ شما
statuses:
attached:
description: 'پیوست‌شده: %{attached}'

View File

@ -370,7 +370,6 @@ fi:
warning: Säilytä tietoa hyvin. Älä milloinkaan jaa sitä muille!
your_token: Pääsytunnus
auth:
agreement_html: Rekisteröityessäsi sitoudut noudattamaan <a href="%{rules_path}">instanssin sääntöjä</a> ja <a href="%{terms_path}">käyttöehtoja</a>.
change_password: Salasana
confirm_email: Vahvista sähköpostiosoite
delete_account: Poista tili
@ -614,9 +613,7 @@ fi:
migrate: Tilin muutto muualle
notifications: Ilmoitukset
preferences: Ominaisuudet
settings: Asetukset
two_factor_authentication: Kaksivaiheinen todentaminen
your_apps: Omat sovellukset
statuses:
attached:
description: 'Liitetty: %{attached}'

View File

@ -482,7 +482,6 @@ fr:
warning: Soyez prudent⋅e avec ces données. Ne les partagez pas!
your_token: Votre jeton daccès
auth:
agreement_html: En cliquant sur "S'inscrire" ci-dessous, vous souscrivez <a href="%{rules_path}">aux règles du serveur</a> et à <a href="%{terms_path}">nos conditions dutilisation</a>.
change_password: Mot de passe
confirm_email: Confirmer mon adresse mail
delete_account: Supprimer le compte
@ -799,9 +798,7 @@ fr:
migrate: Migration de compte
notifications: Notifications
preferences: Préférences
settings: Réglages
two_factor_authentication: Identification à deux facteurs
your_apps: Vos applications
statuses:
attached:
description: 'Attaché: %{attached}'

View File

@ -506,7 +506,6 @@ gl:
warning: Teña moito tino con estos datos. Nunca os comparta con ninguén!
your_token: O seu testemuño de acceso
auth:
agreement_html: Ao pulsar "Rexistrar" vostede acorda seguir <a href="%{rules_path}">as normas do servidor</a> e <a href="%{terms_path}">os termos do servizo</a>.
apply_for_account: Solicite un convite
change_password: Contrasinal
checkbox_agreement_html: Acepto as <a href="%{rules_path}" target="_blank">regras do servidor</a> e os <a href="%{terms_path}" target="_blank">termos do servizo</a>
@ -856,9 +855,7 @@ gl:
notifications: Notificacións
preferences: Preferencias
relationships: Seguindo e seguidoras
settings: Axustes
two_factor_authentication: Validar Doble Factor
your_apps: As súas aplicacións
statuses:
attached:
description: 'Axenado: %{attached}'

View File

@ -310,7 +310,6 @@ he:
export: יצוא מידע
import: יבוא
preferences: העדפות
settings: הגדרות
two_factor_authentication: אימות דו-שלבי
statuses:
open_in_web: פתח ברשת

View File

@ -115,7 +115,6 @@ hr:
export: Izvoz podataka
import: Uvezi
preferences: Postavke
settings: Podešenja
two_factor_authentication: Dvo-faktorska Autentifikacija
statuses:
open_in_web: Otvori na webu

View File

@ -309,7 +309,6 @@ hu:
warning: Ez érzékeny adat. Soha ne oszd meg másokkal!
your_token: Hozzáférési kulcsod
auth:
agreement_html: A feliratkozással elfogatod az <a href="%{rules_path}">instancia szabályzatát</a> és a <a href="%{terms_path}">felhasználási feltételeket</a>.
delete_account: Felhasználói fiók törlése
delete_account_html: Felhasználói fiókod törléséhez <a href="%{path}">kattints ide</a>. A rendszer újbóli megerősítést fog kérni.
didnt_get_confirmation: Nem kaptad meg a megerősítési lépéseket?
@ -534,9 +533,7 @@ hu:
migrate: Fiók átirányítása
notifications: Értesítések
preferences: Általános beállítások
settings: Beállítások
two_factor_authentication: Kétlépcsős azonosítás
your_apps: Alkalmazásaid
statuses:
open_in_web: Megnyitás a weben
over_character_limit: Túllépted a maximális %{max} karakteres keretet

View File

@ -334,7 +334,6 @@ id:
export: Expor data
import: Impor
preferences: Pilihan
settings: Pengaturan
two_factor_authentication: Autentikasi Two-factor
statuses:
open_in_web: Buka di web

View File

@ -235,7 +235,6 @@ io:
export: Exportacar datumi
import: Importacar
preferences: Preferi
settings: Settings
two_factor_authentication: Dufaktora autentikigo
statuses:
open_in_web: Apertar retnavigile

View File

@ -467,7 +467,6 @@ it:
token_regenerated: Token di accesso rigenerato
warning: Fa' molta attenzione con questi dati. Non fornirli mai a nessun altro!
auth:
agreement_html: Iscrivendoti, accetti di seguire <a href="%{rules_path}">le regole del server</a> e <a href="%{terms_path}"> le nostre condizioni di servizio</a>.
change_password: Password
confirm_email: Conferma email
delete_account: Elimina account
@ -763,9 +762,7 @@ it:
migrate: Migrazione dell'account
notifications: Notifiche
preferences: Preferenze
settings: Impostazioni
two_factor_authentication: Autenticazione a due fattori
your_apps: Le tue applicazioni
statuses:
attached:
description: 'Allegato: %{attached}'

View File

@ -512,7 +512,6 @@ ja:
warning: このデータは気をつけて取り扱ってください。他の人と共有しないでください!
your_token: アクセストークン
auth:
agreement_html: 登録するをクリックすると <a href="%{rules_path}">サーバーのルール</a> と <a href="%{terms_path}">プライバシーポリシー</a> に従うことに同意したことになります。
apply_for_account: 登録を申請する
change_password: パスワード
checkbox_agreement_html: <a href="%{rules_path}" target="_blank">サーバーのルール</a> と <a href="%{terms_path}" target="_blank">プライバシーポリシー</a> に同意します
@ -874,9 +873,7 @@ ja:
notifications: 通知
preferences: ユーザー設定
relationships: フォロー・フォロワー
settings: 設定
two_factor_authentication: 二段階認証
your_apps: アプリ
statuses:
attached:
description: '添付: %{attached}'

View File

@ -401,7 +401,6 @@ ka:
warning: იყავით ძალიან ფრთხილად ამ მონაცემთან. არასდროს გააზიაროთ ეს!
your_token: თქვენი წვდომის ტოკენი
auth:
agreement_html: რეგისტრაციით თქვენ ეთანხმებით <a href="%{rules_path}">ინსტანციის წესებს</a> და <a href="%{terms_path}">ჩვენ მომსახურების პირობებს</a>.
change_password: პაროლი
confirm_email: ელ-ფოსტის დამოწმება
delete_account: ანგარიშის გაუქმება
@ -669,9 +668,7 @@ ka:
migrate: ანგარიშის მიგრაცია
notifications: შეტყობინებები
preferences: პრეფერენციები
settings: პარამეტრები
two_factor_authentication: მეორე-ფაქტორის აუტენტიფიკაცია
your_apps: თქვენი აპლიკაციები
statuses:
attached:
description: 'თან დართული: %{attached}'

View File

@ -482,7 +482,6 @@ kk:
warning: Be very carеful with this data. Never share it with anyone!
your_token: Your access tokеn
auth:
agreement_html: '"Тіркелу" батырмасын басу арқылы <a href="%{rules_path}">сервер ережелері</a> мен <a href="%{terms_path}">қолдану шарттарына</a> келісесіз.'
change_password: Құпиясөз
confirm_email: Еmаil құптау
delete_account: Аккаунт өшіру
@ -798,9 +797,7 @@ kk:
migrate: Аккаунт көшіру
notifications: Ескертпелер
preferences: Таңдаулар
settings: Баптаулар
two_factor_authentication: Екі-факторлы авторизация
your_apps: Қосымшалар
statuses:
attached:
description: 'Жүктелді: %{attached}'

View File

@ -514,7 +514,6 @@ ko:
warning: 이 데이터를 조심히 다뤄 주세요. 다른 사람들과 절대로 공유하지 마세요!
your_token: 액세스 토큰
auth:
agreement_html: 이 등록으로 이 서버의 <a href="%{rules_path}">이용규약</a> 과 <a href="%{terms_path}">약관</a>에 동의하는 것으로 간주됩니다.
apply_for_account: 가입 요청하기
change_password: 패스워드
checkbox_agreement_html: <a href="%{rules_path}" target="_blank">서버 규칙</a>과 <a href="%{terms_path}" target="_blank">이용약관</a>에 동의합니다
@ -875,9 +874,7 @@ ko:
notifications: 알림
preferences: 사용자 설정
relationships: 팔로잉과 팔로워
settings: 설정
two_factor_authentication: 2단계 인증
your_apps: 애플리케이션
statuses:
attached:
description: '첨부: %{attached}'

View File

@ -490,7 +490,6 @@ lt:
warning: Būkite atsargūs su šia informacija. Niekada jos nesidalinkite!
your_token: Jūsų prieigos žetonas
auth:
agreement_html: Paspaudus "Sign up" Jūs sutinkate sekti <a href="%{rules_path}">serverio taisykles</a> bei <a href="%{terms_path}">naudojimo sąlygas</a>.
change_password: Slaptažodis
confirm_email: Patvirtinti el paštą
delete_account: Ištrinti paskyrą
@ -801,9 +800,7 @@ lt:
migrate: Paskyros migracija
notifications: Pranešimai
preferences: Preferencijos
settings: Nustatymai
two_factor_authentication: Dviejų veiksnių autentikacija
your_apps: Jūsų aplikacijos
statuses:
attached:
description: 'Pridėta: %{attached}'

View File

@ -506,7 +506,6 @@ nl:
warning: Wees voorzichtig met deze gegevens. Deel het nooit met iemand anders!
your_token: Jouw toegangscode
auth:
agreement_html: Wanneer je op registreren klikt ga je akkoord met het opvolgen van <a href="%{rules_path}">de regels van deze server</a> en <a href="%{terms_path}">onze gebruiksvoorwaarden</a>.
apply_for_account: Een uitnodiging aanvragen
change_password: Wachtwoord
checkbox_agreement_html: Ik ga akkoord met de <a href="%{rules_path}" target="_blank">regels van deze server</a> en de <a href="%{terms_path}" target="_blank">gebruiksvoorwaarden</a>
@ -857,9 +856,7 @@ nl:
notifications: Meldingen
preferences: Voorkeuren
relationships: Volgers en gevolgden
settings: Instellingen
two_factor_authentication: Tweestapsverificatie
your_apps: Jouw toepassingen
statuses:
attached:
description: 'Bijlagen: %{attached}'

View File

@ -309,7 +309,6 @@
warning: Vær veldig forsiktig med denne data. Aldri del den med noen!
your_token: Din tilgangsnøkkel
auth:
agreement_html: Ved å registrere deg godtar du å følge <a href="%{rules_path}">instansens regler</a> og <a href="%{terms_path}">våre brukervilkår</a>.
delete_account: Slett konto
delete_account_html: Hvis du ønsker å slette din konto kan du <a href="%{path}">fortsette her</a>. Du vil bli spurt om bekreftelse.
didnt_get_confirmation: Mottok du ikke instruksjoner om bekreftelse?
@ -534,9 +533,7 @@
migrate: Kontomigrering
notifications: Varslinger
preferences: Preferanser
settings: Innstillinger
two_factor_authentication: Tofaktorautentisering
your_apps: Dine applikasjoner
statuses:
open_in_web: Åpne i nettleser
over_character_limit: grense på %{max} tegn overskredet

View File

@ -498,7 +498,6 @@ oc:
warning: Mèfi! Agachatz de partejar aquela donada amb degun!
your_token: Vòstre geton daccès
auth:
agreement_html: En vos marcar acceptatz <a href="%{rules_path}">las règlas del servidor</a> e <a href="%{terms_path}">politica de confidencialitat</a>.
apply_for_account: Demandar una invitacion
change_password: Senhal
checkbox_agreement_html: Accepti las <a href="%{rules_path}" target="_blank">règlas del servidor</a> e <a href="%{terms_path}" target="_blank">los tèrmes del servici</a>
@ -891,9 +890,7 @@ oc:
notifications: Notificacions
preferences: Preferéncias
relationships: Abonaments e seguidors
settings: Paramètres
two_factor_authentication: Autentificacion en dos temps
your_apps: Vòstras aplicacions
statuses:
attached:
description: 'Ajustat: %{attached}'

View File

@ -519,7 +519,6 @@ pl:
warning: Przechowuj te dane ostrożnie. Nie udostępniaj ich nikomu!
your_token: Twój token dostępu
auth:
agreement_html: Rejestrując się, oświadczasz, że zapoznałeś(-aś) się z <a href="%{rules_path}">informacjami o serwerze</a> i <a href="%{terms_path}">zasadami korzystania z usługi</a>.
apply_for_account: Poproś o zaproszenie
change_password: Hasło
checkbox_agreement_html: Zgadzam się z <a href="%{rules_path}" target="_blank">regułami serwera</a> i <a href="%{terms_path}" target="_blank">zasadami korzystania z usługi</a>
@ -892,9 +891,7 @@ pl:
notifications: Powiadomienia
preferences: Preferencje
relationships: Śledzeni i śledzący
settings: Ustawienia
two_factor_authentication: Uwierzytelnianie dwuetapowe
your_apps: Twoje aplikacje
statuses:
attached:
description: 'Załączono: %{attached}'

View File

@ -507,7 +507,6 @@ pt-BR:
warning: Tenha cuidado com estes dados. Nunca compartilhe com alguém!
your_token: Seu token de acesso
auth:
agreement_html: Ao se cadastrar você concorda em seguir <a href="%{rules_path}">as regras da instância</a> e <a href="%{terms_path}">os nossos termos de serviço</a>.
apply_for_account: Pedir um convite
change_password: Senha
checkbox_agreement_html: Eu concordo com <a href="%{rules_path}" target="_blank">as regras do servidor</a> e com <a href="%{terms_path}" target="_blank">os termos de serviço</a>
@ -868,9 +867,7 @@ pt-BR:
notifications: Notificações
preferences: Preferências
relationships: Seguindo e seguidores
settings: Configurações
two_factor_authentication: Autenticação em dois passos
your_apps: Seus aplicativos
statuses:
attached:
description: 'Anexado: %{attached}'

View File

@ -482,7 +482,6 @@ pt:
warning: Cuidado com estes dados. Não partilhar com ninguém!
your_token: O teu token de acesso
auth:
agreement_html: Registando-te concordas em seguir <a href="%{rules_path}">as regras da instância</a> e <a href="%{terms_path}">os nossos termos de serviço</a>.
change_password: Palavra-passe
confirm_email: Confirmar e-mail
delete_account: Eliminar conta
@ -801,9 +800,7 @@ pt:
migrate: Migração de conta
notifications: Notificações
preferences: Preferências
settings: Configurações
two_factor_authentication: Autenticação em dois passos
your_apps: As tuas aplicações
statuses:
attached:
description: 'Anexadas: %{attached}'

View File

@ -8,7 +8,6 @@ ro:
one: Toot
other: Toots
auth:
agreement_html: Prin apăsarea butonului Înscriere de mai jos ești deacord cu <a href="%{rules_path}">regulile acestei instanțe</a> și <a href="%{terms_path}">termenii de utilizare al acestui serviciu</a>.
change_password: Parolă
confirm_email: Confirmă email
delete_account: Șterge contul

View File

@ -424,7 +424,6 @@ ru:
warning: Будьте очень внимательны с этими данными. Не делитесь ими ни с кем!
your_token: Ваш токен доступа
auth:
agreement_html: Создавая аккаунт, вы соглашаетесь с <a href="%{rules_path}">правилами узла</a> и <a href="%{terms_path}">нашими условиями обслуживания</a>.
change_password: Пароль
confirm_email: Подтвердите email
delete_account: Удалить аккаунт
@ -699,9 +698,7 @@ ru:
migrate: Перенос аккаунта
notifications: Уведомления
preferences: Настройки
settings: Опции
two_factor_authentication: Двухфакторная аутентификация
your_apps: Ваши приложения
statuses:
attached:
description: 'Вложение: %{attached}'

View File

@ -41,6 +41,8 @@ en:
name: 'You might want to use one of these:'
imports:
data: CSV file exported from another Mastodon server
invite_request:
text: This will help us review your application
sessions:
otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:'
user:
@ -120,12 +122,15 @@ en:
must_be_follower: Block notifications from non-followers
must_be_following: Block notifications from people you don't follow
must_be_following_dm: Block direct messages from people you don't follow
invite_request:
text: Why do you want to join?
notification_emails:
digest: Send digest e-mails
favourite: Send e-mail when someone favourites your status
follow: Send e-mail when someone follows you
follow_request: Send e-mail when someone requests to follow you
mention: Send e-mail when someone mentions you
pending_account: Send e-mail when a new account needs review
reblog: Send e-mail when someone boosts your status
report: Send e-mail when a new report is submitted
'no': 'No'

View File

@ -511,7 +511,6 @@ sk:
warning: Na tieto údaje dávajte ohromný pozor. Nikdy ich s nikým nezďieľajte!
your_token: Váš prístupový token
auth:
agreement_html: V rámci registrácie súhlasíš, že sa budeš riadiť <a href="%{rules_path}"> pravidlami tohto servera</a>, a taktiež <a href="%{terms_path}"> našími prevádzkovými podmienkami</a>.
change_password: Heslo
confirm_email: Potvrdiť email
delete_account: Vymaž účet
@ -832,9 +831,7 @@ sk:
migrate: Presunutie účtu
notifications: Oznámenia
preferences: Voľby
settings: Nastavenia
two_factor_authentication: Dvoj-faktorové overenie
your_apps: Tvoje aplikácie
statuses:
attached:
description: 'Priložené: %{attached}'

View File

@ -479,7 +479,6 @@ sq:
warning: Hapni sytë me ato të dhëna. Mos ia jepni kurrë njeriu!
your_token: Token-i juaj për hyrje
auth:
agreement_html: Duke klikuar mbi "Regjistrohuni" më poshtë, pajtoheni të ndiqni <a href="%{rules_path}">rregullat e shërbyesit</a> dhe <a href="%{terms_path}">kushtet tona të shërbimit</a>.
change_password: Fjalëkalim
confirm_email: Ripohoni email-in
delete_account: Fshije llogarinë
@ -785,9 +784,7 @@ sq:
migrate: Migrim llogarie
notifications: Njoftime
preferences: Parapëlqime
settings: Rregullime
two_factor_authentication: Mirëfilltësim Dyfaktorësh
your_apps: Aplikacionet tuaja
statuses:
attached:
description: 'Bashkëngjitur: %{attached}'

View File

@ -302,7 +302,6 @@ sr-Latn:
warning: Oprezno sa ovim podacima. Nikad je ne delite ni sa kim!
your_token: Vaš pristupni token
auth:
agreement_html: Pristupanjem instanci se slažete sa <a href="%{rules_path}">pravilima instance</a> i <a href="%{terms_path}">uslovima korišćenja</a>.
delete_account: Obriši nalog
delete_account_html: Ako želite da obrišete Vaš nalog, možete <a href="%{path}">nastaviti ovde</a>. Bićete upitani da potvrdite.
didnt_get_confirmation: Niste dobili poruku sa uputstvima za potvrdu naloga?
@ -524,9 +523,7 @@ sr-Latn:
migrate: Prebacivanje naloga
notifications: Obaveštenja
preferences: Podešavanja
settings: Postavke
two_factor_authentication: Dvofaktorska identifikacija
your_apps: Vaše aplikacije
statuses:
open_in_web: Otvori u vebu
over_character_limit: ograničenje od %{max} karaktera prekoračeno

View File

@ -492,7 +492,6 @@ sr:
warning: Опрезно са овим подацима. Никад је не делите ни са ким!
your_token: Ваш приступни токен
auth:
agreement_html: Приступањем инстанци се слажете са <a href="%{rules_path}">правилима инстанце</a> и <a href="%{terms_path}">условима коришћења</a>.
change_password: Лозинка
confirm_email: Потврдите адресу е-поште
delete_account: Обриши налог
@ -793,9 +792,7 @@ sr:
migrate: Пребацивање налога
notifications: Обавештења
preferences: Подешавања
settings: Поставке
two_factor_authentication: Двофакторска идентификација
your_apps: Ваше апликације
statuses:
attached:
description: 'У прилогу: %{attached}'

View File

@ -354,7 +354,6 @@ sv:
warning: Var mycket försiktig med denna data. Dela aldrig den med någon!
your_token: Din access token
auth:
agreement_html: Genom att registrera dig godkänner du att följa <a href="%{rules_path}">instansens regler</a> och <a href="%{terms_path}">våra användarvillkor</a>.
change_password: Lösenord
confirm_email: Bekräfta e-postadress
delete_account: Ta bort konto
@ -601,9 +600,7 @@ sv:
migrate: Kontoflytt
notifications: Meddelanden
preferences: Inställningar
settings: Inställningar
two_factor_authentication: Tvåstegsautentisering
your_apps: Dina applikationer
statuses:
attached:
description: 'Bifogad: %{attached}'

View File

@ -590,9 +590,7 @@ th:
notifications: การแจ้งเตือน
preferences: การกำหนดลักษณะ
relationships: การติดตามและผู้ติดตาม
settings: การตั้งค่า
two_factor_authentication: การรับรองความถูกต้องด้วยสองปัจจัย
your_apps: แอปพลิเคชันของคุณ
statuses:
attached:
description: 'แนบ: %{attached}'

View File

@ -347,7 +347,6 @@ tr:
export: Dışa aktar
import: İçe aktar
preferences: Tercihler
settings: Ayarlar
two_factor_authentication: İki-faktörlü doğrulama
statuses:
open_in_web: Web sayfasında aç

View File

@ -386,7 +386,6 @@ uk:
warning: Будьте дуже обережні з цими даними. Ніколи не діліться ними ні з ким!
your_token: Ваш токен доступу
auth:
agreement_html: Реєструючись, ви погоджуєтеся виконувати <a href="%{rules_path}">правила інстанції</a> та <a href="%{terms_path}">наші умови використання</a>.
change_password: Пароль
confirm_email: Підтвердьте e-mail адресу
delete_account: Видалити аккаунт
@ -649,9 +648,7 @@ uk:
migrate: Міграція акаунту
notifications: Сповіщення
preferences: Налаштування
settings: Опції
two_factor_authentication: Двофакторна авторизація
your_apps: Ваші затосунки
statuses:
attached:
description: 'Прикріплено: %{attached}'

View File

@ -410,7 +410,6 @@ zh-CN:
warning: 一定小心,千万不要把它分享给任何人!
your_token: 你的访问令牌
auth:
agreement_html: 点击注册即表示你同意遵守<a href="%{rules_path}">本站的相关规定</a>和<a href="%{terms_path}">我们的使用条款</a>。
change_password: 密码
confirm_email: 确认电子邮件地址
delete_account: 删除帐户
@ -671,9 +670,7 @@ zh-CN:
migrate: 帐户迁移
notifications: 通知
preferences: 首选项
settings: 设置
two_factor_authentication: 双重认证
your_apps: 你的应用
statuses:
attached:
description: 附加媒体:%{attached}

View File

@ -352,7 +352,6 @@ zh-HK:
warning: 警告,不要把它分享給任何人!
your_token: token
auth:
agreement_html: 登記即表示你同意遵守<a href="%{rules_path}">本服務站的規則</a>和<a href="%{terms_path}">使用條款</a>。
change_password: 密碼
confirm_email: 確認電郵
delete_account: 刪除帳戶
@ -598,9 +597,7 @@ zh-HK:
migrate: 帳戶遷移
notifications: 通知
preferences: 偏好設定
settings: 設定
two_factor_authentication: 雙重認證
your_apps: 你的應用程式
statuses:
attached:
description: 附件: %{attached}

View File

@ -436,7 +436,6 @@ zh-TW:
warning: 警告,不要把它分享給任何人!
your_token: 你的 token
auth:
agreement_html: 按下下方的「註冊」即代表同意遵守 <a href="%{rules_path}">此伺服器的規則</a> 以及 <a href="%{terms_path}">使用條款</a>。
change_password: 密碼
confirm_email: 確認電子信箱位址
delete_account: 刪除帳戶
@ -667,9 +666,7 @@ zh-TW:
migrate: 帳戶搬遷
notifications: 通知
preferences: 偏好設定
settings: 設定
two_factor_authentication: 兩階段認證
your_apps: 你的應用程式
statuses:
attached:
description: 附件: %{attached}