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

[Fixed conflicts] Fixed misspellings and fuzzy translations in Dutch, French, Italian, Portuguese and Spanish #223

Merged
merged 1 commit into from
Feb 22, 2019

Conversation

gusbemacbe
Copy link
Contributor

Hello @actionless !

  • I have fixed the misspeling "Backround" to "Background" in all Dutch, French, Italian, Portuguese and Spanish;
  • I have removed the duplicated strings #~ msgid "Theme options:" in all Dutch, French, Italian, Portuguese and Spanish;
  • I have removed "fuzzy" and fixed missed symbols in the Dutch translation;
  • I have corrected the misspellings, fuzzy translations and improved the other translations in the French, Italian, Portuguese and Spanish.

Observation:

BiDi is the same in all languages. But I do not know if it is bad to insert the whole name of that abbreviation like: "testo bidirezionale", "texto bidireccional", "texte bidirectionnel", "bidirectionele tekst", etc.

@actionless
Copy link
Member

BiDi was chosen over full label beacuse it was making UI wider :-)

@gusbemacbe
Copy link
Contributor Author

Ah, but would you like I replace BiDi or do we leave it?

@actionless
Copy link
Member

thanks a lot!

@actionless actionless merged commit 09531b0 into themix-project:master Feb 22, 2019
@actionless
Copy link
Member

yup, leave it, with the time mb i'll add some explanatory popup or so

@gusbemacbe gusbemacbe deleted the gusbemacbe-patch-1 branch February 22, 2019 16:25
@gusbemacbe
Copy link
Contributor Author

Hi @actionless !

There is a missed string in all translations:

imagem

@gusbemacbe
Copy link
Contributor Author

And the Dutch native made a small mistake, he duplicated the same translation for two different strings ("Voorinstellingen"):

imagem

@actionless
Copy link
Member

thanks for checking! fixed the first thing: 8929838

second one i can't address since idk what should be the expected result

@gusbemacbe
Copy link
Contributor Author

@actionless !

How do I upgrade your most recent master branch to my fork, without having to remove my repository every time? For avoiding the conflicts.

@actionless
Copy link
Member

git pull upstream master

@actionless
Copy link
Member

actionless commented Feb 22, 2019

(given what you did remote add as i described previously)

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