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

Minor improvements to French translation #63

Closed
wants to merge 4 commits into from

Conversation

alexandreleroux
Copy link
Contributor

No description provided.

Copy link
Owner

@newmarcel newmarcel left a comment

Choose a reason for hiding this comment

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

There are two small formatting issues, but overall I am ok with these changes despite my limited knowledge of French 😉

@@ -32,4 +32,3 @@ Click droit pour le menu";

/* Version */
"Version" = "Version";

Copy link
Owner

Choose a reason for hiding this comment

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

I personally prefer having a empty line at the end of source and .strings files.

@@ -72,4 +72,3 @@

/* Class = "NSTextFieldCell"; title = "Automatically opens the app when you start your Mac."; ObjectID = "x6s-XD-lBU"; */
"x6s-XD-lBU.title" = "Lance KeepingYouAwake au démarrage du Mac.";

Copy link
Owner

Choose a reason for hiding this comment

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

Please keep the empty line at the end of the file.

@alexandreleroux
Copy link
Contributor Author

Hi @newmarcel , added the missing empty line. Hope this is what you are looking for. (sorry if I did it wrong, first time I modify a merge request) Take care -- Alex

Copy link
Owner

@newmarcel newmarcel left a comment

Choose a reason for hiding this comment

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

Thanks for updating this. Approved 👍

Can you resolve the merge conflict? I will merge this afterwards.

@alexandreleroux
Copy link
Contributor Author

@newmarcel I can't resolve the conflict myself unless you give me write access to the repository. The warning message I get is:

This branch has conflicts that must be resolved
Only those with write access to this repository can merge pull requests.

Our options, as far as I know, are (A) you resolve the conflict or (B) you grant me write access. Thx :-) -- Alex

@newmarcel
Copy link
Owner

OK, no problem, I will pull your commits directly into master and resolve the conflicts 😄

@newmarcel
Copy link
Owner

I've integrated both commits into master.

@newmarcel newmarcel closed this Jan 7, 2017
newmarcel added a commit that referenced this pull request Jan 7, 2017
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.

2 participants