Messages.properties

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
JAL-3490 merged with 2.11.2 develop

  1. … 22 more files in changeset.
Merge branch 'patch/Release_2_11_1_Branch_patch_JAL-3490' into releases/Release_2_11_1_Branch

  1. … 5 more files in changeset.
JAL-3676 More explicit tooltip about resetting log level on Console close. Also clarified code to set initial log level and re-set on close to previously set level.

  1. … 2 more files in changeset.
JAL-3676 More explicit tooltip about resetting log level on Console close. Also clarified code to set initial log level and re-set on close to previously set level.

  1. … 2 more files in changeset.
Merge branch 'merge/JAL-3628+JAL-3608+JAL-3609+JAL-3541+Release_2_11_1_Branch' into releases/Release_2_11_1_Branch

  1. … 2 more files in changeset.
JAL-3633 Memory only proxy auth password storage. Open Preferences->Connection tab when proxy password needed

  1. … 3 more files in changeset.
JAL-3633 Memory only proxy auth password storage. Open Preferences->Connection tab when proxy password needed

  1. … 4 more files in changeset.
JAL-3633 Added Preferences for Proxy Authentication. No jalview_properties yet

  1. … 2 more files in changeset.
JAL-3633 Added Preferences for Proxy Authentication. No jalview_properties yet

  1. … 2 more files in changeset.
JAL-3633 label.proxy_server -> label.proxy_servers

  1. … 2 more files in changeset.
JAL-3633 label.proxy_server -> label.proxy_servers

  1. … 2 more files in changeset.
JAL-3692 EMBL flatfile fetcher / parser (todo: CDS dbrefs and mappings)

  1. … 11 more files in changeset.
JAL-3692 EMBL flatfile fetcher / parser (todo: CDS dbrefs and mappings) Conflicts: src/jalview/ws/dbsources/EmblXmlSource.java src/jalview/ws/ebi/EBIFetchClient.java

  1. … 11 more files in changeset.
JAL-3633 Remember system set proxy properties. Add options in Preferences for No proxy, system proxy, or custom proxy servers.

  1. … 4 more files in changeset.
JAL-3633 Remember system set proxy properties. Add options in Preferences for No proxy, system proxy, or custom proxy servers.

  1. … 4 more files in changeset.
JAL-3685 Fixed single quotes in formatMessage messages

JAL-3628 Fixed oddly worded and non-formatted error popups when saving fails

  1. … 3 more files in changeset.
JAL-3628 Fixed oddly worded and non-formatted error popups when saving fails

  1. … 4 more files in changeset.
JAL-3311 JAL-3141 JAL-3144 tidying obsolete message bundle entries

  1. … 6 more files in changeset.
JAL-3676 Added Log Level ComboBox and Copy to Clipboard button in Java Console

  1. … 2 more files in changeset.
JAL-3676 Added Log Level ComboBox and Copy to Clipboard button in Java Console

  1. … 3 more files in changeset.
Merge branch 'bug/JAL-3490findSpanHiddenGaps' into patch/Release_2_11_1_Branch_patch_JAL-3490

Conflicts:

resources/lang/Messages.properties

resources/lang/Messages_es.properties

  1. … 5 more files in changeset.
Merge branch 'develop' into feature/JAL-3390hideUnmappedStructure

Conflicts:

gradle.properties

resources/lang/Messages.properties

resources/lang/Messages_es.properties

src/jalview/api/structures/JalviewStructureDisplayI.java

src/jalview/appletgui/AppletJmol.java

src/jalview/ext/jmol/JalviewJmolBinding.java

src/jalview/ext/jmol/JmolCommands.java

src/jalview/ext/rbvi/chimera/AtomSpecModel.java

src/jalview/ext/rbvi/chimera/ChimeraCommands.java

src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java

src/jalview/gui/AlignFrame.java

src/jalview/gui/AlignmentPanel.java

src/jalview/gui/AppJmol.java

src/jalview/gui/ChimeraViewFrame.java

src/jalview/gui/JalviewChimeraBindingModel.java

src/jalview/gui/StructureViewerBase.java

src/jalview/structures/models/AAStructureBindingModel.java

test/jalview/ext/jmol/JmolCommandsTest.java

test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java

test/jalview/structures/models/AAStructureBindingModelTest.java

  1. … 23 more files in changeset.
JAL-3551 copy Jalview features to Pymol 'p' (with pull refactoring)

  1. … 20 more files in changeset.
Merge branch 'develop' into feature/JAL-3551Pymol

Conflicts:

src/jalview/ext/jmol/JalviewJmolBinding.java

src/jalview/ext/jmol/JmolCommands.java

src/jalview/gui/AppJmol.java

src/jalview/gui/AppJmolBinding.java

src/jalview/gui/ChimeraViewFrame.java

src/jalview/gui/StructureViewerBase.java

src/jalview/jbgui/GPreferences.java

src/jalview/jbgui/GStructureViewer.java

src/jalview/project/Jalview2XML.java

  1. … 19 more files in changeset.
Merge branch 'alpha/JAL-3362_Jalview_212_alpha' into alpha/merge_212_JalviewJS_2112

resolved conflicts and adapted to some upstream changes. no detailed functional testing as yet (see next commit :) )

Conflicts:

resources/lang/Messages.properties

resources/lang/Messages_es.properties

src/jalview/api/AlignViewportI.java

src/jalview/bin/Jalview.java

src/jalview/datamodel/Sequence.java

src/jalview/datamodel/SequenceI.java

src/jalview/gui/AlignFrame.java

src/jalview/gui/JvSwingUtils.java

src/jalview/gui/OverviewPanel.java

src/jalview/gui/PopupMenu.java

src/jalview/gui/SplitFrame.java

src/jalview/gui/WsJobParameters.java

src/jalview/io/AlignmentFileReaderI.java

src/jalview/io/FileLoader.java

src/jalview/io/StockholmFile.java

src/jalview/jbgui/GAlignFrame.java

src/jalview/jbgui/GPreferences.java

src/jalview/renderer/AnnotationRenderer.java

src/jalview/viewmodel/AlignmentViewport.java

src/jalview/ws/jws2/Jws2Discoverer.java

test/jalview/analysis/AAFrequencyTest.java

test/jalview/gui/AlignFrameTest.java

test/jalview/gui/AlignViewportTest.java

  1. … 74 more files in changeset.
JAL-3551 pull up Close Viewer dialog to base class

  1. … 11 more files in changeset.
JAL-2422 JAL-3551 viewer text/variables generalised, Pymol paths added

  1. … 8 more files in changeset.
Merge branch 'develop' into alpha/JAL-3362_Jalview_212_alpha update for 2.11.1 release

  1. … 42 more files in changeset.
Merge branch 'develop' into Jalview-JS/develop

Conflicts:

.gitignore

build.gradle

gradle.properties

src/jalview/gui/AlignFrame.java

src/jalview/gui/Desktop.java

src/jalview/gui/FeatureSettings.java

src/jalview/gui/JvSwingUtils.java

src/jalview/util/MessageManager.java

test/jalview/gui/AlignmentPanelTest.java

test/jalview/gui/JvSwingUtilsTest.java

test/jalview/gui/PopupMenuTest.java

utils/eclipse/org.eclipse.jdt.core.jalview.prefs

  1. … 33 more files in changeset.