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

Jump to bottom

"-M" option added: do not print "mounted on" + translations update #4

Closed
wants to merge 15 commits into from
Closed

"-M" option added: do not print "mounted on" + translations update #4

wants to merge 15 commits into from

Conversation

MichielPater
Copy link
Contributor

No description provided.

z0qgit and others added 14 commits April 15, 2016 00:18
@z0qgit
Fixed small typos
fe9dc18
@z0qgit
Added Michiel Pater as contributor and Dutch translator
13dfcf1
@z0qgit
- Dutch man page
1d141af 
- Minor typo fixed in English man page
@MichielPater
- Dutch man page
6371a2b 
- Minor typo fixed in English man page

- Added Michiel Pater as contributor and Dutch translator

- Fixed small typos in English translations
@MichielPater
Merge branch 'master' of https://github.com/MichielPater/dfc
1cfb545
@MichielPater
Dutch translation for Configuration file
5222482
@MichielPater
Added Dutch translation .po file
5edec7d
@MichielPater
Added "nl" to LINGUAS
83dc2de
@MichielPater
Added "ADDING THE TRANSLATION"
e631ea3
@MichielPater
Updated CSV separator for Dutch Translation (temporarily changed to a…
315cde5 
… colon : to avoid conflicts with decimal separator)
@MichielPater
Minor Dutch translation spacing fixes
9f0317c
@MichielPater
- "-M" option added: do not print "mounted on"
d04dc36 
- Dutch translation updated
@MichielPater
French Translation update
12fdc5e
@MichielPater
French Translation Update
af8b244
@rolinh
Copy link
Owner

rolinh commented Apr 18, 2016

Hi @MichielPater,

Thanks for your contribution!
It seems however, that you should have created a new branch on your fork for this feature and that you should keep it in sync with my master branch. There are other commits related to your previous PR in there.

@MichielPater
Merge branch 'master' of http://www.github.com/Rolinh/dfc
cecb766 
# Conflicts:
#	man/nl/dfc.1
#	po/nl.po
@MichielPater
Copy link
Contributor Author

Hi,

Thanks for you explanation. I created a new Pull Request which hopefully is
correct.

Michiel

2016-04-18 8:14 GMT+02:00 Robin Hahling notifications@github.com:

Hi @MichielPater https://github.com/MichielPater,

Thanks for your contribution!
It seems however, that you should have created a new branch on your fork
for this feature and that you should keep it in sync with my master branch.
There are other commits related to your previous PR in there.

—
You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#4 (comment)

Sincerely,

Michiel Pater
Lead Developer
mpater@tradosoft.com

Tradosoft
Husselmansgoed 23
3863 BV Nijkerk (Gld)
The Netherlands
+316 27 47 15 86
http://www.tradosoft.com/

@rolinh
Copy link
Owner

rolinh commented Apr 18, 2016

Replaced by #5

@rolinh rolinh closed this Apr 18, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MichielPater @rolinh @z0qgit