From: Randall W. <ran...@al...> - 2016-01-30 19:13:22
|
Branch: refs/heads/master Home: https://github.com/JMRI/JMRI Commit: ce3ed9ebabbcac7bff5235cbdfb44a03631b1c45 https://github.com/JMRI/JMRI/commit/ce3ed9ebabbcac7bff5235cbdfb44a03631b1c45 Author: Egbert Broerse <dc...@eb...> Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M help/en/package/jmri/jmrit/operations/Operations.shtml M java/src/jmri/jmrit/display/PositionableLabel.java M java/src/jmri/jmrit/operations/automation/AutomationItem.java M java/src/jmri/jmrit/operations/automation/AutomationTableModel.java M java/src/jmri/jmrit/operations/automation/JmritOperationsAutomationBundle.properties M java/src/jmri/jmrit/operations/automation/actions/Action.java M java/src/jmri/jmrit/operations/automation/actions/ActionCodes.java M java/src/jmri/jmrit/operations/automation/actions/BuildTrainAction.java M java/src/jmri/jmrit/operations/automation/actions/BuildTrainIfSelectedAction.java A java/src/jmri/jmrit/operations/automation/actions/MessageYesNoAction.java M java/src/jmri/jmrit/operations/automation/actions/MoveTrainAction.java A java/src/jmri/jmrit/operations/automation/actions/PrintSwitchListAction.java M java/src/jmri/jmrit/operations/automation/actions/ResetTrainAction.java M java/src/jmri/jmrit/operations/automation/actions/RunTrainAction.java M java/src/jmri/jmrit/operations/automation/actions/TerminateTrainAction.java M java/src/jmri/jmrit/operations/automation/actions/UpdateSwitchListAction.java M java/src/jmri/jmrit/operations/automation/actions/WaitTrainAction.java M java/src/jmri/jmrit/operations/automation/actions/WaitTrainTerminatedAction.java M java/src/jmri/jmrit/operations/trains/Train.java Log Message: ----------- Merge remote-tracking branch 'JMRI/master' into eb-help-img Commit: a616892f6abcb07fb78ac9d505e6f65005e3fea8 https://github.com/JMRI/JMRI/commit/a616892f6abcb07fb78ac9d505e6f65005e3fea8 Author: Egbert Broerse <dc...@eb...> Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M java/src/apps/ActionListBundle_da.properties M java/src/apps/ActionListBundle_de.properties M java/src/apps/AppsBundle_da.properties M java/src/apps/AppsBundle_de.properties M java/src/apps/AppsConfigBundle_de.properties M java/src/jmri/implementation/ImplementationBundle.properties M java/src/jmri/implementation/ImplementationBundle_da.properties M java/src/jmri/implementation/ImplementationBundle_de.properties M java/src/jmri/implementation/ImplementationBundle_fr.properties M java/src/jmri/jmris/JmriServerBundle_de.properties M java/src/jmri/jmris/json/Bundle.properties M java/src/jmri/jmris/json/Bundle_de.properties M java/src/jmri/jmrit/Bundle_de.properties M java/src/jmri/jmrit/audio/swing/AudioTableBundle_de.properties M java/src/jmri/jmrit/beantable/LRouteTableBundle_de.properties M java/src/jmri/jmrit/beantable/LRouteTableBundle_fr.properties M java/src/jmri/jmrit/beantable/beanedit/BeanEditBundle.properties M java/src/jmri/jmrit/beantable/beanedit/BeanEditBundle_ca.properties M java/src/jmri/jmrit/beantable/beanedit/BeanEditBundle_da.properties M java/src/jmri/jmrit/beantable/beanedit/BeanEditBundle_de.properties M java/src/jmri/jmrit/beantable/beanedit/BeanEditBundle_fr.properties M java/src/jmri/jmrit/display/controlPanelEditor/ControlPanelBundle_de.properties M java/src/jmri/jmrit/signalling/EntryExitBundle_de.properties M java/src/jmri/jmrit/simplelightctrl/SimpleLightCtrlBundle_de.properties M java/src/jmri/jmrit/symbolicprog/SymbolicProgBundle_de.properties M java/src/jmri/jmrit/throttle/ThrottleBundle_de.properties M java/src/jmri/jmrit/ussctc/UssCtcBundle_de.properties M java/src/jmri/jmrit/vsdecoder/swing/VSDSwingBundle.properties M java/src/jmri/jmrit/vsdecoder/swing/VSDSwingBundle_da.properties M java/src/jmri/jmrit/vsdecoder/swing/VSDSwingBundle_de.properties M java/src/jmri/jmrit/withrottle/WiThrottleBundle_de.properties Log Message: ----------- More German translations Fix in dansk keywords Commit: 02de9d67e586196a1e128a21b68efa445aaed477 https://github.com/JMRI/JMRI/commit/02de9d67e586196a1e128a21b68efa445aaed477 Author: Egbert Broerse <dc...@eb...> Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: A java/src/jmri/jmrix/rfid/generic/standalone/configurexml/COPYING A java/src/jmri/jmrix/rfid/generic/standalone/configurexml/StandaloneReporterManagerXml.java A java/src/jmri/jmrix/rfid/generic/standalone/configurexml/StandaloneSensorManagerXml.java A java/src/jmri/jmrix/rfid/merg/concentrator/configurexml/COPYING A java/src/jmri/jmrix/rfid/merg/concentrator/configurexml/ConcentratorReporterManagerXml.java A java/src/jmri/jmrix/rfid/merg/concentrator/configurexml/ConcentratorSensorManagerXml.java M java/test/jmri/jmrix/rfid/PackageTest.java A java/test/jmri/jmrix/rfid/RfidReporterTest.java A java/test/jmri/jmrix/rfid/RfidSensorTest.java Log Message: ----------- Merge remote-tracking branch 'JMRI/master' into eb-help-img Commit: 480d0546a17675f7a1f021f8f9a56cc82ba5e7bb https://github.com/JMRI/JMRI/commit/480d0546a17675f7a1f021f8f9a56cc82ba5e7bb Author: Egbert Broerse <dc...@eb...> Date: 2016-01-28 (Thu, 28 Jan 2016) Changed paths: M help/en/html/doc/Technical/GitFAQ.shtml M help/en/html/doc/Technical/getgitcode.shtml A help/en/html/doc/Technical/images/GhDtCloneDialog.png A help/en/html/doc/Technical/images/GhDtSyncSetting.png A help/en/html/doc/Technical/images/GhNewRepoCloneMsg.png A help/en/html/doc/Technical/images/GitDtPrefsAdvanced.png A help/en/html/doc/Technical/images/GitDtRepoSetIngnore.png A help/en/html/doc/Technical/images/GitDtRepoSettingsMenu.png M help/en/html/doc/Technical/images/GitHubCloneDeskop.png Log Message: ----------- Update Github Desktop help Add new website image for clone Add GHDt images and Repo menu Commit: efbb4c96a2f796b8e9cbcf3516b2d7edcc54d2ee https://github.com/JMRI/JMRI/commit/efbb4c96a2f796b8e9cbcf3516b2d7edcc54d2ee Author: Egbert Broerse <dc...@eb...> Date: 2016-01-29 (Fri, 29 Jan 2016) Changed paths: M java/src/META-INF/services/apps.startup.StartupModelFactory A java/src/apps/startup/AbstractStartupModel.java M java/src/apps/startup/Bundle.properties A java/src/apps/startup/TriggerRouteModel.java A java/src/apps/startup/TriggerRouteModelFactory.java A java/src/apps/startup/configurexml/TriggerRouteModelXml.java M java/src/jmri/jmrix/dccpp/DCCppNetworkPortController.java A resources/icons/smallschematics/aspects/NW-1981/NW-SL-1-high-absolute/rule-281.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-1-high-absolute/rule-285.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-1-high-absolute/rule-292.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-1-high-permissive/rule-281.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-1-high-permissive/rule-285.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-1-high-permissive/rule-291.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-1-low-absolute/index.php A resources/icons/smallschematics/aspects/NW-1981/NW-SL-1-low-absolute/rule-287.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-1-low-absolute/rule-288.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-1-low-absolute/rule-290.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-1-low-absolute/rule-292.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-1-low-permissive/index.php A resources/icons/smallschematics/aspects/NW-1981/NW-SL-1-low-permissive/rule-281.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-1-low-permissive/rule-285.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-1-low-permissive/rule-291.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-high-absolute/rule-281.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-high-absolute/rule-282-A.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-high-absolute/rule-282.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-high-absolute/rule-283.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-high-absolute/rule-285.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-high-absolute/rule-290.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-high-absolute/rule-292.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-high-permissive/rule-281.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-high-permissive/rule-282-A.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-high-permissive/rule-282.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-high-permissive/rule-285.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-high-permissive/rule-291.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-low-absolute/rule-281.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-low-absolute/rule-282-A.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-low-absolute/rule-282.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-low-absolute/rule-283.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-low-absolute/rule-288.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-low-absolute/rule-290.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-2-low-absolute/rule-292.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-3-high-absolute/rule-281.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-3-high-absolute/rule-282-A.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-3-high-absolute/rule-282.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-3-high-absolute/rule-282A.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-3-high-absolute/rule-283-B.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-3-high-absolute/rule-283.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-3-high-absolute/rule-283B.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-3-high-absolute/rule-285.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-3-high-absolute/rule-286.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-3-high-absolute/rule-287.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-3-high-absolute/rule-290.gif A resources/icons/smallschematics/aspects/NW-1981/NW-SL-3-high-absolute/rule-292.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-high-absolute/rule-281.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-high-absolute/rule-282-A.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-high-absolute/rule-282.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-high-absolute/rule-283-B.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-high-absolute/rule-283.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-high-absolute/rule-285.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-high-absolute/rule-286.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-high-absolute/rule-290.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-high-absolute/rule-292.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-low-absolute/index.php A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-low-absolute/rule-281.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-low-absolute/rule-282-A.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-low-absolute/rule-282.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-low-absolute/rule-283-B.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-low-absolute/rule-283.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-low-absolute/rule-286.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-low-absolute/rule-288.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-low-absolute/rule-290.gif A resources/icons/smallschematics/aspects/NW-1981/Wab-SL-2-low-absolute/rule-292.gif M scripts/WinInstallFiles/LaunchJMRI.exe M scripts/WinInstallFiles/LaunchJMRI.nsi M xml/signals/NW-1981/appearance-CPL-1-arm-absolute.xml M xml/signals/NW-1981/appearance-CPL-1-arm-permissive.xml M xml/signals/NW-1981/appearance-CPL-2-arm-absolute.xml M xml/signals/NW-1981/appearance-CPL-2-arm-permissive.xml M xml/signals/NW-1981/appearance-CPL-Dwarf-absolute.xml M xml/signals/NW-1981/appearance-CPL-Dwarf-permissive.xml A xml/signals/NW-1981/appearance-SL-1-high-absolute.xml A xml/signals/NW-1981/appearance-SL-1-high-permissive.xml A xml/signals/NW-1981/appearance-SL-1-low-absolute.xml A xml/signals/NW-1981/appearance-SL-1-low-permissive.xml A xml/signals/NW-1981/appearance-SL-2-high-absolute.xml A xml/signals/NW-1981/appearance-SL-2-high-permissive.xml A xml/signals/NW-1981/appearance-SL-2-low-absolute.xml A xml/signals/NW-1981/appearance-SL-3-high-absolute.xml A xml/signals/NW-1981/appearance-Wab-2-high-absolute.xml A xml/signals/NW-1981/appearance-Wab-2-low-absolute.xml M xml/signals/NW-1981/aspects.xml M xml/signals/NW-1981/index.shtml Log Message: ----------- Merge remote-tracking branch 'JMRI/master' into eb-help-img Commit: d269afe505664a3de5d9b1643c5b4179d16c569a https://github.com/JMRI/JMRI/commit/d269afe505664a3de5d9b1643c5b4179d16c569a Author: Egbert Broerse <dc...@eb...> Date: 2016-01-29 (Fri, 29 Jan 2016) Changed paths: M help/en/html/doc/Technical/GitFAQ.shtml M help/en/html/setup/Faq.shtml M help/en/html/tools/IdTags.shtml M help/en/package/jmri/jmrit/beantable/IdTagAddEdit.shtml M help/en/package/jmri/jmrit/beantable/IdTagTable.shtml Log Message: ----------- Style ID Tag help Copy FAQ style to Setup FAQ Small edits in Git FAQ w/larger images Indent OL Commit: 4d972a17151d81b2c25d03144c74a633563c99b9 https://github.com/JMRI/JMRI/commit/4d972a17151d81b2c25d03144c74a633563c99b9 Author: Egbert Broerse <dc...@eb...> Date: 2016-01-30 (Sat, 30 Jan 2016) Changed paths: M help/en/html/doc/Technical/GitFAQ.shtml A help/en/html/doc/Technical/images/EspressoPrefsLF.png M help/en/html/doc/Technical/images/GhDtCloneDialog.png A help/en/html/doc/Technical/images/GhDtConfictmark.png A help/en/html/doc/Technical/images/GhDtConflictFixed.png A help/en/html/doc/Technical/images/GhDtConflictNote.png A help/en/html/doc/Technical/images/GhDtDeleteBranch.png A help/en/html/doc/Technical/images/GhDtNewBranch.png A help/en/html/doc/Technical/images/GhDtPRCreate.png A help/en/html/doc/Technical/images/GhDtPRCreated.png A help/en/html/doc/Technical/images/GhDtRepoSetting.png A help/en/html/doc/Technical/images/GhDtUpdateFrom.png A help/en/html/doc/Technical/images/GhDtWindow.png A help/en/html/doc/Technical/images/GhDtWindowSeeCommit.png R help/en/html/doc/Technical/images/GitDtPrefsAdvanced.png R help/en/html/doc/Technical/images/GitDtRepoSetIngnore.png R help/en/html/doc/Technical/images/GitDtRepoSettingsMenu.png Log Message: ----------- Add GithubDesktop FAQ Add screen images (OS X) Set spelling of GIT to Git Decided to describe GhDt in the same FAQ as git command line, not as a separate thing. Commit: aed99d5d86cb38bb0814a1503a381aaa60597477 https://github.com/JMRI/JMRI/commit/aed99d5d86cb38bb0814a1503a381aaa60597477 Author: Egbert Broerse <dc...@eb...> Date: 2016-01-30 (Sat, 30 Jan 2016) Changed paths: M java/src/jmri/implementation/ImplementationBundle.properties M java/src/jmri/jmrit/decoderdefn/DecoderFile_de.properties M java/src/jmri/jmrit/dispatcher/DispatcherBundle_de.properties M java/src/jmri/jmrit/dispatcher/DispatcherBundle_fr.properties M java/src/jmri/jmrit/roster/swing/Bundle_de.properties Log Message: ----------- Small fix in _de and _fr Commit: c4c01a7d5853a8cd75e55725c61aee114bdaa35a https://github.com/JMRI/JMRI/commit/c4c01a7d5853a8cd75e55725c61aee114bdaa35a Author: Randall Wood <ran...@al...> Date: 2016-01-30 (Sat, 30 Jan 2016) Changed paths: M help/en/html/doc/Technical/GitFAQ.shtml M help/en/html/doc/Technical/getgitcode.shtml A help/en/html/doc/Technical/images/EspressoPrefsLF.png A help/en/html/doc/Technical/images/GhDtCloneDialog.png A help/en/html/doc/Technical/images/GhDtConfictmark.png A help/en/html/doc/Technical/images/GhDtConflictFixed.png A help/en/html/doc/Technical/images/GhDtConflictNote.png A help/en/html/doc/Technical/images/GhDtDeleteBranch.png A help/en/html/doc/Technical/images/GhDtNewBranch.png A help/en/html/doc/Technical/images/GhDtPRCreate.png A help/en/html/doc/Technical/images/GhDtPRCreated.png A help/en/html/doc/Technical/images/GhDtRepoSetting.png A help/en/html/doc/Technical/images/GhDtSyncSetting.png A help/en/html/doc/Technical/images/GhDtUpdateFrom.png A help/en/html/doc/Technical/images/GhDtWindow.png A help/en/html/doc/Technical/images/GhDtWindowSeeCommit.png A help/en/html/doc/Technical/images/GhNewRepoCloneMsg.png M help/en/html/doc/Technical/images/GitHubCloneDeskop.png M help/en/html/setup/Faq.shtml M help/en/html/tools/IdTags.shtml M help/en/package/jmri/jmrit/beantable/IdTagAddEdit.shtml M help/en/package/jmri/jmrit/beantable/IdTagTable.shtml M java/src/apps/ActionListBundle_da.properties M java/src/apps/ActionListBundle_de.properties M java/src/apps/AppsBundle_da.properties M java/src/apps/AppsBundle_de.properties M java/src/apps/AppsConfigBundle_de.properties M java/src/jmri/implementation/ImplementationBundle.properties M java/src/jmri/implementation/ImplementationBundle_da.properties M java/src/jmri/implementation/ImplementationBundle_de.properties M java/src/jmri/implementation/ImplementationBundle_fr.properties M java/src/jmri/jmris/JmriServerBundle_de.properties M java/src/jmri/jmris/json/Bundle.properties M java/src/jmri/jmris/json/Bundle_de.properties M java/src/jmri/jmrit/Bundle_de.properties M java/src/jmri/jmrit/audio/swing/AudioTableBundle_de.properties M java/src/jmri/jmrit/beantable/LRouteTableBundle_de.properties M java/src/jmri/jmrit/beantable/LRouteTableBundle_fr.properties M java/src/jmri/jmrit/beantable/beanedit/BeanEditBundle.properties M java/src/jmri/jmrit/beantable/beanedit/BeanEditBundle_ca.properties M java/src/jmri/jmrit/beantable/beanedit/BeanEditBundle_da.properties M java/src/jmri/jmrit/beantable/beanedit/BeanEditBundle_de.properties M java/src/jmri/jmrit/beantable/beanedit/BeanEditBundle_fr.properties M java/src/jmri/jmrit/decoderdefn/DecoderFile_de.properties M java/src/jmri/jmrit/dispatcher/DispatcherBundle_de.properties M java/src/jmri/jmrit/dispatcher/DispatcherBundle_fr.properties M java/src/jmri/jmrit/display/controlPanelEditor/ControlPanelBundle_de.properties M java/src/jmri/jmrit/roster/swing/Bundle_de.properties M java/src/jmri/jmrit/signalling/EntryExitBundle_de.properties M java/src/jmri/jmrit/simplelightctrl/SimpleLightCtrlBundle_de.properties M java/src/jmri/jmrit/symbolicprog/SymbolicProgBundle_de.properties M java/src/jmri/jmrit/throttle/ThrottleBundle_de.properties M java/src/jmri/jmrit/ussctc/UssCtcBundle_de.properties M java/src/jmri/jmrit/vsdecoder/swing/VSDSwingBundle.properties M java/src/jmri/jmrit/vsdecoder/swing/VSDSwingBundle_da.properties M java/src/jmri/jmrit/vsdecoder/swing/VSDSwingBundle_de.properties M java/src/jmri/jmrit/withrottle/WiThrottleBundle_de.properties Log Message: ----------- Merge pull request #737 from silverailscolo/eb-help-img GitDesktop help and German props Compare: https://github.com/JMRI/JMRI/compare/ab388e5a0a14...c4c01a7d5853 |