Changeset 21a1c96a16f7772d88f1598d651cbffe87327046

Show
Ignore:
Timestamp:
12/27/10 01:19:59 (2 years ago)
Author:
Nedko Arnaudov <nedko@…>
Children:
9868de418b3106526e59da1110ed17bfb9db2036
Parents:
25a55f5f3fd771e7fb5ed1ff5953431d3825d9de, 9c142e2f0cfa69a417b86439d34b4e9a3297339e
git-committer:
Nedko Arnaudov <nedko@arnaudov.name> / 2010-12-27T01:19:59Z+0200
Message:

Merge remote branch 'cz/master'

Files:
2 modified

Legend:

Unmodified
Added
Removed
  • po/ru.po

    rc787d3e r9c142e2  
    1111"Report-Msgid-Bugs-To: \n" 
    1212"POT-Creation-Date: 2010-12-21 04:36+0500\n" 
    13 "PO-Revision-Date: 2010-12-22 13:24+0500\n" 
     13"PO-Revision-Date: 2010-12-27 02:12+0300\n" 
    1414"Language-Team: Russian <gnome-cyr@lists.gnome.org>\n" 
    1515"Last-Translator: Maxim Kachur <mcdebugger@duganet.ru>\n" 
     
    236236#: gui/menu.c:355 gui/gladish.ui:204 
    237237msgid "New Application..." 
    238 msgstr "ЗапустОть..." 
     238msgstr "НПвПе прОлПжеМОе..." 
    239239 
    240240#: gui/menu.c:370 
  • daemon/save.c

    r1d029ff r25a55f5  
    892892     However if studio has no a2j ports, lets not write a2j client. 
    893893     If there is a a2j port that matched the vgraph, the prolog will get written anyway */ 
    894   ctx_ptr->client_visible = ctx_ptr->client_vgraph_match && !ctx_ptr->a2j && ladish_client_has_app(client_handle); 
     894  ctx_ptr->client_visible = 
     895    (!hidden || 
     896     ladish_client_has_app(client_handle)) && 
     897     ctx_ptr->client_vgraph_match && 
     898     !ctx_ptr->a2j; 
    895899  if (!ctx_ptr->client_visible) 
    896900  { 
     
    946950  char str[37]; 
    947951 
     952  if (hidden && !ladish_port_has_app(port_handle)) 
     953  { 
     954    return true; 
     955  } 
     956 
    948957  /* check vgraph for a2j ports */ 
    949   if (ctx_ptr->a2j && ctx_ptr->vgraph_filter == ladish_port_get_vgraph(port_handle) && ladish_port_has_app(port_handle)) 
     958  if (ctx_ptr->a2j && ctx_ptr->vgraph_filter == ladish_port_get_vgraph(port_handle)) 
    950959  { 
    951960    if (!ctx_ptr->client_visible)