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

Add french translations for CBA UI #1001

Merged
merged 2 commits into from
Oct 4, 2018
Merged

Conversation

alganthe
Copy link
Contributor

@alganthe alganthe commented Oct 4, 2018

When merged this pull request will:

  • Add french translation for CBA UI.
  • Add missing translation for joint Ammo Magazines.
  • Add missing translation in strings, remove empty translations.

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
Copy link
Contributor

Choose a reason for hiding this comment

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

Make sure this doesn't readd the BOM removed in #1000

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i've used tabler 0.8.0, which shouldn't.

Copy link
Contributor

Choose a reason for hiding this comment

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

Why is it pink then?

Copy link
Contributor Author

@alganthe alganthe Oct 4, 2018

Choose a reason for hiding this comment

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

good question, no idea, maybe @bux can help?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

just checked, no BOM.

Copy link
Contributor

Choose a reason for hiding this comment

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

Just checked #1000 it indeed converted UTF8-BOM to UTF8 in ui stringtable.
Also checked the merge commit. Both files have same encoding.. There was indeed no change here 🤔 @github broken.

Copy link
Contributor

Choose a reason for hiding this comment

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

However @alganthe changed the encoding from BOM to nonBOM in the strings stringtable which @veteran29 forgot

Note: the thousand separator in french is indeed a space.
@jonpas jonpas modified the milestones: 3.10, 3.9 Oct 4, 2018
@commy2 commy2 merged commit aaa28ab into CBATeam:master Oct 4, 2018
ViperMaul added a commit that referenced this pull request Oct 10, 2018
* master:
  Add Turkish translations (#1002)
  Add french translations for CBA UI (#1001)
  JAM STANAG and 7.62.x51 (#997)
  Remove BOM character from stringtables (#1000)
  More JAM stuff (#995)
  minor last-minute tweaks for AK magwells (#994)
  add CBA_762x39_RPK
  Translate JAM and JR module nams into Polish (#987)
  add magwells for current IFA3, FOW, LEN weapons
  Split/extend the magwell classes by size
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants