toz/MediLog
9
51
Fork
You've already forked MediLog
3

Add french translation #264

Closed
djelouze wants to merge 0 commits from add-french-translation into master
pull from: add-french-translation
merge into: toz:master
toz:main
toz:3.6.0
toz:3.3.8
toz:master
toz:v3.3.2
toz:v3.2.7
toz:v3.2.5
toz:v3.2.1
toz:v3.2.0
toz:v3.1.2
toz:v3.1.0
toz:v3.0.7
toz:v3.0.6
toz:v3.0.5
toz:v3.0.4
toz:v2.7.4
toz:v3.0.3
toz:v3.0.1
toz:v3.0.0
toz:v2.7.3
toz:v2.7.2
toz:v2.7.1
toz:v2.7.0
toz:v2.6.3
toz:v2.6.2
toz:v2.6.0
toz:v2.5.11
toz:v2.5.10
toz:v2.5.9
toz:v2.5.8
toz:v2.5.7
toz:v2.5.6
toz:v2.5.5
toz:v2.5.4
toz:v2.5.3
toz:v2.5.2
toz:v2.5.1
toz:v2.5.0
toz:v2.4.8
toz:v2.4.7
toz:v2.4.6
toz:v2.4.5
toz:v2.4.4
toz:v2.4.3
toz:v2.4.2
toz:v2.4.0
toz:v2.3.5
toz:v2.3.4
toz:v2.3.3
toz:v2.3.2
toz:v2.3.1
djelouze commented 2020年10月07日 21:25:29 +02:00 (Migrated from gitlab.com)
Copy link

This MR only provides a french translation of res/values/strings.xml in res/values-fr/strings.xml, based on what I found in res/values-de/.

No changes to source code are commited, as I am totally unable to do that ! I hope the integration of a new language is straight-forward and that I will find a french UI in upcoming releases ;)

This MR only provides a french translation of `res/values/strings.xml` in `res/values-fr/strings.xml`, based on what I found in `res/values-de/`. No changes to source code are commited, as I am totally unable to do that ! I hope the integration of a new language is straight-forward and that I will find a french UI in upcoming releases ;)
espyder.net commented 2020年10月07日 21:36:14 +02:00 (Migrated from gitlab.com)
Copy link

Thanks for adding your language resource! This is the first language merge request I am dealing wit, so I better test this properly to not screw things up :-)
I'll look into this asap...

Edit: The language file looks good, only two issues:

  1. the ' had to be escaped, with \'
  2. Looks like you didn't grab the latest build when starting your translation, I coincidentally uploaded release 1.8 last night.

I think the easiest way to handle this is for me to manually add your translation to the 1.8 build and start from there. Open to suggestions though because I don't have experience with handling merge requests :-)

Edit2:
Looks good :-)

image

Thanks for adding your language resource! This is the first language merge request I am dealing wit, so I better test this properly to not screw things up :-) I'll look into this asap... ---- Edit: The language file looks good, only two issues: 1. the ' had to be escaped, with \\' 2. Looks like you didn't grab the latest build when starting your translation, I coincidentally uploaded release 1.8 last night. I think the easiest way to handle this is for me to manually add your translation to the 1.8 build and start from there. Open to suggestions though because I don't have experience with handling merge requests :-) Edit2: Looks good :-) ![image](/uploads/51b30ef25bdd262ac9f26479e1662add/image.png)
djelouze commented 2020年10月07日 22:08:52 +02:00 (Migrated from gitlab.com)
Copy link

Great ! It was fast 😱 😆

I started from master branch, it is how we deal with that at work... But my mistake, I didn't check how you manage the releases and branches.

So if I understood well, for the string Nouvelle entrée d'agenda, I have to write Nouvelle entrée d''agenda ?

Great ! It was fast :scream: :laughing: I started from master branch, it is how we deal with that at work... But my mistake, I didn't check how you manage the releases and branches. So if I understood well, for the string `Nouvelle entrée d'agenda`, I have to write `Nouvelle entrée d''agenda` ?
djelouze commented 2020年10月07日 22:27:23 +02:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • e5ff050f - Escape ' [quote] with '

Compare with previous version

added 1 commit <ul><li>e5ff050f - Escape &#39; [quote] with &#39;</li></ul> [Compare with previous version](/toz12/medilog/-/merge_requests/10/diffs?diff_id=116804785&start_sha=2f0a1c576db40dbacad48dc436b8a550b70b1355)
espyder.net commented 2020年10月07日 22:29:42 +02:00 (Migrated from gitlab.com)
Copy link

I may well have made a mistake. The change is like this:
Nouvelle entrée d'agenda, needs to be Nouvelle entrée d\'agenda

Anyway, I changed the strings already, search and replace :-), and will push v.1.8.1 in a couple of minutes. Will you compile from here or pick it up via F-Droid?

I may well have made a mistake. The change is like this: `Nouvelle entrée d'agenda`, needs to be `Nouvelle entrée d\'agenda` Anyway, I changed the strings already, search and replace :-), and will push v.1.8.1 in a couple of minutes. Will you compile from here or pick it up via F-Droid?
djelouze commented 2020年10月07日 22:32:17 +02:00 (Migrated from gitlab.com)
Copy link

That a very good news! I will pick up via F-droid, as I am totally unexperienced in building android apps ;)

Thanks a lot ! With the translation in real UI context, I will be able to commit some translation refinements.

That a very good news! I will pick up via F-droid, as I am totally unexperienced in building android apps ;) Thanks a lot ! With the translation in real UI context, I will be able to commit some translation refinements.
djelouze commented 2020年10月07日 22:40:10 +02:00 (Migrated from gitlab.com)
Copy link

added 19 commits

  • e5ff050f...99e6ba13 - 18 commits from branch toz12:master
  • 2e427d56 - Merge branch 'master' into 'add-french-translation'

Compare with previous version

added 19 commits <ul><li>e5ff050f...99e6ba13 - 18 commits from branch <code>toz12:master</code></li><li>2e427d56 - Merge branch &#39;master&#39; into &#39;add-french-translation&#39;</li></ul> [Compare with previous version](/toz12/medilog/-/merge_requests/10/diffs?diff_id=116806601&start_sha=e5ff050f136da3a9accf5564cf4cc219993d8f68)
toz12 commented 2020年10月07日 22:44:25 +02:00 (Migrated from gitlab.com)
Copy link

Cool. I think we can cancel this merge request as your translation is now already part of the 1.8.1 master branch.

Cool. I think we can cancel this merge request as your translation is now already part of the 1.8.1 master branch.
djelouze commented 2020年10月07日 23:10:20 +02:00 (Migrated from gitlab.com)
Copy link

Definitely !By the way, my Android version is 8.1.0.

Definitely !By the way, my Android version is 8.1.0.
djelouze commented 2020年10月08日 08:56:20 +02:00 (Migrated from gitlab.com)
Copy link

resolved all threads

resolved all threads
djelouze commented 2020年10月08日 08:56:53 +02:00 (Migrated from gitlab.com)
Copy link

Closing as translation has been manually merged upstream.
Thanks !

Closing as translation has been manually merged upstream. Thanks !

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
toz/MediLog!264
Reference in a new issue
toz/MediLog
No description provided.
Delete branch "add-french-translation"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?