Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

l10n: update Persian translations (fa.yml) #11052

Merged
merged 3 commits into from
Jun 11, 2019
Merged

Conversation

mabkenar
Copy link

No description provided.


<p>This document is CC-BY-SA. It was last updated March 7, 2018.</p>

<p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this pull request is work in progress?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this pull request is work in progress?

Not really. Please merge it as is. I'll translate it later (probably in later releases) if I got the time.

And many thanks for your help and support. Keep up your great work :)

@ykzts ykzts merged commit 30e2f72 into mastodon:master Jun 11, 2019
koba-lab pushed a commit to koba-lab/mastodon that referenced this pull request Jun 14, 2019
* commit 'c9eeb2e832b5b36a86028bbec7a353c32be510a7': (227 commits)
  Bump version to 2.9.0 (mastodon#11074)
  New Crowdin translations (mastodon#11075)
  New Crowdin translations (mastodon#11073)
  Fix ordering of keyboard access between CW field, textarea and emoji picker (mastodon#11066)
  List attachments in reply indicator and boost modal (mastodon#10997)
  New Crowdin translations (mastodon#11069)
  Bump version to 2.9.0rc2 (mastodon#11070)
  Do not expand toot when clicking on a poll option (mastodon#11067)
  Only show profile directory link when it's enabled (mastodon#11064)
  Add button to conveniently copy OAuth code (mastodon#11065)
  Fix border-bottom of active tab bars (mastodon#11068)
  New Crowdin translations (mastodon#11062)
  Change translations badge in README to Crowdin (mastodon#11054)
  New Crowdin translations (mastodon#11060)
  Fix Serbian pluralization rules requiring a "many" key (mastodon#11061)
  Update crowdin.yml
  i18n: Update Japanese translations (mastodon#11035)
  Update Crowdin configuration file
  Update Crowdin configuration file
  l10n: update Persian translations (fa.yml) (mastodon#11052)
  ...

# Conflicts:
#	CHANGELOG.md
#	app/javascript/mastodon/components/status.js
#	app/javascript/mastodon/locales/ja.json
#	app/javascript/styles/mastodon-light/diff.scss
#	db/schema.rb
#	lib/mastodon/version.rb
#	package.json
hiyuki2578 pushed a commit to ProjectMyosotis/mastodon that referenced this pull request Oct 2, 2019
* l10n: update Persian translations (fa.yml)

* Fix fa.yml syntax

* i18n-tasks normalize
messenjahofchrist pushed a commit to Origin-Creative/mastodon that referenced this pull request Jul 30, 2021
* l10n: update Persian translations (fa.yml)

* Fix fa.yml syntax

* i18n-tasks normalize
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants