allpy
changeset 1042:73579ca7c1b5 1.4.2
Merge per-block columns highlight and translations from default into 1.4.2
| author | Boris Nagaev <bnagaev@gmail.com> |
|---|---|
| date | Fri, 23 Mar 2012 01:34:48 +0400 |
| parents | 447c048047b2 811914ba7195 |
| children | 9f47e508a9e1 00d6145cba0f |
| files | |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line diff
1.1 --- a/blocks3d/www/input/blocks.js Tue Mar 20 01:39:28 2012 +0400 1.2 +++ b/blocks3d/www/input/blocks.js Fri Mar 23 01:34:48 2012 +0400 1.3 @@ -159,7 +159,7 @@ 1.4 block = blocks[i]; 1.5 block.is_conservative = []; 1.6 $.each(block.positions, function(key, pos) { 1.7 - block.is_conservative[j] = is_conservative_column(pos, block.IDs); 1.8 + block.is_conservative[pos] = is_conservative_column(pos, block.IDs); 1.9 }); 1.10 } 1.11
2.1 --- a/pair_cores/web/approot/locales/pair-cores-web.xml Tue Mar 20 01:39:28 2012 +0400 2.2 +++ b/pair_cores/web/approot/locales/pair-cores-web.xml Fri Mar 23 01:34:48 2012 +0400 2.3 @@ -52,7 +52,7 @@ 2.4 <message id='pair.out.Homology'>Homology file</message> 2.5 <message id='pair.out.Pair_blocks'>Pair cores file</message> 2.6 <message id='pair.out.Pair_html'>Pair cores HTML file</message> 2.7 - <message id='pair.out.Pymol'>PyMol file</message> 2.8 + <message id='pair.out.Pymol'>Pair cores PyMol file</message> 2.9 2.10 </messages> 2.11
3.1 --- a/pair_cores/web/approot/locales/pair-cores-web_ru.xml Tue Mar 20 01:39:28 2012 +0400 3.2 +++ b/pair_cores/web/approot/locales/pair-cores-web_ru.xml Fri Mar 23 01:34:48 2012 +0400 3.3 @@ -42,7 +42,7 @@ 3.4 <message id='pair.out.Homology'>Файл гомологии</message> 3.5 <message id='pair.out.Pair_blocks'>Парные блоки (текст)</message> 3.6 <message id='pair.out.Pair_html'>Парные блоки (HTML)</message> 3.7 - <message id='pair.out.Pymol'>PyMol-скрипт</message> 3.8 + <message id='pair.out.Pymol'>Парные блоки (PyMol-скрипт)</message> 3.9 3.10 </messages> 3.11