From: gmungoc Date: Thu, 30 Mar 2017 11:20:53 +0000 (+0100) Subject: Merge branch 'develop' into bug/JAL-2399textColour X-Git-Tag: Release_2_10_3b1~336^2~2^2~1^2~2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9eabd6dffd6d19b2826b887a5def80351b9bceed;hp=-c;p=jalview.git Merge branch 'develop' into bug/JAL-2399textColour --- 9eabd6dffd6d19b2826b887a5def80351b9bceed diff --combined resources/lang/Messages.properties index 8c3c84f,d6d3034..7db822c --- a/resources/lang/Messages.properties +++ b/resources/lang/Messages.properties @@@ -138,7 -138,8 +138,8 @@@ action.view_flanking_regions = Show fla label.view_flanking_regions = Show sequence data either side of the subsequences involved in this alignment label.structures_manager = Structures Manager label.nickname = Nickname: - label.url = URL: + label.url = URL + label.url\: = URL: label.input_file_url = Enter URL or Input File label.select_feature = Select feature label.name = Name @@@ -413,7 -414,6 +414,6 @@@ label.couldnt_import_as_vamsas_session label.vamsas_document_import_failed = Vamsas Document Import Failed label.couldnt_locate = Couldn't locate {0} label.url_not_found = URL not found - label.no_link_selected = No link selected label.new_sequence_url_link = New sequence URL link label.cannot_edit_annotations_in_wrapped_view = Cannot edit annotations in wrapped view label.wrapped_view_no_edit = Wrapped view - no edit @@@ -515,7 -515,7 +515,7 @@@ label.retrieve_parse_sequence_database_ label.standard_databases = Standard Databases label.fetch_embl_uniprot = Fetch from EMBL/EMBLCDS or Uniprot/PDB and any selected DAS sources label.reset_min_max_colours_to_defaults = Reset min and max colours to defaults from user preferences. - label.align_structures_using_linked_alignment_views = Align structures using {0} linked alignment views + label.align_structures_using_linked_alignment_views = Superpose structures using {0} selected alignment view(s) label.connect_to_session = Connect to session {0} label.threshold_feature_display_by_score = Threshold the feature display by score. label.threshold_feature_no_threshold = No Threshold @@@ -620,6 -620,8 +620,8 @@@ label.web_services = Web Service label.right_click_to_edit_currently_selected_parameter = Right click to edit currently selected parameter. label.let_jmol_manage_structure_colours = Let Jmol manage structure colours label.let_chimera_manage_structure_colours = Let Chimera manage structure colours + label.fetch_chimera_attributes = Fetch Chimera attributes + label.fetch_chimera_attributes_tip = Copy Chimera attribute to Jalview feature label.marks_leaves_tree_not_associated_with_sequence = Marks leaves of tree not associated with a sequence label.index_web_services_menu_by_host_site = Index web services in menu by the host site label.option_want_informed_web_service_URL_cannot_be_accessed_jalview_when_starts_up = Check this option if you want to be informed
when a web service URL cannot be accessed by Jalview
when it starts up @@@ -667,7 -669,8 +669,7 @@@ label.2d_rna_sequence_name = 2D RNA - { label.edit_name_and_description_current_group = Edit name and description of current group label.from_file = From File label.enter_pdb_id = Enter PDB Id (or pdbid:chaincode) -label.text_colour = Text Colour -action.set_text_colour = Text Colour... +label.text_colour = Text Colour... label.structure = Structure label.show_pdbstruct_dialog = 3D Structure Data... label.view_rna_structure = VARNA 2D Structure @@@ -712,15 -715,21 +714,21 @@@ label.link_name = Link Nam label.pdb_file = PDB file label.colour_with_jmol = Colour with Jmol label.colour_with_chimera = Colour with Chimera - label.align_structures = Align Structures + label.superpose_structures = Superpose Structures + error.superposition_failed = Superposition failed: {0} + label.insufficient_residues = Not enough aligned residues ({0}) to perform superposition label.jmol = Jmol label.chimera = Chimera + label.create_chimera_attributes = Write Jalview features + label.create_chimera_attributes_tip = Set Chimera residue attributes for visible features + label.attributes_set = {0} attribute values set on Chimera label.sort_alignment_by_tree = Sort Alignment By Tree label.mark_unlinked_leaves = Mark Unlinked Leaves label.associate_leaves_with = Associate Leaves With label.save_colour_scheme_with_unique_name_added_to_colour_menu = Save your colour scheme with a unique name and it will be added to the Colour menu label.case_sensitive = Case Sensitive - label.lower_case_colour = Lower Case Colour + label.lower_case_colour = Colour All Lower Case + label.lower_case_tip = Chosen colour applies to all lower case symbols label.index_by_host = Index by Host label.index_by_type = Index by Type label.enable_jabaws_services = Enable JABAWS Services @@@ -1269,4 -1278,21 +1277,21 @@@ label.SEQUENCE_ID_no_longer_used = $SEQ label.SEQUENCE_ID_for_DB_ACCESSION1 = Please review your URL links in the 'Connections' tab of the Preferences window: label.SEQUENCE_ID_for_DB_ACCESSION2 = URL links using '$SEQUENCE_ID$' for DB accessions now use '$DB_ACCESSION$'. label.do_not_display_again = Do not display this message again + exception.url_cannot_have_miriam_id = {0} is a MIRIAM id and cannot be used as a custom url name + exception.url_cannot_have_duplicate_id = {0} cannot be used as a label for more than one line + label.filter = Filter text: + action.customfilter = Custom only + action.showall = Show All + label.insert = Insert: + action.seq_id = $SEQUENCE_ID$ + action.db_acc = $DB_ACCESSION$ + label.primary = Double Click + label.inmenu = In Menu + label.id = ID + label.database = Database + label.urltooltip = Only one url, which must use a sequence id, can be selected for the 'On Click' option + label.edit_sequence_url_link = Edit sequence URL link + warn.name_cannot_be_duplicate = User-defined URL names must be unique and cannot be MIRIAM ids + label.invalid_name = Invalid Name ! label.output_seq_details = Output Sequence Details to list all database references + label.urllinks = Links diff --combined resources/lang/Messages_es.properties index 64a3654,6b8761e..2e405c8 --- a/resources/lang/Messages_es.properties +++ b/resources/lang/Messages_es.properties @@@ -135,7 -135,8 +135,8 @@@ action.view_flanking_regions = Mostrar label.view_flanking_regions = Mostrar los datos de la secuencia a ambos lados de las subsecuencias implicadas en este alineamiento label.structures_manager = Administrar estructuras label.nickname = Sobrenombre: - label.url = URL: + label.url\: = URL: + label.url = URL label.input_file_url = Introducir URL en el fichero de entrada label.select_feature = Seleccionar característica label.name = Nombre @@@ -380,7 -381,6 +381,6 @@@ label.couldnt_import_as_vamsas_session label.vamsas_document_import_failed = Fallo en la importación del documento Vamsas label.couldnt_locate = No se pudo localizar {0} label.url_not_found = URL no encontrada - label.no_link_selected = Enlace no seleccionado label.new_sequence_url_link = Enlace a una nueva secuencia URL label.cannot_edit_annotations_in_wrapped_view = No se pueden editar anotaciones en vista envolvente label.wrapped_view_no_edit = Vista envolvente - no editar @@@ -476,7 -476,7 +476,7 @@@ label.retrieve_parse_sequence_database_ label.standard_databases = Bases de datos estándar label.fetch_embl_uniprot = Recuperar de EMBL/EMBLCDS o Uniprot/PDB y de cualquier fuente DAS seleccionada label.reset_min_max_colours_to_defaults = Reiniciar los colores min y max colours a los valores por defecto establecidos en las preferencias de usuario - label.align_structures_using_linked_alignment_views = Alinear las estructuras utlizando las {0} vistas de alineamiento enlazadas + label.align_structures_using_linked_alignment_views = Alinear las estructuras utilizando las {0} vista(s) de alineamiento enlazada(s) label.connect_to_session = Conectar a la sesión {0} label.threshold_feature_display_by_score = Filtrar la característica mostrada por puntuación. label.threshold_feature_no_threshold = Sin umbral @@@ -621,7 -621,7 +621,7 @@@ label.2d_rna_sequence_name = 2D RNA - { label.edit_name_and_description_current_group = Editar el nombre y la descripción del grupo actual label.from_file = desde fichero label.enter_pdb_id = Introducir PDB Id -label.text_colour = Color del texto +label.text_colour = Color de texto... label.structure = Estructura label.create_sequence_details_report_annotation_for = Anotación para {0} label.sequence_details_for = Detalles de la secuencia para {0} @@@ -665,7 -665,8 +665,8 @@@ label.mark_unlinked_leaves = Marcar la label.associate_leaves_with = Asociar hojas con label.save_colour_scheme_with_unique_name_added_to_colour_menu = Guarde el esquema cromáticos con un nombre único y se añadirá al menú de colores label.case_sensitive = Sensible a mayúsculas - label.lower_case_colour = Color para las minúsculas + label.lower_case_colour = Colorear todas las minúsculas + label.lower_case_tip = El color elegido se aplicará a todas las minúsculas label.index_by_host = Indizar por host label.index_by_type = Indizar por tipo label.enable_jabaws_services = Habilitar servicios JABAWS @@@ -1157,6 -1158,7 +1158,6 @@@ label.invalid_search=Texto de búsqueda action.export_annotations=Exportar Anotaciones action.set_as_reference=Marcar como Referencia action.unmark_as_reference=Desmarcar como Referencia -action.set_text_colour=Color de Texto... label.chimera_failed=Error al abrir Chimera - está instalado?\nCompruebe ruta en Preferencias, Estructura label.find=Buscar label.select_pdb_file=Seleccionar Fichero PDB @@@ -1269,4 -1271,21 +1270,21 @@@ label.SEQUENCE_ID_no_longer_used = $SEQ label.SEQUENCE_ID_for_DB_ACCESSION1 = Por favor, revise sus URLs en la pestaña 'Conexiones' de la ventana de Preferencias: label.SEQUENCE_ID_for_DB_ACCESSION2 = URL enlaza usando '$SEQUENCE_ID$' para accesiones DB ahora usar '$DB_ACCESSION$'. label.do_not_display_again = No mostrar este mensaje de nuevo + exception.url_cannot_have_miriam_id = {0} es una id MIRIAM y no puede ser usada como nombre url personalizado + exception.url_cannot_have_duplicate_id = {0} no puede ser usada como etiqueta en más de un enlace + label.filter = Filtrar texto: + action.customfilter = Sólo personalizado + action.showall = Mostrar todo + label.insert = Insertar: + action.seq_id = $SEQUENCE_ID$ + action.db_acc = $DB_ACCESSION$ + label.primary = Doble clic + label.inmenu = En Menú + label.id = ID + label.database = Base de datos + label.urltooltip = Sólo una url, que debe usar una id de secuencia, puede ser seleccionada en la opción 'On Click' + label.edit_sequence_url_link = Editar link de secuencia URL + warn.name_cannot_be_duplicate = Los nombres URL definidos por el usuario deben ser únicos y no pueden ser ids de MIRIAM + label.invalid_name = Nombre inválido ! label.output_seq_details = Seleccionar Detalles de la secuencia para ver todas -label.urllinks = Enlaces ++label.urllinks = Enlaces