Commits

Anonymous committed 77822bc

Another message extraction for WikiCalendar after big changes to newly added message strings.

Comments (0)

Files changed (10)

wikicalendar/locale/de/LC_MESSAGES/wikicalendar.po

 msgstr ""
 "Project-Id-Version: WikiCalendarMacro 2.0\n"
 "Report-Msgid-Bugs-To: hoff.st@shaas.net\n"
-"POT-Creation-Date: 2013-03-30 21:10+0100\n"
+"POT-Creation-Date: 2013-04-01 01:18+0200\n"
 "PO-Revision-Date: 2010-06-04 03:05+0200\n"
 "Last-Translator: Steffen Hoffmann <hoff.st@web.de>\n"
 "Language-Team: German de_DE <trac-dev@googlegroups.com>\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.0dev-r482\n"
 
-#. TRANSLATOR: Keep macro doc style formatting here, please.
-#: wikicalendar/macros.py:173
+#. TRANSLATOR: Keep Trac style WikiFormatting here, please.
+#: wikicalendar/macros.py:175
 #, python-format
 msgid ""
-"Inserts a small calendar where each day links to a wiki page,\n"
-"whose name matches `wiki-page-format`. The current day is\n"
-"highlighted, and days with Milestones are marked in bold.\n"
-"This version makes heavy use of CSS for formatting.\n"
+"Inserts a small calendar, where each day links to a wiki page,\n"
+"whose name matches the format set by `wiki`. The current day is\n"
+"highlighted, and days with a due Milestone are marked in bold.\n"
 "\n"
 "Usage:\n"
 "{{{\n"
-"[[WikiCalendar([year, [month, [show-buttons, [wiki-page-format]]]])]]\n"
+"[[WikiCalendar([year, month, nav, wiki, base=<page.name>)]]\n"
 "}}}\n"
 "\n"
-"Arguments:\n"
-" 1. `year` (4-digit year) - defaults to `*` (current year)\n"
-" 1. `month` (2-digit month) - defaults to `*` (current month)\n"
-" 1. `show-buttons` (boolean) - defaults to `true`\n"
-" 1. `wiki-page-format` (string) - defaults to `%Y-%m-%d`\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+"\n"
+"Keyword-only argument:\n"
+" * `base` (page name string) - create new pages from that\n"
+"   template in PageTemplates, defaults to `''` (empty string)\n"
 "\n"
 "Examples:\n"
 "{{{\n"
 "[[WikiCalendar(2006,07,false)]]\n"
 "[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
 "[[WikiCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d,base=MeetingNotes)]]\n"
 "}}}"
 msgstr ""
 "Fügt einen kleinen Kalender ein, in dem jeder Tag mit einer Wiki-Seite "
-"verknüpft ist, deren Name `wiki-page-format` entspricht. Der aktuelle Tag"
-" ist hervorgehoben, und Tage mit Meilensteinen sind fett markiert. Diese "
-"Version nutzt umfassend CSS zur Formattierung.\n"
+"verknüpft ist, deren Name dem mit `wiki` eingestellten Format entspricht."
+" Der aktuelle Tag ist hervorgehoben, und Tage mit fälligem Meilenstein "
+"sind fett markiert.\n"
 "\n"
 "Verwendung:\n"
 "{{{\n"
-"[[WikiCalendar([year, [month, [show-buttons, [wiki-page-format]]]])]]\n"
+"[[WikiCalendar([year, month, nav, wiki, base=<page.name>)]]\n"
 "}}}\n"
 "\n"
-"Argumente:\n"
-" 1. `year` (4-stelliges Jahr) - Standard ist `*` (aktuelles Jahr)\n"
-" 1. `month` (2-stelliger Monat) - Standard ist `*` (aktueller Monat)\n"
-" 1. `show-buttons` (Bool-Wert) - Standard ist `true`\n"
-" 1. `wiki-page-format` (Zeichenkette) - Standard ist `%Y-%m-%d`\n"
+"Argumente (alle optional, aber positionsgebunden - Reihenfolge beachten):"
 "\n"
+" 1. `year` (4-stelliges Jahr), Standard ist `*` (aktuelles Jahr)\n"
+" 1. `month` (2-stelliger Monat), Standard ist `*` (aktueller Monat)\n"
+" 1. `nav` (Bool-Wert), Standard ist `true`\n"
+" 1. `wiki` (gültiger strftime-Ausdruck) - Format für Seitennamen, "
+"Standard ist `%Y-%m-%d`\n"
+"\n"
+"Schlüsselwort-Argument:\n"
+" * `base` (Seitenname) - erstelle neue Seiten nach dieser Vorlage aus "
+"PageTemplates, Standard ist `''` (leere Zeichenkette)\n"
 "Beispiele:\n"
 "{{{\n"
 "[[WikiCalendar(2006,07)]]\n"
 "[[WikiCalendar(2006,07,false)]]\n"
-"[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
-"[[WikiCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiCalendar(*,*,true,Beratung-%Y-%m-%d)]]\n"
+"[[WikiCalendar(2006,07,false,Beratung-%Y-%m-%d)]]\n"
+"[[WikiCalendar(*,*,true,Beratung-%Y-%m-%d,base=BeratungsNotiz)]]\n"
 "}}}"
 
-#: wikicalendar/macros.py:199
+#: wikicalendar/macros.py:207
+#, python-format
 msgid ""
 "Display Milestones and Tickets in a calendar view.\n"
 "\n"
-"displays a calendar, the days link to:\n"
-" - milestones (day in bold) if there is one on that day\n"
-" - a wiki page that has wiki_page_format (if exist)\n"
-" - create that wiki page if it does not exist\n"
-" - use page template (if exist) for new wiki page"
+"Days include links to:\n"
+" * all milestones, that are due on that day\n"
+" * all tickets, that are due on that day\n"
+" * all tickets created on that day (configurable)\n"
+" * one or more wiki pages with name matching the configured format\n"
+"preparing links for creating new wiki pages from a template too\n"
+"\n"
+"Usage:\n"
+"{{{\n"
+"[[WikiTicketCalendar(year, month, nav, wiki, cdate, base, query,\n"
+"                     short, width)]]\n"
+"}}}\n"
+"\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+" 1. `cdate` (boolean) - show tickets created on that day too,\n"
+"    defaults to `true`\n"
+" 1. `base` (page name string) - create new pages from that\n"
+"    template in PageTemplates, defaults to `''` (empty string)\n"
+" 1. `query` (valid TracQuery) - including expressions grouped by\n"
+"    AND (OR since 0.12) for general ticket selection, defaults\n"
+"    to `id!=0`\n"
+" 1. `short` (integer) - total ticket count per day, that will have\n"
+"    ticket list display condensed to just ticket numbers, defaults\n"
+"    to `0` (never condense ticket list\n"
+" 1. `width` (valid CSS size), prefixed `+` forces more, defaults\n"
+"    to `100%;`\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(2006,07)]]\n"
+"[[WikiTicketCalendar(2006,07,false)]]\n"
+"[[WikiTicketCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,true,*,true)]]\n"
+"[[WikiTicketCalendar(2006,07,true,Meeting-%Y-%m-%d,true,Meeting)]]\n"
+"}}}\n"
+"\n"
+"Equivalent keyword arguments are available for all but the first\n"
+"two arguments.\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Talk-%Y-%m-%d,base=Talk)]]\n"
+" same as [[WikiTicketCalendar(*,*,true,Talk-%Y-%m-%d,true,Talk)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting-%Y-%m-%d,query=type=task)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,short=6)]]\n"
+"}}}\n"
+"\n"
+"Mixed use of both, simple and keyword arguments is possible, while\n"
+"order of simple arguments (see above) still applies and keyword\n"
+"arguments in-between do not count for positional argument mapping.\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,*,*,true,width=+75%;)]]\n"
+"}}}\n"
+"\n"
+"Keyword-only argument:\n"
+" * `subpages` (list of page names separated by '|') - replace\n"
+"   wiki page link per day with one link per sub-page labeled by\n"
+"   first character of sub-page name, defaults to an empty list\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meetings_%Y/%m/%d,\n"
+"                     subpages=Morning|Afternoon)]]\n"
+"}}}"
 msgstr ""
 "Zeigt Meilensteine und Tickets in einer Kalender-Ansicht.\n"
 "\n"
-"Kalenderdarstellung, deren Tage verknüpft sind mit:\n"
-" - Meilensteinen (Tag gefettet), wenn es nur einen and dem Tag gibt\n"
-" - einer Wiki-Seite die wiki_page_format besitzt (falls sie existiert)\n"
-" - einer neuen Wiki-Seite, falls sie nicht existiert\n"
-" - nutzt eine Seitenvorlage (falls sie existiert) für neue Wiki-Seiten"
+"Tage enthalten Verknüpfungen mit:\n"
+" * allen Meilensteinen, die an dem Tag fällig sind\n"
+" * allen Tickets, die an dem Tag fällig sind\n"
+" * allen an diesem Tag erstellten Tickets (einstellbar)\n"
+" * einer oder mehreren Wiki-Seiten mit Namen entprechend des "
+"eingestellten Formats\n"
+"und vorbereitete Verweise zur Erstellung neuer Wiki-Seiten von einer "
+"Vorlage\n"
+"\n"
+"Verwendung:\n"
+"{{{\n"
+"[[WikiTicketCalendar(year, month, nav, wiki, cdate, base, query,\n"
+"                     short, width)]]\n"
+"}}}\n"
+"\n"
+"Argumente (alle optional, aber positionsgebunden - Reihenfolge beachten):"
+"\n"
+" 1. `year` (4-stelliges Jahr), Standard ist `*` (aktuelles Jahr)\n"
+" 1. `month` (2-stelliger Monat), Standard ist `*` (aktueller Monat)\n"
+" 1. `nav` (Bool-Wert), Standard ist `true`\n"
+" 1. `wiki` (gültiger strftime-Ausdruck) - Format für Seitennamen, "
+"Standard ist `%Y-%m-%d`\n"
+" 1. `cdate` (Bool-Wert) - zeige auch an dem Tag erstellte Tickets, "
+"Standard ist `true`\n"
+" 1. `base` (Seitenname) - erstelle neue Seiten nach dieser Vorlage aus "
+"PageTemplates, Standard ist `''` (leere Zeichenkette)\n"
+" 1. `query` (gültiger TracQuery-Ausdruck) - auch mit AND (OR seit 0.12) "
+"verknüpfte Ausdrücke zur Ticket-Vorauswahl, Standard ist `id!=0`\n"
+" 1. `short` (Ganzzahl) - Gesamtanzahl von Ticket pro Tag, bei der die "
+"Ticketliste auf die Ticketnummern reduziert wird, Standard ist `0` "
+"(Ticketliste nie reduzieren)\n"
+" 1. `width` (gültiger CSS-Grössenwert), verstärkte Wirkung mit "
+"vorangestelltem `+`, Standard ist `100%;`\n"
+"\n"
+"Beispiele:\n"
+"{{{\n"
+"[[WikiTicketCalendar(2006,07)]]\n"
+"[[WikiTicketCalendar(2006,07,false)]]\n"
+"[[WikiTicketCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,true,*,true)]]\n"
+"[[WikiTicketCalendar(2006,07,true,Meeting-%Y-%m-%d,true,Meeting)]]\n"
+"}}}\n"
+"\n"
+"Bis auf die ersten beiden sind für alle Argumente auch entsprechende "
+"Schlüsselworte verfügbar.\n"
+"\n"
+"Beispiele:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Talk-%Y-%m-%d,base=Talk)]]\n"
+" same as [[WikiTicketCalendar(*,*,true,Talk-%Y-%m-%d,true,Talk)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting-%Y-%m-%d,query=type=task)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,short=6)]]\n"
+"}}}\n"
+"\n"
+"Gemischter Einsatz von einfachen und Schlüsselwort-Argumenten ist "
+"möglich, wobei die Reihenfolge der einfachen Argumente (siehe oben) "
+"weiter gilt und eingestreute Schlüsselworte für die Positionszuordung "
+"nicht mitgezählt werden.\n"
+"\n"
+"Beispiel:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,*,*,true,width=+75%;)]]\n"
+"}}}\n"
+"\n"
+"Schlüsselwort-Argument:\n"
+" * `subpages` (Liste von durch '|' getrennten Seitennamen) - ersetze die "
+"Wikiseiten-Verknüpfung des Tags durch eine Verknüpfung pro Unterseite, "
+"die mit dem Anfangszeichen des Unterseitennamens beschriftet ist, "
+"Standard ist eine leere Liste\n"
+"\n"
+"Beispiel:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Treff_%Y/%m/%d,\n"
+"                     subpages=Morgens|Nachmittag)]]\n"
+"}}}"
 
-#: wikicalendar/macros.py:247
+#: wikicalendar/macros.py:323
 #, python-format
 msgid "Go to page %s"
 msgstr "Springe zur Seite %s"
 
-#: wikicalendar/macros.py:266
+#: wikicalendar/macros.py:342
 #, python-format
 msgid "Create page %s"
 msgstr "Erstelle die Seite %s"

wikicalendar/locale/he/LC_MESSAGES/wikicalendar.po

 msgstr ""
 "Project-Id-Version: WikiCalendarMacro 2.0\n"
 "Report-Msgid-Bugs-To: hoff.st@shaas.net\n"
-"POT-Creation-Date: 2013-03-30 21:10+0100\n"
+"POT-Creation-Date: 2013-04-01 01:18+0200\n"
 "PO-Revision-Date: 2012-06-12 12:24+0000\n"
 "Last-Translator: Shalom Craimer <s.transifex@craimer.org>\n"
 "Language-Team: Hebrew <trac-dev@googlegroups.com>\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.0dev-r482\n"
 
-#. TRANSLATOR: Keep macro doc style formatting here, please.
-#: wikicalendar/macros.py:173
+#. TRANSLATOR: Keep Trac style WikiFormatting here, please.
+#: wikicalendar/macros.py:175
 #, python-format
 msgid ""
-"Inserts a small calendar where each day links to a wiki page,\n"
-"whose name matches `wiki-page-format`. The current day is\n"
-"highlighted, and days with Milestones are marked in bold.\n"
-"This version makes heavy use of CSS for formatting.\n"
+"Inserts a small calendar, where each day links to a wiki page,\n"
+"whose name matches the format set by `wiki`. The current day is\n"
+"highlighted, and days with a due Milestone are marked in bold.\n"
 "\n"
 "Usage:\n"
 "{{{\n"
-"[[WikiCalendar([year, [month, [show-buttons, [wiki-page-format]]]])]]\n"
+"[[WikiCalendar([year, month, nav, wiki, base=<page.name>)]]\n"
 "}}}\n"
 "\n"
-"Arguments:\n"
-" 1. `year` (4-digit year) - defaults to `*` (current year)\n"
-" 1. `month` (2-digit month) - defaults to `*` (current month)\n"
-" 1. `show-buttons` (boolean) - defaults to `true`\n"
-" 1. `wiki-page-format` (string) - defaults to `%Y-%m-%d`\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+"\n"
+"Keyword-only argument:\n"
+" * `base` (page name string) - create new pages from that\n"
+"   template in PageTemplates, defaults to `''` (empty string)\n"
 "\n"
 "Examples:\n"
 "{{{\n"
 "[[WikiCalendar(2006,07,false)]]\n"
 "[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
 "[[WikiCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d,base=MeetingNotes)]]\n"
 "}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:199
+#: wikicalendar/macros.py:207
+#, python-format
 msgid ""
 "Display Milestones and Tickets in a calendar view.\n"
 "\n"
-"displays a calendar, the days link to:\n"
-" - milestones (day in bold) if there is one on that day\n"
-" - a wiki page that has wiki_page_format (if exist)\n"
-" - create that wiki page if it does not exist\n"
-" - use page template (if exist) for new wiki page"
+"Days include links to:\n"
+" * all milestones, that are due on that day\n"
+" * all tickets, that are due on that day\n"
+" * all tickets created on that day (configurable)\n"
+" * one or more wiki pages with name matching the configured format\n"
+"preparing links for creating new wiki pages from a template too\n"
+"\n"
+"Usage:\n"
+"{{{\n"
+"[[WikiTicketCalendar(year, month, nav, wiki, cdate, base, query,\n"
+"                     short, width)]]\n"
+"}}}\n"
+"\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+" 1. `cdate` (boolean) - show tickets created on that day too,\n"
+"    defaults to `true`\n"
+" 1. `base` (page name string) - create new pages from that\n"
+"    template in PageTemplates, defaults to `''` (empty string)\n"
+" 1. `query` (valid TracQuery) - including expressions grouped by\n"
+"    AND (OR since 0.12) for general ticket selection, defaults\n"
+"    to `id!=0`\n"
+" 1. `short` (integer) - total ticket count per day, that will have\n"
+"    ticket list display condensed to just ticket numbers, defaults\n"
+"    to `0` (never condense ticket list\n"
+" 1. `width` (valid CSS size), prefixed `+` forces more, defaults\n"
+"    to `100%;`\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(2006,07)]]\n"
+"[[WikiTicketCalendar(2006,07,false)]]\n"
+"[[WikiTicketCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,true,*,true)]]\n"
+"[[WikiTicketCalendar(2006,07,true,Meeting-%Y-%m-%d,true,Meeting)]]\n"
+"}}}\n"
+"\n"
+"Equivalent keyword arguments are available for all but the first\n"
+"two arguments.\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Talk-%Y-%m-%d,base=Talk)]]\n"
+" same as [[WikiTicketCalendar(*,*,true,Talk-%Y-%m-%d,true,Talk)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting-%Y-%m-%d,query=type=task)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,short=6)]]\n"
+"}}}\n"
+"\n"
+"Mixed use of both, simple and keyword arguments is possible, while\n"
+"order of simple arguments (see above) still applies and keyword\n"
+"arguments in-between do not count for positional argument mapping.\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,*,*,true,width=+75%;)]]\n"
+"}}}\n"
+"\n"
+"Keyword-only argument:\n"
+" * `subpages` (list of page names separated by '|') - replace\n"
+"   wiki page link per day with one link per sub-page labeled by\n"
+"   first character of sub-page name, defaults to an empty list\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meetings_%Y/%m/%d,\n"
+"                     subpages=Morning|Afternoon)]]\n"
+"}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:247
+#: wikicalendar/macros.py:323
 #, python-format
 msgid "Go to page %s"
 msgstr "אל עמוד %s"
 
-#: wikicalendar/macros.py:266
+#: wikicalendar/macros.py:342
 #, python-format
 msgid "Create page %s"
 msgstr "יצירת עמוד %s"

wikicalendar/locale/it/LC_MESSAGES/wikicalendar.po

 msgstr ""
 "Project-Id-Version: WikiCalendarMacro 2.0\n"
 "Report-Msgid-Bugs-To: hoff.st@shaas.net\n"
-"POT-Creation-Date: 2013-03-30 21:10+0100\n"
+"POT-Creation-Date: 2013-04-01 01:18+0200\n"
 "PO-Revision-Date: 2010-08-14 10:57+0200\n"
 "Last-Translator: Roberto Longobardi seccanj@gmail.com\n"
 "Language-Team: Italian it_IT <trac-dev@googlegroups.com>\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.0dev-r482\n"
 
-#. TRANSLATOR: Keep macro doc style formatting here, please.
-#: wikicalendar/macros.py:173
+#. TRANSLATOR: Keep Trac style WikiFormatting here, please.
+#: wikicalendar/macros.py:175
 #, python-format
 msgid ""
-"Inserts a small calendar where each day links to a wiki page,\n"
-"whose name matches `wiki-page-format`. The current day is\n"
-"highlighted, and days with Milestones are marked in bold.\n"
-"This version makes heavy use of CSS for formatting.\n"
+"Inserts a small calendar, where each day links to a wiki page,\n"
+"whose name matches the format set by `wiki`. The current day is\n"
+"highlighted, and days with a due Milestone are marked in bold.\n"
 "\n"
 "Usage:\n"
 "{{{\n"
-"[[WikiCalendar([year, [month, [show-buttons, [wiki-page-format]]]])]]\n"
+"[[WikiCalendar([year, month, nav, wiki, base=<page.name>)]]\n"
 "}}}\n"
 "\n"
-"Arguments:\n"
-" 1. `year` (4-digit year) - defaults to `*` (current year)\n"
-" 1. `month` (2-digit month) - defaults to `*` (current month)\n"
-" 1. `show-buttons` (boolean) - defaults to `true`\n"
-" 1. `wiki-page-format` (string) - defaults to `%Y-%m-%d`\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+"\n"
+"Keyword-only argument:\n"
+" * `base` (page name string) - create new pages from that\n"
+"   template in PageTemplates, defaults to `''` (empty string)\n"
 "\n"
 "Examples:\n"
 "{{{\n"
 "[[WikiCalendar(2006,07,false)]]\n"
 "[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
 "[[WikiCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d,base=MeetingNotes)]]\n"
 "}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:199
+#: wikicalendar/macros.py:207
+#, python-format
 msgid ""
 "Display Milestones and Tickets in a calendar view.\n"
 "\n"
-"displays a calendar, the days link to:\n"
-" - milestones (day in bold) if there is one on that day\n"
-" - a wiki page that has wiki_page_format (if exist)\n"
-" - create that wiki page if it does not exist\n"
-" - use page template (if exist) for new wiki page"
+"Days include links to:\n"
+" * all milestones, that are due on that day\n"
+" * all tickets, that are due on that day\n"
+" * all tickets created on that day (configurable)\n"
+" * one or more wiki pages with name matching the configured format\n"
+"preparing links for creating new wiki pages from a template too\n"
+"\n"
+"Usage:\n"
+"{{{\n"
+"[[WikiTicketCalendar(year, month, nav, wiki, cdate, base, query,\n"
+"                     short, width)]]\n"
+"}}}\n"
+"\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+" 1. `cdate` (boolean) - show tickets created on that day too,\n"
+"    defaults to `true`\n"
+" 1. `base` (page name string) - create new pages from that\n"
+"    template in PageTemplates, defaults to `''` (empty string)\n"
+" 1. `query` (valid TracQuery) - including expressions grouped by\n"
+"    AND (OR since 0.12) for general ticket selection, defaults\n"
+"    to `id!=0`\n"
+" 1. `short` (integer) - total ticket count per day, that will have\n"
+"    ticket list display condensed to just ticket numbers, defaults\n"
+"    to `0` (never condense ticket list\n"
+" 1. `width` (valid CSS size), prefixed `+` forces more, defaults\n"
+"    to `100%;`\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(2006,07)]]\n"
+"[[WikiTicketCalendar(2006,07,false)]]\n"
+"[[WikiTicketCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,true,*,true)]]\n"
+"[[WikiTicketCalendar(2006,07,true,Meeting-%Y-%m-%d,true,Meeting)]]\n"
+"}}}\n"
+"\n"
+"Equivalent keyword arguments are available for all but the first\n"
+"two arguments.\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Talk-%Y-%m-%d,base=Talk)]]\n"
+" same as [[WikiTicketCalendar(*,*,true,Talk-%Y-%m-%d,true,Talk)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting-%Y-%m-%d,query=type=task)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,short=6)]]\n"
+"}}}\n"
+"\n"
+"Mixed use of both, simple and keyword arguments is possible, while\n"
+"order of simple arguments (see above) still applies and keyword\n"
+"arguments in-between do not count for positional argument mapping.\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,*,*,true,width=+75%;)]]\n"
+"}}}\n"
+"\n"
+"Keyword-only argument:\n"
+" * `subpages` (list of page names separated by '|') - replace\n"
+"   wiki page link per day with one link per sub-page labeled by\n"
+"   first character of sub-page name, defaults to an empty list\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meetings_%Y/%m/%d,\n"
+"                     subpages=Morning|Afternoon)]]\n"
+"}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:247
+#: wikicalendar/macros.py:323
 #, python-format
 msgid "Go to page %s"
 msgstr "Vai alla pagina %s"
 
-#: wikicalendar/macros.py:266
+#: wikicalendar/macros.py:342
 #, python-format
 msgid "Create page %s"
 msgstr "Crea la pagina %s"

wikicalendar/locale/ja/LC_MESSAGES/wikicalendar.po

 msgstr ""
 "Project-Id-Version: WikiCalendarMacro 2.0\n"
 "Report-Msgid-Bugs-To: hoff.st@shaas.net\n"
-"POT-Creation-Date: 2013-03-30 21:10+0100\n"
+"POT-Creation-Date: 2013-04-01 01:18+0200\n"
 "PO-Revision-Date: 2010-06-08 05:40+0900\n"
 "Last-Translator: Jun Omae <jun66j5@gmail.com>\n"
 "Language-Team: ja <LL@li.org>\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.0dev-r482\n"
 
-#. TRANSLATOR: Keep macro doc style formatting here, please.
-#: wikicalendar/macros.py:173
+#. TRANSLATOR: Keep Trac style WikiFormatting here, please.
+#: wikicalendar/macros.py:175
 #, python-format
 msgid ""
-"Inserts a small calendar where each day links to a wiki page,\n"
-"whose name matches `wiki-page-format`. The current day is\n"
-"highlighted, and days with Milestones are marked in bold.\n"
-"This version makes heavy use of CSS for formatting.\n"
+"Inserts a small calendar, where each day links to a wiki page,\n"
+"whose name matches the format set by `wiki`. The current day is\n"
+"highlighted, and days with a due Milestone are marked in bold.\n"
 "\n"
 "Usage:\n"
 "{{{\n"
-"[[WikiCalendar([year, [month, [show-buttons, [wiki-page-format]]]])]]\n"
+"[[WikiCalendar([year, month, nav, wiki, base=<page.name>)]]\n"
 "}}}\n"
 "\n"
-"Arguments:\n"
-" 1. `year` (4-digit year) - defaults to `*` (current year)\n"
-" 1. `month` (2-digit month) - defaults to `*` (current month)\n"
-" 1. `show-buttons` (boolean) - defaults to `true`\n"
-" 1. `wiki-page-format` (string) - defaults to `%Y-%m-%d`\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+"\n"
+"Keyword-only argument:\n"
+" * `base` (page name string) - create new pages from that\n"
+"   template in PageTemplates, defaults to `''` (empty string)\n"
 "\n"
 "Examples:\n"
 "{{{\n"
 "[[WikiCalendar(2006,07,false)]]\n"
 "[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
 "[[WikiCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d,base=MeetingNotes)]]\n"
 "}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:199
+#: wikicalendar/macros.py:207
+#, python-format
 msgid ""
 "Display Milestones and Tickets in a calendar view.\n"
 "\n"
-"displays a calendar, the days link to:\n"
-" - milestones (day in bold) if there is one on that day\n"
-" - a wiki page that has wiki_page_format (if exist)\n"
-" - create that wiki page if it does not exist\n"
-" - use page template (if exist) for new wiki page"
+"Days include links to:\n"
+" * all milestones, that are due on that day\n"
+" * all tickets, that are due on that day\n"
+" * all tickets created on that day (configurable)\n"
+" * one or more wiki pages with name matching the configured format\n"
+"preparing links for creating new wiki pages from a template too\n"
+"\n"
+"Usage:\n"
+"{{{\n"
+"[[WikiTicketCalendar(year, month, nav, wiki, cdate, base, query,\n"
+"                     short, width)]]\n"
+"}}}\n"
+"\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+" 1. `cdate` (boolean) - show tickets created on that day too,\n"
+"    defaults to `true`\n"
+" 1. `base` (page name string) - create new pages from that\n"
+"    template in PageTemplates, defaults to `''` (empty string)\n"
+" 1. `query` (valid TracQuery) - including expressions grouped by\n"
+"    AND (OR since 0.12) for general ticket selection, defaults\n"
+"    to `id!=0`\n"
+" 1. `short` (integer) - total ticket count per day, that will have\n"
+"    ticket list display condensed to just ticket numbers, defaults\n"
+"    to `0` (never condense ticket list\n"
+" 1. `width` (valid CSS size), prefixed `+` forces more, defaults\n"
+"    to `100%;`\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(2006,07)]]\n"
+"[[WikiTicketCalendar(2006,07,false)]]\n"
+"[[WikiTicketCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,true,*,true)]]\n"
+"[[WikiTicketCalendar(2006,07,true,Meeting-%Y-%m-%d,true,Meeting)]]\n"
+"}}}\n"
+"\n"
+"Equivalent keyword arguments are available for all but the first\n"
+"two arguments.\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Talk-%Y-%m-%d,base=Talk)]]\n"
+" same as [[WikiTicketCalendar(*,*,true,Talk-%Y-%m-%d,true,Talk)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting-%Y-%m-%d,query=type=task)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,short=6)]]\n"
+"}}}\n"
+"\n"
+"Mixed use of both, simple and keyword arguments is possible, while\n"
+"order of simple arguments (see above) still applies and keyword\n"
+"arguments in-between do not count for positional argument mapping.\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,*,*,true,width=+75%;)]]\n"
+"}}}\n"
+"\n"
+"Keyword-only argument:\n"
+" * `subpages` (list of page names separated by '|') - replace\n"
+"   wiki page link per day with one link per sub-page labeled by\n"
+"   first character of sub-page name, defaults to an empty list\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meetings_%Y/%m/%d,\n"
+"                     subpages=Morning|Afternoon)]]\n"
+"}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:247
+#: wikicalendar/macros.py:323
 #, python-format
 msgid "Go to page %s"
 msgstr "ページ %s へ移動"
 
-#: wikicalendar/macros.py:266
+#: wikicalendar/macros.py:342
 #, python-format
 msgid "Create page %s"
 msgstr "ページ %s の作成"

wikicalendar/locale/ko/LC_MESSAGES/wikicalendar.po

 msgstr ""
 "Project-Id-Version: WikiCalendarMacro 2.0\n"
 "Report-Msgid-Bugs-To: hoff.st@shaas.net\n"
-"POT-Creation-Date: 2013-03-30 21:10+0100\n"
+"POT-Creation-Date: 2013-04-01 01:18+0200\n"
 "PO-Revision-Date: 2013-01-21 04:53+0000\n"
 "Last-Translator: YT H <dev@theYT.net>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/Trac_Plugin-"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.0dev-r482\n"
 
-#. TRANSLATOR: Keep macro doc style formatting here, please.
-#: wikicalendar/macros.py:173
+#. TRANSLATOR: Keep Trac style WikiFormatting here, please.
+#: wikicalendar/macros.py:175
 #, python-format
 msgid ""
-"Inserts a small calendar where each day links to a wiki page,\n"
-"whose name matches `wiki-page-format`. The current day is\n"
-"highlighted, and days with Milestones are marked in bold.\n"
-"This version makes heavy use of CSS for formatting.\n"
+"Inserts a small calendar, where each day links to a wiki page,\n"
+"whose name matches the format set by `wiki`. The current day is\n"
+"highlighted, and days with a due Milestone are marked in bold.\n"
 "\n"
 "Usage:\n"
 "{{{\n"
-"[[WikiCalendar([year, [month, [show-buttons, [wiki-page-format]]]])]]\n"
+"[[WikiCalendar([year, month, nav, wiki, base=<page.name>)]]\n"
 "}}}\n"
 "\n"
-"Arguments:\n"
-" 1. `year` (4-digit year) - defaults to `*` (current year)\n"
-" 1. `month` (2-digit month) - defaults to `*` (current month)\n"
-" 1. `show-buttons` (boolean) - defaults to `true`\n"
-" 1. `wiki-page-format` (string) - defaults to `%Y-%m-%d`\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+"\n"
+"Keyword-only argument:\n"
+" * `base` (page name string) - create new pages from that\n"
+"   template in PageTemplates, defaults to `''` (empty string)\n"
 "\n"
 "Examples:\n"
 "{{{\n"
 "[[WikiCalendar(2006,07,false)]]\n"
 "[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
 "[[WikiCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d,base=MeetingNotes)]]\n"
 "}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:199
+#: wikicalendar/macros.py:207
+#, python-format
 msgid ""
 "Display Milestones and Tickets in a calendar view.\n"
 "\n"
-"displays a calendar, the days link to:\n"
-" - milestones (day in bold) if there is one on that day\n"
-" - a wiki page that has wiki_page_format (if exist)\n"
-" - create that wiki page if it does not exist\n"
-" - use page template (if exist) for new wiki page"
+"Days include links to:\n"
+" * all milestones, that are due on that day\n"
+" * all tickets, that are due on that day\n"
+" * all tickets created on that day (configurable)\n"
+" * one or more wiki pages with name matching the configured format\n"
+"preparing links for creating new wiki pages from a template too\n"
+"\n"
+"Usage:\n"
+"{{{\n"
+"[[WikiTicketCalendar(year, month, nav, wiki, cdate, base, query,\n"
+"                     short, width)]]\n"
+"}}}\n"
+"\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+" 1. `cdate` (boolean) - show tickets created on that day too,\n"
+"    defaults to `true`\n"
+" 1. `base` (page name string) - create new pages from that\n"
+"    template in PageTemplates, defaults to `''` (empty string)\n"
+" 1. `query` (valid TracQuery) - including expressions grouped by\n"
+"    AND (OR since 0.12) for general ticket selection, defaults\n"
+"    to `id!=0`\n"
+" 1. `short` (integer) - total ticket count per day, that will have\n"
+"    ticket list display condensed to just ticket numbers, defaults\n"
+"    to `0` (never condense ticket list\n"
+" 1. `width` (valid CSS size), prefixed `+` forces more, defaults\n"
+"    to `100%;`\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(2006,07)]]\n"
+"[[WikiTicketCalendar(2006,07,false)]]\n"
+"[[WikiTicketCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,true,*,true)]]\n"
+"[[WikiTicketCalendar(2006,07,true,Meeting-%Y-%m-%d,true,Meeting)]]\n"
+"}}}\n"
+"\n"
+"Equivalent keyword arguments are available for all but the first\n"
+"two arguments.\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Talk-%Y-%m-%d,base=Talk)]]\n"
+" same as [[WikiTicketCalendar(*,*,true,Talk-%Y-%m-%d,true,Talk)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting-%Y-%m-%d,query=type=task)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,short=6)]]\n"
+"}}}\n"
+"\n"
+"Mixed use of both, simple and keyword arguments is possible, while\n"
+"order of simple arguments (see above) still applies and keyword\n"
+"arguments in-between do not count for positional argument mapping.\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,*,*,true,width=+75%;)]]\n"
+"}}}\n"
+"\n"
+"Keyword-only argument:\n"
+" * `subpages` (list of page names separated by '|') - replace\n"
+"   wiki page link per day with one link per sub-page labeled by\n"
+"   first character of sub-page name, defaults to an empty list\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meetings_%Y/%m/%d,\n"
+"                     subpages=Morning|Afternoon)]]\n"
+"}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:247
+#: wikicalendar/macros.py:323
 #, python-format
 msgid "Go to page %s"
 msgstr "%s 페이지로 이동"
 
-#: wikicalendar/macros.py:266
+#: wikicalendar/macros.py:342
 #, python-format
 msgid "Create page %s"
 msgstr "%s 페이지 만들기"

wikicalendar/locale/messages.pot

 msgstr ""
 "Project-Id-Version: WikiCalendarMacro 2.0.1\n"
 "Report-Msgid-Bugs-To: hoff.st@shaas.net\n"
-"POT-Creation-Date: 2013-03-30 21:10+0100\n"
+"POT-Creation-Date: 2013-04-01 01:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.0dev-r482\n"
 
-#. TRANSLATOR: Keep macro doc style formatting here, please.
-#: wikicalendar/macros.py:173
+#. TRANSLATOR: Keep Trac style WikiFormatting here, please.
+#: wikicalendar/macros.py:175
 #, python-format
 msgid ""
-"Inserts a small calendar where each day links to a wiki page,\n"
-"whose name matches `wiki-page-format`. The current day is\n"
-"highlighted, and days with Milestones are marked in bold.\n"
-"This version makes heavy use of CSS for formatting.\n"
+"Inserts a small calendar, where each day links to a wiki page,\n"
+"whose name matches the format set by `wiki`. The current day is\n"
+"highlighted, and days with a due Milestone are marked in bold.\n"
 "\n"
 "Usage:\n"
 "{{{\n"
-"[[WikiCalendar([year, [month, [show-buttons, [wiki-page-format]]]])]]"
-"\n"
+"[[WikiCalendar([year, month, nav, wiki, base=<page.name>)]]\n"
 "}}}\n"
 "\n"
-"Arguments:\n"
-" 1. `year` (4-digit year) - defaults to `*` (current year)\n"
-" 1. `month` (2-digit month) - defaults to `*` (current month)\n"
-" 1. `show-buttons` (boolean) - defaults to `true`\n"
-" 1. `wiki-page-format` (string) - defaults to `%Y-%m-%d`\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+"\n"
+"Keyword-only argument:\n"
+" * `base` (page name string) - create new pages from that\n"
+"   template in PageTemplates, defaults to `''` (empty string)\n"
 "\n"
 "Examples:\n"
 "{{{\n"
 "[[WikiCalendar(2006,07,false)]]\n"
 "[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
 "[[WikiCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d,base=MeetingNotes)]]\n"
 "}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:199
+#: wikicalendar/macros.py:207
+#, python-format
 msgid ""
 "Display Milestones and Tickets in a calendar view.\n"
 "\n"
-"displays a calendar, the days link to:\n"
-" - milestones (day in bold) if there is one on that day\n"
-" - a wiki page that has wiki_page_format (if exist)\n"
-" - create that wiki page if it does not exist\n"
-" - use page template (if exist) for new wiki page"
+"Days include links to:\n"
+" * all milestones, that are due on that day\n"
+" * all tickets, that are due on that day\n"
+" * all tickets created on that day (configurable)\n"
+" * one or more wiki pages with name matching the configured format\n"
+"preparing links for creating new wiki pages from a template too\n"
+"\n"
+"Usage:\n"
+"{{{\n"
+"[[WikiTicketCalendar(year, month, nav, wiki, cdate, base, query,\n"
+"                     short, width)]]\n"
+"}}}\n"
+"\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+" 1. `cdate` (boolean) - show tickets created on that day too,\n"
+"    defaults to `true`\n"
+" 1. `base` (page name string) - create new pages from that\n"
+"    template in PageTemplates, defaults to `''` (empty string)\n"
+" 1. `query` (valid TracQuery) - including expressions grouped by\n"
+"    AND (OR since 0.12) for general ticket selection, defaults\n"
+"    to `id!=0`\n"
+" 1. `short` (integer) - total ticket count per day, that will have\n"
+"    ticket list display condensed to just ticket numbers, defaults\n"
+"    to `0` (never condense ticket list\n"
+" 1. `width` (valid CSS size), prefixed `+` forces more, defaults\n"
+"    to `100%;`\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(2006,07)]]\n"
+"[[WikiTicketCalendar(2006,07,false)]]\n"
+"[[WikiTicketCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,true,*,true)]]\n"
+"[[WikiTicketCalendar(2006,07,true,Meeting-%Y-%m-%d,true,Meeting)]]\n"
+"}}}\n"
+"\n"
+"Equivalent keyword arguments are available for all but the first\n"
+"two arguments.\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Talk-%Y-%m-%d,base=Talk)]]\n"
+" same as [[WikiTicketCalendar(*,*,true,Talk-%Y-%m-%d,true,Talk)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting-%Y-%m-%d,query=type=task)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,short=6)]]\n"
+"}}}\n"
+"\n"
+"Mixed use of both, simple and keyword arguments is possible, while\n"
+"order of simple arguments (see above) still applies and keyword\n"
+"arguments in-between do not count for positional argument mapping.\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,*,*,true,width=+75%;)]]\n"
+"}}}\n"
+"\n"
+"Keyword-only argument:\n"
+" * `subpages` (list of page names separated by '|') - replace\n"
+"   wiki page link per day with one link per sub-page labeled by\n"
+"   first character of sub-page name, defaults to an empty list\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meetings_%Y/%m/%d,\n"
+"                     subpages=Morning|Afternoon)]]\n"
+"}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:247
+#: wikicalendar/macros.py:323
 #, python-format
 msgid "Go to page %s"
 msgstr ""
 
-#: wikicalendar/macros.py:266
+#: wikicalendar/macros.py:342
 #, python-format
 msgid "Create page %s"
 msgstr ""

wikicalendar/locale/nl/LC_MESSAGES/wikicalendar.po

 msgstr ""
 "Project-Id-Version: WikiCalendarMacro 2.0\n"
 "Report-Msgid-Bugs-To: hoff.st@shaas.net\n"
-"POT-Creation-Date: 2013-03-30 21:10+0100\n"
+"POT-Creation-Date: 2013-04-01 01:18+0200\n"
 "PO-Revision-Date: 2012-02-14 09:38+0000\n"
 "Last-Translator: Pander <pander@users.sourceforge.net>\n"
 "Language-Team: Dutch <trac-dev@googlegroups.com>\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.0dev-r482\n"
 
-#. TRANSLATOR: Keep macro doc style formatting here, please.
-#: wikicalendar/macros.py:173
+#. TRANSLATOR: Keep Trac style WikiFormatting here, please.
+#: wikicalendar/macros.py:175
 #, python-format
 msgid ""
-"Inserts a small calendar where each day links to a wiki page,\n"
-"whose name matches `wiki-page-format`. The current day is\n"
-"highlighted, and days with Milestones are marked in bold.\n"
-"This version makes heavy use of CSS for formatting.\n"
+"Inserts a small calendar, where each day links to a wiki page,\n"
+"whose name matches the format set by `wiki`. The current day is\n"
+"highlighted, and days with a due Milestone are marked in bold.\n"
 "\n"
 "Usage:\n"
 "{{{\n"
-"[[WikiCalendar([year, [month, [show-buttons, [wiki-page-format]]]])]]\n"
+"[[WikiCalendar([year, month, nav, wiki, base=<page.name>)]]\n"
 "}}}\n"
 "\n"
-"Arguments:\n"
-" 1. `year` (4-digit year) - defaults to `*` (current year)\n"
-" 1. `month` (2-digit month) - defaults to `*` (current month)\n"
-" 1. `show-buttons` (boolean) - defaults to `true`\n"
-" 1. `wiki-page-format` (string) - defaults to `%Y-%m-%d`\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+"\n"
+"Keyword-only argument:\n"
+" * `base` (page name string) - create new pages from that\n"
+"   template in PageTemplates, defaults to `''` (empty string)\n"
 "\n"
 "Examples:\n"
 "{{{\n"
 "[[WikiCalendar(2006,07,false)]]\n"
 "[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
 "[[WikiCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d,base=MeetingNotes)]]\n"
 "}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:199
+#: wikicalendar/macros.py:207
+#, python-format
 msgid ""
 "Display Milestones and Tickets in a calendar view.\n"
 "\n"
-"displays a calendar, the days link to:\n"
-" - milestones (day in bold) if there is one on that day\n"
-" - a wiki page that has wiki_page_format (if exist)\n"
-" - create that wiki page if it does not exist\n"
-" - use page template (if exist) for new wiki page"
+"Days include links to:\n"
+" * all milestones, that are due on that day\n"
+" * all tickets, that are due on that day\n"
+" * all tickets created on that day (configurable)\n"
+" * one or more wiki pages with name matching the configured format\n"
+"preparing links for creating new wiki pages from a template too\n"
+"\n"
+"Usage:\n"
+"{{{\n"
+"[[WikiTicketCalendar(year, month, nav, wiki, cdate, base, query,\n"
+"                     short, width)]]\n"
+"}}}\n"
+"\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+" 1. `cdate` (boolean) - show tickets created on that day too,\n"
+"    defaults to `true`\n"
+" 1. `base` (page name string) - create new pages from that\n"
+"    template in PageTemplates, defaults to `''` (empty string)\n"
+" 1. `query` (valid TracQuery) - including expressions grouped by\n"
+"    AND (OR since 0.12) for general ticket selection, defaults\n"
+"    to `id!=0`\n"
+" 1. `short` (integer) - total ticket count per day, that will have\n"
+"    ticket list display condensed to just ticket numbers, defaults\n"
+"    to `0` (never condense ticket list\n"
+" 1. `width` (valid CSS size), prefixed `+` forces more, defaults\n"
+"    to `100%;`\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(2006,07)]]\n"
+"[[WikiTicketCalendar(2006,07,false)]]\n"
+"[[WikiTicketCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,true,*,true)]]\n"
+"[[WikiTicketCalendar(2006,07,true,Meeting-%Y-%m-%d,true,Meeting)]]\n"
+"}}}\n"
+"\n"
+"Equivalent keyword arguments are available for all but the first\n"
+"two arguments.\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Talk-%Y-%m-%d,base=Talk)]]\n"
+" same as [[WikiTicketCalendar(*,*,true,Talk-%Y-%m-%d,true,Talk)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting-%Y-%m-%d,query=type=task)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,short=6)]]\n"
+"}}}\n"
+"\n"
+"Mixed use of both, simple and keyword arguments is possible, while\n"
+"order of simple arguments (see above) still applies and keyword\n"
+"arguments in-between do not count for positional argument mapping.\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,*,*,true,width=+75%;)]]\n"
+"}}}\n"
+"\n"
+"Keyword-only argument:\n"
+" * `subpages` (list of page names separated by '|') - replace\n"
+"   wiki page link per day with one link per sub-page labeled by\n"
+"   first character of sub-page name, defaults to an empty list\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meetings_%Y/%m/%d,\n"
+"                     subpages=Morning|Afternoon)]]\n"
+"}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:247
+#: wikicalendar/macros.py:323
 #, python-format
 msgid "Go to page %s"
 msgstr "Ga naar pagina %s"
 
-#: wikicalendar/macros.py:266
+#: wikicalendar/macros.py:342
 #, python-format
 msgid "Create page %s"
 msgstr "Creëer pagina %s"

wikicalendar/locale/pl/LC_MESSAGES/wikicalendar.po

 msgstr ""
 "Project-Id-Version: WikiCalendarMacro 2.0\n"
 "Report-Msgid-Bugs-To: hoff.st@shaas.net\n"
-"POT-Creation-Date: 2013-03-30 21:10+0100\n"
+"POT-Creation-Date: 2013-04-01 01:18+0200\n"
 "PO-Revision-Date: 2010-06-27 11:07+0000\n"
 "Last-Translator: angular.circle <angular.circle+translation@gmail.com>\n"
 "Language-Team: Polish <pl_PL>\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.0dev-r482\n"
 
-#. TRANSLATOR: Keep macro doc style formatting here, please.
-#: wikicalendar/macros.py:173
+#. TRANSLATOR: Keep Trac style WikiFormatting here, please.
+#: wikicalendar/macros.py:175
 #, python-format
 msgid ""
-"Inserts a small calendar where each day links to a wiki page,\n"
-"whose name matches `wiki-page-format`. The current day is\n"
-"highlighted, and days with Milestones are marked in bold.\n"
-"This version makes heavy use of CSS for formatting.\n"
+"Inserts a small calendar, where each day links to a wiki page,\n"
+"whose name matches the format set by `wiki`. The current day is\n"
+"highlighted, and days with a due Milestone are marked in bold.\n"
 "\n"
 "Usage:\n"
 "{{{\n"
-"[[WikiCalendar([year, [month, [show-buttons, [wiki-page-format]]]])]]\n"
+"[[WikiCalendar([year, month, nav, wiki, base=<page.name>)]]\n"
 "}}}\n"
 "\n"
-"Arguments:\n"
-" 1. `year` (4-digit year) - defaults to `*` (current year)\n"
-" 1. `month` (2-digit month) - defaults to `*` (current month)\n"
-" 1. `show-buttons` (boolean) - defaults to `true`\n"
-" 1. `wiki-page-format` (string) - defaults to `%Y-%m-%d`\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+"\n"
+"Keyword-only argument:\n"
+" * `base` (page name string) - create new pages from that\n"
+"   template in PageTemplates, defaults to `''` (empty string)\n"
 "\n"
 "Examples:\n"
 "{{{\n"
 "[[WikiCalendar(2006,07,false)]]\n"
 "[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
 "[[WikiCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d,base=MeetingNotes)]]\n"
 "}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:199
+#: wikicalendar/macros.py:207
+#, python-format
 msgid ""
 "Display Milestones and Tickets in a calendar view.\n"
 "\n"
-"displays a calendar, the days link to:\n"
-" - milestones (day in bold) if there is one on that day\n"
-" - a wiki page that has wiki_page_format (if exist)\n"
-" - create that wiki page if it does not exist\n"
-" - use page template (if exist) for new wiki page"
+"Days include links to:\n"
+" * all milestones, that are due on that day\n"
+" * all tickets, that are due on that day\n"
+" * all tickets created on that day (configurable)\n"
+" * one or more wiki pages with name matching the configured format\n"
+"preparing links for creating new wiki pages from a template too\n"
+"\n"
+"Usage:\n"
+"{{{\n"
+"[[WikiTicketCalendar(year, month, nav, wiki, cdate, base, query,\n"
+"                     short, width)]]\n"
+"}}}\n"
+"\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+" 1. `cdate` (boolean) - show tickets created on that day too,\n"
+"    defaults to `true`\n"
+" 1. `base` (page name string) - create new pages from that\n"
+"    template in PageTemplates, defaults to `''` (empty string)\n"
+" 1. `query` (valid TracQuery) - including expressions grouped by\n"
+"    AND (OR since 0.12) for general ticket selection, defaults\n"
+"    to `id!=0`\n"
+" 1. `short` (integer) - total ticket count per day, that will have\n"
+"    ticket list display condensed to just ticket numbers, defaults\n"
+"    to `0` (never condense ticket list\n"
+" 1. `width` (valid CSS size), prefixed `+` forces more, defaults\n"
+"    to `100%;`\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(2006,07)]]\n"
+"[[WikiTicketCalendar(2006,07,false)]]\n"
+"[[WikiTicketCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,true,*,true)]]\n"
+"[[WikiTicketCalendar(2006,07,true,Meeting-%Y-%m-%d,true,Meeting)]]\n"
+"}}}\n"
+"\n"
+"Equivalent keyword arguments are available for all but the first\n"
+"two arguments.\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Talk-%Y-%m-%d,base=Talk)]]\n"
+" same as [[WikiTicketCalendar(*,*,true,Talk-%Y-%m-%d,true,Talk)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting-%Y-%m-%d,query=type=task)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,short=6)]]\n"
+"}}}\n"
+"\n"
+"Mixed use of both, simple and keyword arguments is possible, while\n"
+"order of simple arguments (see above) still applies and keyword\n"
+"arguments in-between do not count for positional argument mapping.\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,*,*,true,width=+75%;)]]\n"
+"}}}\n"
+"\n"
+"Keyword-only argument:\n"
+" * `subpages` (list of page names separated by '|') - replace\n"
+"   wiki page link per day with one link per sub-page labeled by\n"
+"   first character of sub-page name, defaults to an empty list\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meetings_%Y/%m/%d,\n"
+"                     subpages=Morning|Afternoon)]]\n"
+"}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:247
+#: wikicalendar/macros.py:323
 #, python-format
 msgid "Go to page %s"
 msgstr "Przejdź do strony %s"
 
-#: wikicalendar/macros.py:266
+#: wikicalendar/macros.py:342
 #, python-format
 msgid "Create page %s"
 msgstr "Utwórz stronę %s"

wikicalendar/locale/ru/LC_MESSAGES/wikicalendar.po

 msgstr ""
 "Project-Id-Version: WikiCalendarMacro 2.0\n"
 "Report-Msgid-Bugs-To: hoff.st@shaas.net\n"
-"POT-Creation-Date: 2013-03-30 21:10+0100\n"
+"POT-Creation-Date: 2013-04-01 01:18+0200\n"
 "PO-Revision-Date: 2010-11-30 05:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <trac-dev@googlegroups.com>\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.0dev-r482\n"
 
-#. TRANSLATOR: Keep macro doc style formatting here, please.
-#: wikicalendar/macros.py:173
+#. TRANSLATOR: Keep Trac style WikiFormatting here, please.
+#: wikicalendar/macros.py:175
 #, python-format
 msgid ""
-"Inserts a small calendar where each day links to a wiki page,\n"
-"whose name matches `wiki-page-format`. The current day is\n"
-"highlighted, and days with Milestones are marked in bold.\n"
-"This version makes heavy use of CSS for formatting.\n"
+"Inserts a small calendar, where each day links to a wiki page,\n"
+"whose name matches the format set by `wiki`. The current day is\n"
+"highlighted, and days with a due Milestone are marked in bold.\n"
 "\n"
 "Usage:\n"
 "{{{\n"
-"[[WikiCalendar([year, [month, [show-buttons, [wiki-page-format]]]])]]\n"
+"[[WikiCalendar([year, month, nav, wiki, base=<page.name>)]]\n"
 "}}}\n"
 "\n"
-"Arguments:\n"
-" 1. `year` (4-digit year) - defaults to `*` (current year)\n"
-" 1. `month` (2-digit month) - defaults to `*` (current month)\n"
-" 1. `show-buttons` (boolean) - defaults to `true`\n"
-" 1. `wiki-page-format` (string) - defaults to `%Y-%m-%d`\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+"\n"
+"Keyword-only argument:\n"
+" * `base` (page name string) - create new pages from that\n"
+"   template in PageTemplates, defaults to `''` (empty string)\n"
 "\n"
 "Examples:\n"
 "{{{\n"
 "[[WikiCalendar(2006,07,false)]]\n"
 "[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
 "[[WikiCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d,base=MeetingNotes)]]\n"
 "}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:199
+#: wikicalendar/macros.py:207
+#, python-format
 msgid ""
 "Display Milestones and Tickets in a calendar view.\n"
 "\n"
-"displays a calendar, the days link to:\n"
-" - milestones (day in bold) if there is one on that day\n"
-" - a wiki page that has wiki_page_format (if exist)\n"
-" - create that wiki page if it does not exist\n"
-" - use page template (if exist) for new wiki page"
+"Days include links to:\n"
+" * all milestones, that are due on that day\n"
+" * all tickets, that are due on that day\n"
+" * all tickets created on that day (configurable)\n"
+" * one or more wiki pages with name matching the configured format\n"
+"preparing links for creating new wiki pages from a template too\n"
+"\n"
+"Usage:\n"
+"{{{\n"
+"[[WikiTicketCalendar(year, month, nav, wiki, cdate, base, query,\n"
+"                     short, width)]]\n"
+"}}}\n"
+"\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+" 1. `cdate` (boolean) - show tickets created on that day too,\n"
+"    defaults to `true`\n"
+" 1. `base` (page name string) - create new pages from that\n"
+"    template in PageTemplates, defaults to `''` (empty string)\n"
+" 1. `query` (valid TracQuery) - including expressions grouped by\n"
+"    AND (OR since 0.12) for general ticket selection, defaults\n"
+"    to `id!=0`\n"
+" 1. `short` (integer) - total ticket count per day, that will have\n"
+"    ticket list display condensed to just ticket numbers, defaults\n"
+"    to `0` (never condense ticket list\n"
+" 1. `width` (valid CSS size), prefixed `+` forces more, defaults\n"
+"    to `100%;`\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(2006,07)]]\n"
+"[[WikiTicketCalendar(2006,07,false)]]\n"
+"[[WikiTicketCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,true,*,true)]]\n"
+"[[WikiTicketCalendar(2006,07,true,Meeting-%Y-%m-%d,true,Meeting)]]\n"
+"}}}\n"
+"\n"
+"Equivalent keyword arguments are available for all but the first\n"
+"two arguments.\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Talk-%Y-%m-%d,base=Talk)]]\n"
+" same as [[WikiTicketCalendar(*,*,true,Talk-%Y-%m-%d,true,Talk)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting-%Y-%m-%d,query=type=task)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,short=6)]]\n"
+"}}}\n"
+"\n"
+"Mixed use of both, simple and keyword arguments is possible, while\n"
+"order of simple arguments (see above) still applies and keyword\n"
+"arguments in-between do not count for positional argument mapping.\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,*,*,true,width=+75%;)]]\n"
+"}}}\n"
+"\n"
+"Keyword-only argument:\n"
+" * `subpages` (list of page names separated by '|') - replace\n"
+"   wiki page link per day with one link per sub-page labeled by\n"
+"   first character of sub-page name, defaults to an empty list\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meetings_%Y/%m/%d,\n"
+"                     subpages=Morning|Afternoon)]]\n"
+"}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:247
+#: wikicalendar/macros.py:323
 #, python-format
 msgid "Go to page %s"
 msgstr "Перейти на страницу %s"
 
-#: wikicalendar/macros.py:266
+#: wikicalendar/macros.py:342
 #, python-format
 msgid "Create page %s"
 msgstr "Создать страницу %s"

wikicalendar/locale/te/LC_MESSAGES/wikicalendar.po

 msgstr ""
 "Project-Id-Version: WikiCalendarMacro 2.0\n"
 "Report-Msgid-Bugs-To: hoff.st@shaas.net\n"
-"POT-Creation-Date: 2013-03-30 21:10+0100\n"
+"POT-Creation-Date: 2013-04-01 01:18+0200\n"
 "PO-Revision-Date: 2012-02-14 09:38+0000\n"
 "Last-Translator: వీవెన్ <veeven@gmail.com>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/Trac_Plugin-"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.0dev-r482\n"
 
-#. TRANSLATOR: Keep macro doc style formatting here, please.
-#: wikicalendar/macros.py:173
+#. TRANSLATOR: Keep Trac style WikiFormatting here, please.
+#: wikicalendar/macros.py:175
 #, python-format
 msgid ""
-"Inserts a small calendar where each day links to a wiki page,\n"
-"whose name matches `wiki-page-format`. The current day is\n"
-"highlighted, and days with Milestones are marked in bold.\n"
-"This version makes heavy use of CSS for formatting.\n"
+"Inserts a small calendar, where each day links to a wiki page,\n"
+"whose name matches the format set by `wiki`. The current day is\n"
+"highlighted, and days with a due Milestone are marked in bold.\n"
 "\n"
 "Usage:\n"
 "{{{\n"
-"[[WikiCalendar([year, [month, [show-buttons, [wiki-page-format]]]])]]\n"
+"[[WikiCalendar([year, month, nav, wiki, base=<page.name>)]]\n"
 "}}}\n"
 "\n"
-"Arguments:\n"
-" 1. `year` (4-digit year) - defaults to `*` (current year)\n"
-" 1. `month` (2-digit month) - defaults to `*` (current month)\n"
-" 1. `show-buttons` (boolean) - defaults to `true`\n"
-" 1. `wiki-page-format` (string) - defaults to `%Y-%m-%d`\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+"\n"
+"Keyword-only argument:\n"
+" * `base` (page name string) - create new pages from that\n"
+"   template in PageTemplates, defaults to `''` (empty string)\n"
 "\n"
 "Examples:\n"
 "{{{\n"
 "[[WikiCalendar(2006,07,false)]]\n"
 "[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
 "[[WikiCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiCalendar(*,*,true,Meeting-%Y-%m-%d,base=MeetingNotes)]]\n"
 "}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:199
+#: wikicalendar/macros.py:207
+#, python-format
 msgid ""
 "Display Milestones and Tickets in a calendar view.\n"
 "\n"
-"displays a calendar, the days link to:\n"
-" - milestones (day in bold) if there is one on that day\n"
-" - a wiki page that has wiki_page_format (if exist)\n"
-" - create that wiki page if it does not exist\n"
-" - use page template (if exist) for new wiki page"
+"Days include links to:\n"
+" * all milestones, that are due on that day\n"
+" * all tickets, that are due on that day\n"
+" * all tickets created on that day (configurable)\n"
+" * one or more wiki pages with name matching the configured format\n"
+"preparing links for creating new wiki pages from a template too\n"
+"\n"
+"Usage:\n"
+"{{{\n"
+"[[WikiTicketCalendar(year, month, nav, wiki, cdate, base, query,\n"
+"                     short, width)]]\n"
+"}}}\n"
+"\n"
+"Arguments (all optional, but positional - order matters):\n"
+" 1. `year` (4-digit year), defaults to `*` (current year)\n"
+" 1. `month` (2-digit month), defaults to `*` (current month)\n"
+" 1. `nav` (boolean) - show previous/next navigation, defaults to\n"
+"    `true`\n"
+" 1. `wiki` (valid strftime expression) - page name format,\n"
+"    defaults to `%Y-%m-%d`\n"
+" 1. `cdate` (boolean) - show tickets created on that day too,\n"
+"    defaults to `true`\n"
+" 1. `base` (page name string) - create new pages from that\n"
+"    template in PageTemplates, defaults to `''` (empty string)\n"
+" 1. `query` (valid TracQuery) - including expressions grouped by\n"
+"    AND (OR since 0.12) for general ticket selection, defaults\n"
+"    to `id!=0`\n"
+" 1. `short` (integer) - total ticket count per day, that will have\n"
+"    ticket list display condensed to just ticket numbers, defaults\n"
+"    to `0` (never condense ticket list\n"
+" 1. `width` (valid CSS size), prefixed `+` forces more, defaults\n"
+"    to `100%;`\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(2006,07)]]\n"
+"[[WikiTicketCalendar(2006,07,false)]]\n"
+"[[WikiTicketCalendar(*,*,true,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,false,Meeting-%Y-%m-%d)]]\n"
+"[[WikiTicketCalendar(2006,07,true,*,true)]]\n"
+"[[WikiTicketCalendar(2006,07,true,Meeting-%Y-%m-%d,true,Meeting)]]\n"
+"}}}\n"
+"\n"
+"Equivalent keyword arguments are available for all but the first\n"
+"two arguments.\n"
+"\n"
+"Examples:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Talk-%Y-%m-%d,base=Talk)]]\n"
+" same as [[WikiTicketCalendar(*,*,true,Talk-%Y-%m-%d,true,Talk)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting-%Y-%m-%d,query=type=task)]]\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,short=6)]]\n"
+"}}}\n"
+"\n"
+"Mixed use of both, simple and keyword arguments is possible, while\n"
+"order of simple arguments (see above) still applies and keyword\n"
+"arguments in-between do not count for positional argument mapping.\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meeting_%Y/%m/%d,*,*,true,width=+75%;)]]\n"
+"}}}\n"
+"\n"
+"Keyword-only argument:\n"
+" * `subpages` (list of page names separated by '|') - replace\n"
+"   wiki page link per day with one link per sub-page labeled by\n"
+"   first character of sub-page name, defaults to an empty list\n"
+"\n"
+"Example:\n"
+"{{{\n"
+"[[WikiTicketCalendar(wiki=Meetings_%Y/%m/%d,\n"
+"                     subpages=Morning|Afternoon)]]\n"
+"}}}"
 msgstr ""
 
-#: wikicalendar/macros.py:247
+#: wikicalendar/macros.py:323
 #, python-format
 msgid "Go to page %s"
 msgstr "%s పుటకి వెళ్ళండి"
 
-#: wikicalendar/macros.py:266
+#: wikicalendar/macros.py:342
 #, python-format
 msgid "Create page %s"
 msgstr "%s పుటను సృష్టించండి"