logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: a595febcb86cfeda927128b8a36756db6457e58d
parent: ae3b92ce85c15ea170b062286bea9f0201ed1014
Author: Shpuld Shpludson <shp@cock.li>
Date:   Mon,  1 Apr 2019 19:49:16 +0000

Merge branch 'develop' into 'develop'

[i18n] Update oc.json for !611 and !691

See merge request pleroma/pleroma-fe!712

Diffstat:

Msrc/i18n/oc.json2++
1 file changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/i18n/oc.json b/src/i18n/oc.json @@ -25,6 +25,7 @@ "image_cropper": { "crop_picture": "Talhar l’imatge", "save": "Salvar", + "save_without_cropping": "Salvar sens talhada", "cancel": "Anullar" }, "login": { @@ -152,6 +153,7 @@ "general": "General", "hide_attachments_in_convo": "Rescondre las pèças juntas dins las conversacions", "hide_attachments_in_tl": "Rescondre las pèças juntas", + "hide_muted_posts": "Rescondre las publicacions del monde rescondut", "max_thumbnails": "Nombre maximum de vinhetas per publicacion", "hide_isp": "Amagar lo panèl especial instància", "preload_images": "Precargar los imatges",