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

revise, correct, supplement german translations #2736

Merged
merged 1 commit into from Dec 21, 2016

Conversation

Projects
None yet
3 participants
@mattharris
Member

mattharris commented Dec 20, 2016

Rework of #2697

@mattharris mattharris referenced this pull request Dec 20, 2016

Closed

last Changes #2697

@mattharris

This comment has been minimized.

Show comment
Hide comment
@mattharris

mattharris Dec 20, 2016

Member

AppVeyor failure:

    [junit] Testcase: testAttributeValueAccess(jmri.jmrit.roster.RosterTest):	Caused an ERROR
    [junit] match key a expected:<2> but was:<3>
    [junit] java.lang.AssertionError: match key a expected:<2> but was:<3>
    [junit] 	at jmri.jmrit.roster.RosterTest.testAttributeValueAccess(RosterTest.java:296)
    [junit] 

Restarted.

Member

mattharris commented Dec 20, 2016

AppVeyor failure:

    [junit] Testcase: testAttributeValueAccess(jmri.jmrit.roster.RosterTest):	Caused an ERROR
    [junit] match key a expected:<2> but was:<3>
    [junit] java.lang.AssertionError: match key a expected:<2> but was:<3>
    [junit] 	at jmri.jmrit.roster.RosterTest.testAttributeValueAccess(RosterTest.java:296)
    [junit] 

Restarted.

@mattharris

This comment has been minimized.

Show comment
Hide comment
@mattharris

mattharris Dec 20, 2016

Member

OSX headful failed:

    [junit] Testcase: testAttributeValueAccess(jmri.jmrit.roster.RosterTest):	Caused an ERROR
    [junit] match key a expected:<2> but was:<3>
    [junit] java.lang.AssertionError: match key a expected:<2> but was:<3>
    [junit] 	at jmri.jmrit.roster.RosterTest.testAttributeValueAccess(RosterTest.java:296)

Restarted.

Member

mattharris commented Dec 20, 2016

OSX headful failed:

    [junit] Testcase: testAttributeValueAccess(jmri.jmrit.roster.RosterTest):	Caused an ERROR
    [junit] match key a expected:<2> but was:<3>
    [junit] java.lang.AssertionError: match key a expected:<2> but was:<3>
    [junit] 	at jmri.jmrit.roster.RosterTest.testAttributeValueAccess(RosterTest.java:296)

Restarted.

@mattharris

This comment has been minimized.

Show comment
Hide comment
@mattharris

mattharris Dec 21, 2016

Member

@Klb4ever Are these consolidated changes OK?

Member

mattharris commented Dec 21, 2016

@Klb4ever Are these consolidated changes OK?

@mattharris mattharris added this to the 4.7.1 milestone Dec 21, 2016

@Klb4ever

This comment has been minimized.

Show comment
Hide comment
@Klb4ever

Klb4ever Dec 21, 2016

Contributor

@mattharris Hey, that looks very good. Thanks for your help.

Contributor

Klb4ever commented Dec 21, 2016

@mattharris Hey, that looks very good. Thanks for your help.

@mattharris mattharris merged commit d394485 into JMRI:master Dec 21, 2016

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@Klb4ever

This comment has been minimized.

Show comment
Hide comment
@Klb4ever

Klb4ever Dec 21, 2016

Contributor

Excuse me when I ask again. Thanks first for the merge of the files. I have seen that the files are now contained in the master of JMRI. Should I now delete my fork and renew it? I ask therefore because in my GitHub Desktop the changes in this fork are still displayed as not merged (see attachment). I have the fear that future changes on my part therefore can not be processed.

screenshot

Contributor

Klb4ever commented Dec 21, 2016

Excuse me when I ask again. Thanks first for the merge of the files. I have seen that the files are now contained in the master of JMRI. Should I now delete my fork and renew it? I ask therefore because in my GitHub Desktop the changes in this fork are still displayed as not merged (see attachment). I have the fear that future changes on my part therefore can not be processed.

screenshot

@mattharris

This comment has been minimized.

Show comment
Hide comment
@mattharris

mattharris Dec 21, 2016

Member

Yes, it will be necessary to reset your local version of master. Exactly how to achieve that in GitHub Desktop I'm not sure as I don't use that tool.

Member

mattharris commented Dec 21, 2016

Yes, it will be necessary to reset your local version of master. Exactly how to achieve that in GitHub Desktop I'm not sure as I don't use that tool.

@silverailscolo

This comment has been minimized.

Show comment
Hide comment
@silverailscolo

silverailscolo Dec 21, 2016

Contributor

Just click on "Update from JMRI/master", the button at top left of the black area in Github Desktop. Your own edits will be preserved, but it could happen that GHD tells you there are "Conflicts" (marked in yellow) that you will have to manually fix, as the application can't choose what's to be kept and what to trash. Conflicts are marked in the code by >>>>>HEAD and similar strings. Make sure none of these are left in the code as that won't work as XML/Java code.

Contributor

silverailscolo commented Dec 21, 2016

Just click on "Update from JMRI/master", the button at top left of the black area in Github Desktop. Your own edits will be preserved, but it could happen that GHD tells you there are "Conflicts" (marked in yellow) that you will have to manually fix, as the application can't choose what's to be kept and what to trash. Conflicts are marked in the code by >>>>>HEAD and similar strings. Make sure none of these are left in the code as that won't work as XML/Java code.

@Klb4ever

This comment has been minimized.

Show comment
Hide comment
@Klb4ever

Klb4ever Dec 21, 2016

Contributor

Thanks for your help @silverailscolo. I see the conflicts but how can I solve that at the best way now?

Contributor

Klb4ever commented Dec 21, 2016

Thanks for your help @silverailscolo. I see the conflicts but how can I solve that at the best way now?

@silverailscolo

This comment has been minimized.

Show comment
Hide comment
@silverailscolo

silverailscolo Dec 22, 2016

Contributor

You will have to open each file with a conflict (right click on the file name marked orange in GHD and choose Show in Finder/Windows Explorer. Then right click and choose Open with...
I use an XML Editor at this point, not the full IDE. Search for >>>>> and fix each block of text.
However you edit and save the files, when you get back to GHD it will let you click Commit (& Sync) (button) these edits into your repo.

Contributor

silverailscolo commented Dec 22, 2016

You will have to open each file with a conflict (right click on the file name marked orange in GHD and choose Show in Finder/Windows Explorer. Then right click and choose Open with...
I use an XML Editor at this point, not the full IDE. Search for >>>>> and fix each block of text.
However you edit and save the files, when you get back to GHD it will let you click Commit (& Sync) (button) these edits into your repo.

@silverailscolo

This comment has been minimized.

Show comment
Hide comment
@silverailscolo

silverailscolo Dec 24, 2016

Contributor

Reading again from the top of this thread, I notice your PR was merged into master. Unless you have been working in this same branch after the merge, you are advised to update your own repo (master) by doing a pull and create a fresh branch from that. Fixing conflicts by hand in your working branch risks undoing some of the work done for you by @mattharris
I would expect clicking Sync will update the picture too.

Contributor

silverailscolo commented Dec 24, 2016

Reading again from the top of this thread, I notice your PR was merged into master. Unless you have been working in this same branch after the merge, you are advised to update your own repo (master) by doing a pull and create a fresh branch from that. Fixing conflicts by hand in your working branch risks undoing some of the work done for you by @mattharris
I would expect clicking Sync will update the picture too.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment