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.

Sign up for GitHub

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

Add french translations for CBA UI #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c7f3d3
Add french translations for CBA UI
alganthe Oct 4, 2018
bfe46b5
Add back missing entries for "STR_CBA_FORMAT_NUMBER_THOUSANDS_SEPARATOR"
alganthe Oct 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions addons/jam/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<English>Community Base Addons - Joint Ammo Magazines</English>
<German>Community Base Addons - Gemeinsame Munition und Magazine</German>
<Polish>Community Base Addons - Wspólna Amunicja oraz Magazynki</Polish>
<French>Community Base Addons - Munitions et Chargeurs joints</French>
</Key>
</Package>
</Project>
2 changes: 1 addition & 1 deletion addons/strings/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="CBA_A3">
<Package name="Strings">
<Key ID="STR_CBA_Strings_Component">
Expand Down
11 changes: 10 additions & 1 deletion addons/ui/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 •
edited
Loading

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

<Project name="CBA_A3">
<Package name="Ui">
<Key ID="STR_CBA_Ui_Component">
Expand Down Expand Up @@ -34,46 +34,55 @@
<English>CBA UI</English>
<German>CBA UI</German>
<Polish>CBA UI</Polish>
<French>CBA IU</French>
</Key>
<Key ID="STR_CBA_Ui_StoreServerPasswords">
<English>Store server passwords</English>
<German>Serverpasswörter speichern</German>
<Polish>Zapamiętuj hasła serwerów</Polish>
<French>Enregistrer les mots de passe serveur</French>
</Key>
<Key ID="STR_CBA_Ui_StoreServerPasswordsTooltip">
<English>Setting to store the passwords entered when connecting to a multiplayer server.</English>
<German>Einstellung zum Speichern der beim Betreten eines Mehrspielerservers eingegebenen Passwörter.</German>
<Polish>Opcja zapamiętywania wprowadzonych haseł do serwerów.</Polish>
<French>Paramètre pour enregistrer les mots de passe entrés quand vous vous connectez à un serveur multijoueur</French>
</Key>
<Key ID="STR_CBA_Ui_SavePasswords">
<English>Save passwords</English>
<German>Passwörter speichern</German>
<Polish>Zapisuj hasła</Polish>
<French>Sauvegarder mots de passe</French>
</Key>
<Key ID="STR_CBA_Ui_SavePasswordsTooltip">
<English>Passwords are stored when connecting to a multiplayer server.</English>
<German>Passwörter werden beim Verbinden mit einem Mehrspielerserver gespeichert.</German>
<Polish>Hasła są zapisywane podczas łaczenia do serwerów.</Polish>
<French>Les mots de passe sont enregistrés quand vous vous connectez à un serveur multijoueur</French>
</Key>
<Key ID="STR_CBA_Ui_DoNotSavePasswords">
<English>Do not save passwords</English>
<German>Passwörter nicht speichern</German>
<Polish>Nie zapisuj haseł</Polish>
<French>Ne pas enregistrer les mots de passe</French>
</Key>
<Key ID="STR_CBA_Ui_DoNotSavePasswordsTooltip">
<English>Passwords are not stored when connecting to a multiplayer server. Already stored passwords will not be automatically entered.</English>
<German>Passwörter werden beim Verbinden mit einem Mehrspielerserver nicht gespeichert. Bereits gespeicherte Passwörter werden nicht automatisch eingegeben.</German>
<Polish>Hasła nie są zapisywane podczas łączenia do serwerów. Już zapisane hasła nie bedą wykorzystywane.</Polish>
<French>Les mots de passe ne sont pas enregistrés quand vous vous connectez à un serveur multijoueur.Les mots de passe déjà enregistrés ne seront pas entrés automatiquement.</French>
</Key>
<Key ID="STR_CBA_Ui_DeletePasswords">
<English>Delete passwords</English>
<German>Passwörter löschen</German>
<Polish>Usuń hasła</Polish>
<French>Supprimer les mots de passe</French>
</Key>
<Key ID="STR_CBA_Ui_DeletePasswordsTooltip">
<English>Passwords are not stored when connecting to a multiplayer server. Already stored passwords are deleted from the profile.</English>
<German>Passwörter werden beim Verbinden mit einem Mehrspielerserver nicht gespeichert. Bereits gespeicherte Passwörter werden aus dem Profil gelöscht.</German>
<Polish>Hasła nie są zapisywane podczas łączenia do serwerów. Już zapisane hasła zostaną usunięte z profilu.</Polish>
<French>Les mots de passe ne sont pas enregistrés quand vous vous connectez à un serveur multijoueur.Les mots de passe déjà enregistrés vont être supprimés du profile.</French>
</Key>
</Package>
</Project>