about summary refs log tree commit diff
path: root/config/locales/simple_form.cy.yml
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-02-13 16:19:15 +0100
committerGitHub <noreply@github.com>2019-02-13 16:19:15 +0100
commit435a367c108047170dc752ef766a4264dd90b5c8 (patch)
tree95de2a7f37a8c2345175550fbce54f207b4aec7d /config/locales/simple_form.cy.yml
parenta3ba28eb17d75af37396359e8c37675e06605ccf (diff)
parent614ea184bb911a5b86804e05350997bafc605580 (diff)
Merge pull request #914 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/simple_form.cy.yml')
-rw-r--r--config/locales/simple_form.cy.yml14
1 files changed, 14 insertions, 0 deletions
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index d3f9cb340..24ae49a2a 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -38,6 +38,18 @@ cy:
         fields:
           name: Label
           value: Cynnwys
+      account_warning_preset:
+        text: Testun rhagosodedig
+      admin_account_action:
+        send_email_notification: Hysbysu'r defnyddiwr trwy e-bost
+        text: Rhybudd wedi'i addasu
+        type: Gweithredu
+        types:
+          disable: Analluogi
+          none: Gwneud dim
+          silence: Tawelwch
+          suspend: Dileu data cyfrif
+        warning_preset_id: Defnyddiwch ragnod rhag rhybudd
       defaults:
         autofollow: Gwahodd i ddilyn eich cyfrif
         avatar: Afatar
@@ -48,6 +60,7 @@ cy:
         context: Hidlo cyd-destunau
         current_password: Cyfrinair presennol
         data: Data
+        discoverable: Rhestrwch y cyfrif hwn ar y cyfeiriadur
         display_name: Enw arddangos
         email: Cyfeiriad e-bost
         expires_in: Yn dod i ben ar ôl
@@ -63,6 +76,7 @@ cy:
         otp_attempt: Côd dau gam
         password: Cyfrinair
         phrase: Allweddair neu ymadrodd
+        setting_aggregate_reblogs: Grŵp hybiau mewn llinellau amser
         setting_auto_play_gif: Chwarae GIFs wedi'u hanimeiddio yn awtomatig
         setting_boost_modal: Dangos deialog cadarnhad cyn bŵstio
         setting_default_language: Cyhoeddi iaith