diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-04-08 15:57:56 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-08 15:57:56 +0200 |
| commit | f5f6d23d554b3a81020feebc65188cc64f644095 (patch) | |
| tree | b30197858c2018a32be559f5b4b479571c75dee3 /config/locales/co.yml | |
| parent | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (diff) | |
| parent | 3f036ac6b8f9919b3b141012db163476f18fe299 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.
Diffstat (limited to 'config/locales/co.yml')
| -rw-r--r-- | config/locales/co.yml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/locales/co.yml b/config/locales/co.yml index 90c60e292..7fcb087cf 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -68,6 +68,7 @@ co: admin: Amministratore bot: Bot moderator: Muderatore + unavailable: Prufile micca dispunibule unfollow: Ùn siguità più admin: account_actions: @@ -80,6 +81,7 @@ co: destroyed_msg: Nota di muderazione sguassata! accounts: approve: Appruvà + approve_all: Appruvà tutti are_you_sure: Site sicuru·a? avatar: Ritrattu di prufile by_domain: Duminiu @@ -144,6 +146,7 @@ co: push_subscription_expires: Spirata di l’abbunamentu PuSH redownload: Mette à ghjornu u prufile reject: Righjittà + reject_all: Righjittà tutti remove_avatar: Toglie l’avatar remove_header: Toglie l'intistatura resend_confirmation: @@ -330,6 +333,8 @@ co: expired: Spirati title: Filtrà title: Invitazione + pending_accounts: + title: Conti in attesa (%{count}) relays: add_new: Aghjustà un ripetitore delete: Sguassà @@ -633,7 +638,7 @@ co: all: Tuttu changes_saved_msg: Cambiamenti salvati! copy: Cupià - order_by: Urdinà per + order_by: Urdinà da save_changes: Salvà e mudificazione validation_errors: one: Qualcosa ùn và bè! Verificate u prublemu quì sottu |