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

Gender-Neutral #1070

Merged
merged 5 commits into from Nov 20, 2015
Merged

Gender-Neutral #1070

merged 5 commits into from Nov 20, 2015

Conversation

MyDimeIsUp
Copy link
Contributor

Added gender-neutral stuff for the only things I could find.

Also did Spanish (Anyone else can do other languages, that would be
great!)

P.S How did someone forget to put the "ser" conjugation on the "He was
an innocent" it basically said "He was innocent" in Spanish :P Fixed
that too.

Added gender-neutral stuff for the only things I could find.

Also did Spanish (Anyone else can do other languages, that would be
great!)

P.S How did someone forget to put the "ser" conjugation on the "He was
an innocent" it basically said "He was innocent" in Spanish :P Fixed
that too.
@Bo98
Copy link
Contributor

Bo98 commented Oct 3, 2015

What's wrong with saying "They were innocent"? Sounds better than "They were an innocent".

@robotboy655 robotboy655 added the TTT The pull request is for TTT and will be handled by svdm. label Oct 3, 2015
@Kefta
Copy link
Contributor

Kefta commented Oct 3, 2015

Era is already gender neutral. Estaba is not the direct translation of "they," rather, it refers to plurality

@Kefta
Copy link
Contributor

Kefta commented Oct 3, 2015

And I did not put an "un" before innocent because innocent in Spanish is not a noun, it's an adjective. Just like English

@svdm
Copy link
Collaborator

svdm commented Oct 5, 2015

Can't speak for the Spanish, but the English should indeed be "They were innocent" or "They were an innocent Terrorist".

@MyDimeIsUp
Copy link
Contributor Author

Ok, ill fix it then.

@AshleighAdams
Copy link
Contributor

👍

@Kefta
Copy link
Contributor

Kefta commented Oct 6, 2015

You didn't fix?

@MyDimeIsUp
Copy link
Contributor Author

Opps! Sorry.

Undo Ser conjugation
@Kefta
Copy link
Contributor

Kefta commented Oct 8, 2015

Estaban still isn't correct.

@MyDimeIsUp
Copy link
Contributor Author

How so?

@Kefta
Copy link
Contributor

Kefta commented Oct 8, 2015

Estaban means multiple people; it's not a direct translation of they. Era is correct.

@AshleighAdams
Copy link
Contributor

@Kefta 'They' is also plural in English, but is acceptable for singular use for gender-neutral speech. Is 'era' gender neutral and singular?

Granted this is google translate, but "era" translates to "he", and "estaban" to "they were", the former isn't gender neutral.

@Kefta
Copy link
Contributor

Kefta commented Oct 8, 2015

@Kateadams Without any subject (el, ella, usted), Era is gender neutral and singular. Google translate comes back as "he" because there is no gender-neutral singular in English that can't also be a plural --other than "it," which is not appropriate for people. Estaban, although gender neutral, is not singular in any way.

@LennyPenny
Copy link
Contributor

It is appropiate for people if you want to be gender neutral

@Kefta
Copy link
Contributor

Kefta commented Nov 5, 2015

@svdm Ready

@@ -792,7 +792,7 @@ L.col_total = "Total points"
L.something = "something"

-- Kill events
L.ev_blowup = "{victim} blew himself up"
L.ev_blowup = "{victim} blew themself up"
Copy link
Contributor

Choose a reason for hiding this comment

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

shouldn't this and line 854 be themselves?

Copy link
Contributor

Choose a reason for hiding this comment

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

@zerfgog No, themself is explicitly singular.

Copy link
Collaborator

Choose a reason for hiding this comment

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

svdm added a commit that referenced this pull request Nov 20, 2015
TTT: more gender neutral pronouns
@svdm svdm merged commit f495b5e into Facepunch:master Nov 20, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
TTT The pull request is for TTT and will be handled by svdm.
Projects
None yet
8 participants