Skip to content

[2.4] sync master translations with 2.4 #11618

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

Closed
wants to merge 1 commit into from
Closed

[2.4] sync master translations with 2.4 #11618

wants to merge 1 commit into from

Conversation

1emming
Copy link
Contributor

@1emming 1emming commented Aug 8, 2014

Sync translations of master that are missing in 2.4

Q A
Bug fix? yes (sort of)
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets part of #11489
License MIT

@1emming 1emming changed the title sync master translations with 2.4 [2.4] sync master translations with 2.4 Aug 8, 2014
@stof
Copy link
Member

stof commented Aug 8, 2014

I don't understand your PR. You are labelling it as [2.4] and saying you add translations missing in 2.4, but the target of your PR is master

@@ -175,7 +175,7 @@
<target>L'altura de la imatge és massa petita ({{ height }}px). L'altura mínima requerida són {{ min_height }}px.</target>
</trans-unit>
<trans-unit id="47">
<source>This value should be the user current password.</source>
<source>This value should be the user's current password.</source>
Copy link
Member

Choose a reason for hiding this comment

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

if the goal is to merge in 2.4, this change must not be included (we haven't changed the source in patch releases for 2.4 as it would be a BC break)

@1emming 1emming closed this Aug 8, 2014
@xabbuh
Copy link
Member

xabbuh commented Aug 8, 2014

Actually, these lines of the validators.ca.xlf file are already present (see here). They have been merged with #11533.

@xabbuh
Copy link
Member

xabbuh commented Aug 8, 2014

@1emming I didn't check all of the other related files yet, but it seems to me that they do exist in 2.4.

@1emming 1emming deleted the trans_syn branch August 22, 2014 16:40
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.

3 participants