Merge from area51 repository:

- Update to 2.5.5
- Convert to new options framework
- minor cleanups

Courtesy of:	avilla

1 files changed, 68 insertions, 0 deletions

diff --git a/editors/calligra-l10n-nl/pkg-plist b/editors/calligra-l10n-nl/pkg-plist
index 60e6fc58df01..b7e75126f145 100644
--- a/editors/calligra-l10n-nl/pkg-plist
+++ b/editors/calligra-l10n-nl/pkg-plist
@@ -27,6 +27,73 @@ share/doc/HTML/nl/sheets/shortcut2.png
 share/doc/HTML/nl/sheets/shortcut3.png
 share/doc/HTML/nl/sheets/sort1.png
 share/doc/HTML/nl/sheets/starting1.png
+share/doc/HTML/nl/stage/barstyle1.png
+share/doc/HTML/nl/stage/barstyle2.png
+share/doc/HTML/nl/stage/barstyle3.png
+share/doc/HTML/nl/stage/barstyle4.png
+share/doc/HTML/nl/stage/barstyle5.png
+share/doc/HTML/nl/stage/barstyle6.png
+share/doc/HTML/nl/stage/barstyle7.png
+share/doc/HTML/nl/stage/common
+share/doc/HTML/nl/stage/great-presentations.docbook
+share/doc/HTML/nl/stage/guides.docbook
+share/doc/HTML/nl/stage/htmlshow00.png
+share/doc/HTML/nl/stage/htmlshow01.png
+share/doc/HTML/nl/stage/htmlshow02.png
+share/doc/HTML/nl/stage/htmlshow02a.png
+share/doc/HTML/nl/stage/htmlshow03.png
+share/doc/HTML/nl/stage/htmlshow04.png
+share/doc/HTML/nl/stage/htmlshow05.png
+share/doc/HTML/nl/stage/htmlshow07.png
+share/doc/HTML/nl/stage/index.cache.bz2
+share/doc/HTML/nl/stage/index.docbook
+share/doc/HTML/nl/stage/menus.docbook
+share/doc/HTML/nl/stage/msexport1.png
+share/doc/HTML/nl/stage/msexport2.png
+share/doc/HTML/nl/stage/msexport3.png
+share/doc/HTML/nl/stage/msexport4.png
+share/doc/HTML/nl/stage/options.docbook
+share/doc/HTML/nl/stage/settings01.png
+share/doc/HTML/nl/stage/settings03.png
+share/doc/HTML/nl/stage/settings04.png
+share/doc/HTML/nl/stage/settings05.png
+share/doc/HTML/nl/stage/settings06.png
+share/doc/HTML/nl/stage/template02.png
+share/doc/HTML/nl/stage/template03.png
+share/doc/HTML/nl/stage/template04.png
+share/doc/HTML/nl/stage/template05.png
+share/doc/HTML/nl/stage/template06.png
+share/doc/HTML/nl/stage/template07.png
+share/doc/HTML/nl/stage/textmenu01.png
+share/doc/HTML/nl/stage/textmenu02.png
+share/doc/HTML/nl/stage/textmenu03.png
+share/doc/HTML/nl/stage/textmenu03a.png
+share/doc/HTML/nl/stage/textmenu04.png
+share/doc/HTML/nl/stage/toolsmenu01.png
+share/doc/HTML/nl/stage/tut01.png
+share/doc/HTML/nl/stage/tut02.png
+share/doc/HTML/nl/stage/tut03.png
+share/doc/HTML/nl/stage/tut04.png
+share/doc/HTML/nl/stage/tut05.png
+share/doc/HTML/nl/stage/tut06.png
+share/doc/HTML/nl/stage/tut07.png
+share/doc/HTML/nl/stage/tut08.png
+share/doc/HTML/nl/stage/tut09.png
+share/doc/HTML/nl/stage/tut10.png
+share/doc/HTML/nl/stage/tut11.png
+share/doc/HTML/nl/stage/tut12.png
+share/doc/HTML/nl/stage/tut13.png
+share/doc/HTML/nl/stage/tut14.png
+share/doc/HTML/nl/stage/tut15.png
+share/doc/HTML/nl/stage/tut16.png
+share/doc/HTML/nl/stage/tut17.png
+share/doc/HTML/nl/stage/tut18.png
+share/doc/HTML/nl/stage/tut19.png
+share/doc/HTML/nl/stage/tut20.png
+share/doc/HTML/nl/stage/tut21.png
+share/doc/HTML/nl/stage/tut22.png
+share/doc/HTML/nl/stage/tut23.png
+share/doc/HTML/nl/stage/tutorial.docbook
 share/locale/nl/LC_MESSAGES/ArtisticTextShape.mo
 share/locale/nl/LC_MESSAGES/AutocorrectPlugin.mo
 share/locale/nl/LC_MESSAGES/CalendarTool.mo
@@ -82,6 +149,7 @@ share/locale/nl/LC_MESSAGES/stage.mo
 share/locale/nl/LC_MESSAGES/tablessolver.mo
 share/locale/nl/LC_MESSAGES/thesaurus_tool.mo
 share/locale/nl/LC_MESSAGES/words.mo
+@dirrm share/doc/HTML/nl/stage
 @dirrm share/doc/HTML/nl/sheets
 @dirrm share/doc/HTML/nl/kexi
 @dirrm share/doc/HTML/nl/calligra