From: Jim Procter Date: Mon, 29 Jun 2020 15:36:56 +0000 (+0100) Subject: Merge branch 'bug/JAL-3490findSpanHiddenGaps' into patch/Release_2_11_1_Branch_patch_... X-Git-Tag: Release_2_11_1_1~13^2~10^2~1 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4f9cb2ca5ee0d5556c44b223b0cc87334c7df74a;p=jalview.git 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 --- 4f9cb2ca5ee0d5556c44b223b0cc87334c7df74a diff --cc resources/lang/Messages.properties index a4b24ed,6515367..43bc19d --- a/resources/lang/Messages.properties +++ b/resources/lang/Messages.properties @@@ -1410,5 -1404,5 +1410,8 @@@ label.show_linked_features = Show {0} f label.on_top = on top label.include_linked_features = Include {0} features label.include_linked_tooltip = Include visible {0} features
converted to local sequence coordinates +label.features_not_shown = {0} feature(s) not shown +label.no_features_to_sort_by = No features to sort by + label.ignore_hidden = Ignore hidden columns + label.ignore_hidden_tooltip = Ignore any characters in hidden columns when matching ++ diff --cc resources/lang/Messages_es.properties index 4e0fb1f,90625fe..f0989e1 --- a/resources/lang/Messages_es.properties +++ b/resources/lang/Messages_es.properties @@@ -1405,5 -1405,5 +1405,7 @@@ label.show_linked_features = Caracterís label.on_top = encima label.include_linked_features = Incluir características de {0} label.include_linked_tooltip = Incluir características de {0}
convertidas a coordenadas de secuencia local +label.features_not_shown = {0} característica(s) no mostradas +label.no_features_to_sort_by = No hay características para ordenar + label.ignore_hidden = Ignorar columnas ocultas + label.ignore_hidden_tooltip = Ignorar caracteres en columnas ocultas