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

Ops _de translation #2015

Merged
merged 22 commits into from Oct 10, 2016
Merged

Ops _de translation #2015

merged 22 commits into from Oct 10, 2016

Conversation

silverailscolo
Copy link
Contributor

Automation and part of Location

@bobjacobsen
Copy link
Member

Both types of CI test failed with:

[junit] Testcase: testSidingEditFrame(jmri.jmrit.operations.locations.SidingEditFrameTest): Caused an ERROR
[junit] null
[junit] java.lang.AssertionError
[junit]     at jmri.jmrit.operations.locations.SidingEditFrameTest.testSidingEditFrame(SidingEditFrameTest.java:73)
[junit]     at junit.extensions.jfcunit.JFCTestCase$5.run(JFCTestCase.java:580)
[junit]     at junit.extensions.jfcunit.JFCTestCase$3.run(JFCTestCase.java:478)
[junit]     at java.lang.Thread.run(Thread.java:745)

Since they're both the same, it's not likely to be a transient error. Restarted in case it was an issue with master.

@silverailscolo
Copy link
Contributor Author

silverailscolo commented Oct 3, 2016 •
edited

Thanks, fixed Assert test string

@silverailscolo
Copy link
Contributor Author

Commit 8fb75d3 completes operations.routes German translation

silverailscolo
silverailscolo commented Oct 6, 2016
View reviewed changes
java/src/jmri/jmrit/operations/rollingstock/cars/JmritOperationsCarsBundle_de.properties
# Export Cars
ExportedCarsToFile=Exportiere {0} Wagen nach Datei: {1}

carColors=Schwartz,Blau,Braun,Grau,Gelb,Gr\u00fcn,Orange,Violett,Rot,Silber,Tuskanrot,Wei\u00df
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@DanielBoudreau this translation is not picked up in the interface drop down list, nor is Loads/Empties (L/E). Does that mean it's useless to add them, or could we try to make this work?

@silverailscolo
Copy link
Contributor Author

silverailscolo commented Oct 9, 2016 •
edited

Ready for merge in upcoming test release.

@bobjacobsen bobjacobsen merged commit ba5da3e into JMRI:master Oct 10, 2016
@bobjacobsen bobjacobsen added this to the 4.5.5 milestone Oct 10, 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
4.5.5
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@silverailscolo @bobjacobsen