diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-08-19 19:31:32 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-19 21:49:35 +0200 |
commit | 1488be7d9683fb3442c6f7bd4fd911d224f0c929 (patch) | |
tree | 42548a596bb118e08c14c4d0ae9eacb3e8b2f36b /config/locales/sq.yml | |
parent | b859eb001717dfc62aebb8eba47b84c75aebe4ef (diff) | |
parent | d22f3a7d5140ef1c3ae6e9bd2241bbb5289af8d1 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json
Diffstat (limited to 'config/locales/sq.yml')
-rw-r--r-- | config/locales/sq.yml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/config/locales/sq.yml b/config/locales/sq.yml index cbe225646..3373b6771 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -424,12 +424,7 @@ sq: title: Gjendje llogarish with_media: Me media tags: - accounts: Llogari - hidden: Fshehur - hide: Fshihe prej drejtorie title: Hashtage - unhide: Shfaqe në drejtori - visible: E dukshme title: Administrim warning_presets: add_new: Shtoni të ri @@ -458,7 +453,6 @@ sq: your_token: Token-i juaj për hyrje auth: change_password: Fjalëkalim - confirm_email: Ripohoni email-in delete_account: Fshije llogarinë delete_account_html: Nëse dëshironi të fshihni llogarinë tuaj, mund <a href="%{path}">ta bëni që këtu</a>. Do t’ju kërkohet ta ripohoni. didnt_get_confirmation: S’morët udhëzime ripohimi? |