merge of '6ea189a179012ff48f750e835f069abfdbe32c7c'

and 'e0d6a2d51589348dbe6602973f8a6ae6718f0991'

Monotone-Parent: 6ea189a179012ff48f750e835f069abfdbe32c7c
Monotone-Parent: e0d6a2d51589348dbe6602973f8a6ae6718f0991
Monotone-Revision: 3765f757435c9d9934d42b1af5d1fd32fe72631a

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-07-16T02:17:32
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2009-07-16 02:17:32 +00:00
18 changed files with 72 additions and 15 deletions
@@ -43,7 +43,7 @@
<span class="checkBoxList"><var:string label:value="Category:" />
<span class="content"><var:popup name="category" list="categoryList" item="item"
label:noSelectionString="category_NONE"
string="itemCategoryText" selection="category"
string="item" selection="category"
/> <var:string label:value="Calendar:" />
<var:popup const:id="calendarList"
var:disabled="isChildOccurence"