Merge 3.5.7

This commit is contained in:
Romain Neutron
2012-01-03 15:26:07 +01:00
28 changed files with 43087 additions and 42105 deletions

View File

@@ -620,9 +620,7 @@
<button class="default_action">
<img src="/skins/icons/ccoch0.gif"/>&nbsp;
</button>
<button class="trigger">
oui
</button>
<button class="trigger">{% trans 'Select' %}</button>
</span>
<div class="submenu">
<button class="answer_selector all_selector">
@@ -651,7 +649,7 @@
<button class="default_action TOOL_disktt_btn results_window">
<img src="/skins/prod/000000/images/disktt_history.gif"/> {% trans 'action : exporter' %}
</button>
<button class="trigger">Select an action</button>
<button class="trigger">{% trans 'Select an action' %}</button>
</span>
<div class="submenu">
<button class="TOOL_print_btn results_window">
@@ -692,7 +690,7 @@
</button>
{% endif %}
{% endfor %}
<button class="trigger">Operations</button>
<button class="trigger">{% trans 'Select an action' %}</button>
</span>
<div class="submenu" >
{% for action in actions %}
@@ -721,7 +719,7 @@
<img src="/skins/prod/000000/images/pushdoc_history.gif"/>
{% trans 'action : push' %}
</button>
<button class="trigger">Select an action</button>
<button class="trigger">{% trans 'Select an action' %}</button>
</span>
<div class="submenu">
<button class="TOOL_bridge_btn results_window">
@@ -748,7 +746,7 @@
<img src="/skins/icons/door.png"/>
{% trans 'action : bridge' %}
</button>
<button class="trigger">Select an action</button>
<button class="trigger">{% trans 'Select an action' %}</button>
</span>
<div class="submenu">
<button class="TOOL_publish_btn results_window">