SF.net SVN: geany-plugins:[2106] trunk/geany-plugins

Revision: 2106 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2106&view=re... Author: ctabin Date: 2011-07-22 14:28:09 +0000 (Fri, 22 Jul 2011)

Log Message: ----------- XML Pretty-Printer: alignment option

Modified Paths: -------------- trunk/geany-plugins/po/be.po trunk/geany-plugins/po/ca.po trunk/geany-plugins/po/da.po trunk/geany-plugins/po/de.po trunk/geany-plugins/po/es.po trunk/geany-plugins/po/fr.po trunk/geany-plugins/po/gl.po trunk/geany-plugins/po/ja.po trunk/geany-plugins/po/pt.po trunk/geany-plugins/po/pt_BR.po trunk/geany-plugins/po/ru.po trunk/geany-plugins/po/tr.po trunk/geany-plugins/po/zh_CN.po trunk/geany-plugins/pretty-printer/src/ConfigUI.c trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c trunk/geany-plugins/pretty-printer/src/PrettyPrinter.h

Modified: trunk/geany-plugins/po/be.po =================================================================== --- trunk/geany-plugins/po/be.po 2011-07-22 13:31:33 UTC (rev 2105) +++ trunk/geany-plugins/po/be.po 2011-07-22 14:28:09 UTC (rev 2106) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: geany-plugins 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-22 14:52+0200\n" +"POT-Creation-Date: 2011-07-22 16:21+0200\n" "PO-Revision-Date: 2009-06-11 10:15+0200\n" "Last-Translator: Yura Siamshka yurand2@gmail.com>\n" "Language-Team: Belarusian geany-i18n@uvena.de\n" @@ -3773,57 +3773,61 @@ msgid "Find in Files" msgstr "Знайсьці і праэкце"

-#: ../pretty-printer/src/ConfigUI.c:58 +#: ../pretty-printer/src/ConfigUI.c:61 msgid "Comments" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Put on one line" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Inline if possible" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:59 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +msgid "Alignment" +msgstr "" + +#: ../pretty-printer/src/ConfigUI.c:62 msgid "Text nodes" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "CDATA" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:139 +#: ../pretty-printer/src/ConfigUI.c:191 msgid "Empty nodes" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:140 +#: ../pretty-printer/src/ConfigUI.c:192 msgid "Concatenation (<x></x> to <x/>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:141 +#: ../pretty-printer/src/ConfigUI.c:193 msgid "Spacing (<x/> to <x />)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:142 +#: ../pretty-printer/src/ConfigUI.c:194 msgid "Expansion (<x/> to <x></x>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:169 +#: ../pretty-printer/src/ConfigUI.c:221 msgid "Indentation" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:173 +#: ../pretty-printer/src/ConfigUI.c:225 msgid "Tab" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:174 +#: ../pretty-printer/src/ConfigUI.c:226 msgid "Space" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:198 +#: ../pretty-printer/src/ConfigUI.c:250 msgid "Line break" msgstr ""

Modified: trunk/geany-plugins/po/ca.po =================================================================== --- trunk/geany-plugins/po/ca.po 2011-07-22 13:31:33 UTC (rev 2105) +++ trunk/geany-plugins/po/ca.po 2011-07-22 14:28:09 UTC (rev 2106) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-22 14:52+0200\n" +"POT-Creation-Date: 2011-07-22 16:21+0200\n" "PO-Revision-Date: 2009-10-18 20:24+0100\n" "Last-Translator: Toni Garcia-Navarro topi@elpiset.net\n" "Language-Team: ca topi@elpiset.net\n" @@ -3795,58 +3795,62 @@ msgid "Find in Files" msgstr "Cerca en el Projecte"

-#: ../pretty-printer/src/ConfigUI.c:58 +#: ../pretty-printer/src/ConfigUI.c:61 msgid "Comments" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Put on one line" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Inline if possible" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:59 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +msgid "Alignment" +msgstr "" + +#: ../pretty-printer/src/ConfigUI.c:62 msgid "Text nodes" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "CDATA" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:139 +#: ../pretty-printer/src/ConfigUI.c:191 msgid "Empty nodes" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:140 +#: ../pretty-printer/src/ConfigUI.c:192 msgid "Concatenation (<x></x> to <x/>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:141 +#: ../pretty-printer/src/ConfigUI.c:193 msgid "Spacing (<x/> to <x />)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:142 +#: ../pretty-printer/src/ConfigUI.c:194 msgid "Expansion (<x/> to <x></x>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:169 +#: ../pretty-printer/src/ConfigUI.c:221 #, fuzzy msgid "Indentation" msgstr "Navegació del codi"

-#: ../pretty-printer/src/ConfigUI.c:173 +#: ../pretty-printer/src/ConfigUI.c:225 msgid "Tab" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:174 +#: ../pretty-printer/src/ConfigUI.c:226 msgid "Space" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:198 +#: ../pretty-printer/src/ConfigUI.c:250 msgid "Line break" msgstr ""

Modified: trunk/geany-plugins/po/da.po =================================================================== --- trunk/geany-plugins/po/da.po 2011-07-22 13:31:33 UTC (rev 2105) +++ trunk/geany-plugins/po/da.po 2011-07-22 14:28:09 UTC (rev 2106) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: geany-plugins 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-22 14:52+0200\n" +"POT-Creation-Date: 2011-07-22 16:21+0200\n" "PO-Revision-Date: 2009-06-11 10:15+0200\n" "Last-Translator: Andrew L Janke a.janke@gmail.com\n" "Language-Team: Danish geany-i18n@uvena.de\n" @@ -3718,57 +3718,61 @@ msgid "Find in Files" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 +#: ../pretty-printer/src/ConfigUI.c:61 msgid "Comments" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Put on one line" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Inline if possible" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:59 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +msgid "Alignment" +msgstr "" + +#: ../pretty-printer/src/ConfigUI.c:62 msgid "Text nodes" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "CDATA" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:139 +#: ../pretty-printer/src/ConfigUI.c:191 msgid "Empty nodes" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:140 +#: ../pretty-printer/src/ConfigUI.c:192 msgid "Concatenation (<x></x> to <x/>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:141 +#: ../pretty-printer/src/ConfigUI.c:193 msgid "Spacing (<x/> to <x />)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:142 +#: ../pretty-printer/src/ConfigUI.c:194 msgid "Expansion (<x/> to <x></x>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:169 +#: ../pretty-printer/src/ConfigUI.c:221 msgid "Indentation" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:173 +#: ../pretty-printer/src/ConfigUI.c:225 msgid "Tab" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:174 +#: ../pretty-printer/src/ConfigUI.c:226 msgid "Space" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:198 +#: ../pretty-printer/src/ConfigUI.c:250 msgid "Line break" msgstr ""

Modified: trunk/geany-plugins/po/de.po =================================================================== --- trunk/geany-plugins/po/de.po 2011-07-22 13:31:33 UTC (rev 2105) +++ trunk/geany-plugins/po/de.po 2011-07-22 14:28:09 UTC (rev 2106) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: geany-plugins 0.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-22 14:52+0200\n" +"POT-Creation-Date: 2011-07-22 16:21+0200\n" "PO-Revision-Date: 2011-06-22 00:07+0100\n" "Last-Translator: Frank Lanitz frank@frank.uvena.de\n" "Language-Team: German geany-i18n@uvena.de\n" @@ -3949,61 +3949,66 @@ msgid "Find in Files" msgstr "Im Projekt suchen"

-#: ../pretty-printer/src/ConfigUI.c:58 +#: ../pretty-printer/src/ConfigUI.c:61 #, fuzzy msgid "Comments" msgstr "Inhalte"

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Put on one line" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Inline if possible" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:59 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#, fuzzy +msgid "Alignment" +msgstr "Argumente" + +#: ../pretty-printer/src/ConfigUI.c:62 msgid "Text nodes" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "CDATA" msgstr ""

# what the heck? :D -#: ../pretty-printer/src/ConfigUI.c:139 +#: ../pretty-printer/src/ConfigUI.c:191 #, fuzzy msgid "Empty nodes" msgstr "(Leere Zeile)"

-#: ../pretty-printer/src/ConfigUI.c:140 +#: ../pretty-printer/src/ConfigUI.c:192 msgid "Concatenation (<x></x> to <x/>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:141 +#: ../pretty-printer/src/ConfigUI.c:193 msgid "Spacing (<x/> to <x />)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:142 +#: ../pretty-printer/src/ConfigUI.c:194 msgid "Expansion (<x/> to <x></x>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:169 +#: ../pretty-printer/src/ConfigUI.c:221 #, fuzzy msgid "Indentation" msgstr "Präsentation"

-#: ../pretty-printer/src/ConfigUI.c:173 +#: ../pretty-printer/src/ConfigUI.c:225 msgid "Tab" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:174 +#: ../pretty-printer/src/ConfigUI.c:226 msgid "Space" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:198 +#: ../pretty-printer/src/ConfigUI.c:250 msgid "Line break" msgstr ""

Modified: trunk/geany-plugins/po/es.po =================================================================== --- trunk/geany-plugins/po/es.po 2011-07-22 13:31:33 UTC (rev 2105) +++ trunk/geany-plugins/po/es.po 2011-07-22 14:28:09 UTC (rev 2106) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-22 14:52+0200\n" +"POT-Creation-Date: 2011-07-22 16:21+0200\n" "PO-Revision-Date: 2010-12-29 17:10+0100\n" "Last-Translator: \n" "Language-Team: en@li.org\n" @@ -3921,60 +3921,64 @@ msgid "Find in Files" msgstr "Buscar en proyecto"

-#: ../pretty-printer/src/ConfigUI.c:58 +#: ../pretty-printer/src/ConfigUI.c:61 #, fuzzy msgid "Comments" msgstr "Contenido"

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Put on one line" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Inline if possible" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:59 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +msgid "Alignment" +msgstr "" + +#: ../pretty-printer/src/ConfigUI.c:62 msgid "Text nodes" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "CDATA" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:139 +#: ../pretty-printer/src/ConfigUI.c:191 #, fuzzy msgid "Empty nodes" msgstr "(Línea vacía)"

-#: ../pretty-printer/src/ConfigUI.c:140 +#: ../pretty-printer/src/ConfigUI.c:192 msgid "Concatenation (<x></x> to <x/>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:141 +#: ../pretty-printer/src/ConfigUI.c:193 msgid "Spacing (<x/> to <x />)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:142 +#: ../pretty-printer/src/ConfigUI.c:194 msgid "Expansion (<x/> to <x></x>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:169 +#: ../pretty-printer/src/ConfigUI.c:221 #, fuzzy msgid "Indentation" msgstr "Presentación"

-#: ../pretty-printer/src/ConfigUI.c:173 +#: ../pretty-printer/src/ConfigUI.c:225 msgid "Tab" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:174 +#: ../pretty-printer/src/ConfigUI.c:226 msgid "Space" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:198 +#: ../pretty-printer/src/ConfigUI.c:250 msgid "Line break" msgstr ""

Modified: trunk/geany-plugins/po/fr.po =================================================================== --- trunk/geany-plugins/po/fr.po 2011-07-22 13:31:33 UTC (rev 2105) +++ trunk/geany-plugins/po/fr.po 2011-07-22 14:28:09 UTC (rev 2106) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: geany-plugins 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-22 14:52+0200\n" +"POT-Creation-Date: 2011-07-22 16:21+0200\n" "PO-Revision-Date: 2009-07-20 20:02+0100\n" "Last-Translator: Lionel Fuentes funto66@gmail.com\n" "Language-Team: French geany-i18n@uvena.de\n" @@ -3787,57 +3787,61 @@ msgid "Find in Files" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 +#: ../pretty-printer/src/ConfigUI.c:61 msgid "Comments" msgstr "Commentaires"

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Put on one line" msgstr "Mettre sur une ligne"

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Inline if possible" msgstr "Inliner si possible"

-#: ../pretty-printer/src/ConfigUI.c:59 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +msgid "Alignment" +msgstr "Alignement" + +#: ../pretty-printer/src/ConfigUI.c:62 msgid "Text nodes" msgstr "Noeuds texte"

-#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "CDATA" msgstr "CDATA"

-#: ../pretty-printer/src/ConfigUI.c:139 +#: ../pretty-printer/src/ConfigUI.c:191 msgid "Empty nodes" msgstr "Noeuds vides"

-#: ../pretty-printer/src/ConfigUI.c:140 +#: ../pretty-printer/src/ConfigUI.c:192 msgid "Concatenation (<x></x> to <x/>)" msgstr "Concatenation (<x></x> to <x/>)"

-#: ../pretty-printer/src/ConfigUI.c:141 +#: ../pretty-printer/src/ConfigUI.c:193 msgid "Spacing (<x/> to <x />)" msgstr "Espace (<x/> to <x />)"

-#: ../pretty-printer/src/ConfigUI.c:142 +#: ../pretty-printer/src/ConfigUI.c:194 msgid "Expansion (<x/> to <x></x>)" msgstr "Expansion (<x/> to <x></x>)"

-#: ../pretty-printer/src/ConfigUI.c:169 +#: ../pretty-printer/src/ConfigUI.c:221 msgid "Indentation" msgstr "Indentation"

-#: ../pretty-printer/src/ConfigUI.c:173 +#: ../pretty-printer/src/ConfigUI.c:225 msgid "Tab" msgstr "Tab"

-#: ../pretty-printer/src/ConfigUI.c:174 +#: ../pretty-printer/src/ConfigUI.c:226 msgid "Space" msgstr "Espace"

-#: ../pretty-printer/src/ConfigUI.c:198 +#: ../pretty-printer/src/ConfigUI.c:250 msgid "Line break" msgstr "Retour de ligne"

Modified: trunk/geany-plugins/po/gl.po =================================================================== --- trunk/geany-plugins/po/gl.po 2011-07-22 13:31:33 UTC (rev 2105) +++ trunk/geany-plugins/po/gl.po 2011-07-22 14:28:09 UTC (rev 2106) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: geany-plugins 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-22 14:52+0200\n" +"POT-Creation-Date: 2011-07-22 16:21+0200\n" "PO-Revision-Date: 2010-06-06 06:26+0100\n" "Last-Translator: José Manuel Castroagudín Silva chavescesures@gmail.com\n" "Language-Team: Galician\n" @@ -3920,60 +3920,64 @@ msgid "Find in Files" msgstr "Procurar en todo o proxecto "

-#: ../pretty-printer/src/ConfigUI.c:58 +#: ../pretty-printer/src/ConfigUI.c:61 #, fuzzy msgid "Comments" msgstr "Contidos"

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Put on one line" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Inline if possible" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:59 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +msgid "Alignment" +msgstr "" + +#: ../pretty-printer/src/ConfigUI.c:62 msgid "Text nodes" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "CDATA" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:139 +#: ../pretty-printer/src/ConfigUI.c:191 #, fuzzy msgid "Empty nodes" msgstr "(Liña baleira)"

-#: ../pretty-printer/src/ConfigUI.c:140 +#: ../pretty-printer/src/ConfigUI.c:192 msgid "Concatenation (<x></x> to <x/>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:141 +#: ../pretty-printer/src/ConfigUI.c:193 msgid "Spacing (<x/> to <x />)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:142 +#: ../pretty-printer/src/ConfigUI.c:194 msgid "Expansion (<x/> to <x></x>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:169 +#: ../pretty-printer/src/ConfigUI.c:221 #, fuzzy msgid "Indentation" msgstr "Presentación"

-#: ../pretty-printer/src/ConfigUI.c:173 +#: ../pretty-printer/src/ConfigUI.c:225 msgid "Tab" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:174 +#: ../pretty-printer/src/ConfigUI.c:226 msgid "Space" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:198 +#: ../pretty-printer/src/ConfigUI.c:250 msgid "Line break" msgstr ""

Modified: trunk/geany-plugins/po/ja.po =================================================================== --- trunk/geany-plugins/po/ja.po 2011-07-22 13:31:33 UTC (rev 2105) +++ trunk/geany-plugins/po/ja.po 2011-07-22 14:28:09 UTC (rev 2106) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: geany-plugins 0.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-22 14:52+0200\n" +"POT-Creation-Date: 2011-07-22 16:21+0200\n" "PO-Revision-Date: 2009-07-19 13:40+0900\n" "Last-Translator: Masami Chikahiro cmasa.z321@gmail.com\n" "Language-Team: Japanese\n" @@ -4074,60 +4074,64 @@ msgid "Find in Files" msgstr "プロジェクト内を検索"

-#: ../pretty-printer/src/ConfigUI.c:58 +#: ../pretty-printer/src/ConfigUI.c:61 #, fuzzy msgid "Comments" msgstr "内容"

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Put on one line" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Inline if possible" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:59 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +msgid "Alignment" +msgstr "" + +#: ../pretty-printer/src/ConfigUI.c:62 msgid "Text nodes" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "CDATA" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:139 +#: ../pretty-printer/src/ConfigUI.c:191 #, fuzzy msgid "Empty nodes" msgstr "(空行)"

-#: ../pretty-printer/src/ConfigUI.c:140 +#: ../pretty-printer/src/ConfigUI.c:192 msgid "Concatenation (<x></x> to <x/>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:141 +#: ../pretty-printer/src/ConfigUI.c:193 msgid "Spacing (<x/> to <x />)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:142 +#: ../pretty-printer/src/ConfigUI.c:194 msgid "Expansion (<x/> to <x></x>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:169 +#: ../pretty-printer/src/ConfigUI.c:221 #, fuzzy msgid "Indentation" msgstr "プレゼンテーション"

-#: ../pretty-printer/src/ConfigUI.c:173 +#: ../pretty-printer/src/ConfigUI.c:225 msgid "Tab" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:174 +#: ../pretty-printer/src/ConfigUI.c:226 msgid "Space" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:198 +#: ../pretty-printer/src/ConfigUI.c:250 msgid "Line break" msgstr ""

Modified: trunk/geany-plugins/po/pt.po =================================================================== --- trunk/geany-plugins/po/pt.po 2011-07-22 13:31:33 UTC (rev 2105) +++ trunk/geany-plugins/po/pt.po 2011-07-22 14:28:09 UTC (rev 2106) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: geany-plugins 0.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-22 14:52+0200\n" +"POT-Creation-Date: 2011-07-22 16:21+0200\n" "PO-Revision-Date: 2011-01-02 11:56+0100\n" "Last-Translator: André Glória <gloria_dot_andre_at_gmail_dot_com>\n" "Language-Team: Portuguese\n" @@ -3937,60 +3937,64 @@ msgid "Find in Files" msgstr "Procurar no Projecto"

-#: ../pretty-printer/src/ConfigUI.c:58 +#: ../pretty-printer/src/ConfigUI.c:61 #, fuzzy msgid "Comments" msgstr "Conteúdo"

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Put on one line" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Inline if possible" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:59 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +msgid "Alignment" +msgstr "" + +#: ../pretty-printer/src/ConfigUI.c:62 msgid "Text nodes" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "CDATA" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:139 +#: ../pretty-printer/src/ConfigUI.c:191 #, fuzzy msgid "Empty nodes" msgstr "(Linha em Branco)"

-#: ../pretty-printer/src/ConfigUI.c:140 +#: ../pretty-printer/src/ConfigUI.c:192 msgid "Concatenation (<x></x> to <x/>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:141 +#: ../pretty-printer/src/ConfigUI.c:193 msgid "Spacing (<x/> to <x />)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:142 +#: ../pretty-printer/src/ConfigUI.c:194 msgid "Expansion (<x/> to <x></x>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:169 +#: ../pretty-printer/src/ConfigUI.c:221 #, fuzzy msgid "Indentation" msgstr "Apresentação"

-#: ../pretty-printer/src/ConfigUI.c:173 +#: ../pretty-printer/src/ConfigUI.c:225 msgid "Tab" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:174 +#: ../pretty-printer/src/ConfigUI.c:226 msgid "Space" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:198 +#: ../pretty-printer/src/ConfigUI.c:250 msgid "Line break" msgstr ""

Modified: trunk/geany-plugins/po/pt_BR.po =================================================================== --- trunk/geany-plugins/po/pt_BR.po 2011-07-22 13:31:33 UTC (rev 2105) +++ trunk/geany-plugins/po/pt_BR.po 2011-07-22 14:28:09 UTC (rev 2106) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Geany Plugins 0.189\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-22 14:52+0200\n" +"POT-Creation-Date: 2011-07-22 16:21+0200\n" "PO-Revision-Date: \n" "Last-Translator: Adrovane Marques Kade adrovane@gmail.com\n" "Language-Team: Adrovane Marques Kade adrovane@gmail.com\n" @@ -3918,60 +3918,64 @@ msgid "Find in Files" msgstr "Pesquisa em Projeto"

-#: ../pretty-printer/src/ConfigUI.c:58 +#: ../pretty-printer/src/ConfigUI.c:61 #, fuzzy msgid "Comments" msgstr "Conteúdos"

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Put on one line" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Inline if possible" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:59 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +msgid "Alignment" +msgstr "" + +#: ../pretty-printer/src/ConfigUI.c:62 msgid "Text nodes" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "CDATA" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:139 +#: ../pretty-printer/src/ConfigUI.c:191 #, fuzzy msgid "Empty nodes" msgstr "(Linha vazia)"

-#: ../pretty-printer/src/ConfigUI.c:140 +#: ../pretty-printer/src/ConfigUI.c:192 msgid "Concatenation (<x></x> to <x/>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:141 +#: ../pretty-printer/src/ConfigUI.c:193 msgid "Spacing (<x/> to <x />)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:142 +#: ../pretty-printer/src/ConfigUI.c:194 msgid "Expansion (<x/> to <x></x>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:169 +#: ../pretty-printer/src/ConfigUI.c:221 #, fuzzy msgid "Indentation" msgstr "Apresentação"

-#: ../pretty-printer/src/ConfigUI.c:173 +#: ../pretty-printer/src/ConfigUI.c:225 msgid "Tab" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:174 +#: ../pretty-printer/src/ConfigUI.c:226 msgid "Space" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:198 +#: ../pretty-printer/src/ConfigUI.c:250 msgid "Line break" msgstr ""

Modified: trunk/geany-plugins/po/ru.po =================================================================== --- trunk/geany-plugins/po/ru.po 2011-07-22 13:31:33 UTC (rev 2105) +++ trunk/geany-plugins/po/ru.po 2011-07-22 14:28:09 UTC (rev 2106) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: geany-plugins 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-22 14:52+0200\n" +"POT-Creation-Date: 2011-07-22 16:21+0200\n" "PO-Revision-Date: 2009-06-11 10:15+0200\n" "Last-Translator: John Wehin john.wehin@gmail.com\n" "Language-Team: Russian geany-i18n@uvena.de\n" @@ -3834,59 +3834,63 @@ msgid "Find in Files" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 +#: ../pretty-printer/src/ConfigUI.c:61 #, fuzzy msgid "Comments" msgstr "Параметры окружения"

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Put on one line" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Inline if possible" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:59 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +msgid "Alignment" +msgstr "" + +#: ../pretty-printer/src/ConfigUI.c:62 msgid "Text nodes" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "CDATA" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:139 +#: ../pretty-printer/src/ConfigUI.c:191 msgid "Empty nodes" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:140 +#: ../pretty-printer/src/ConfigUI.c:192 msgid "Concatenation (<x></x> to <x/>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:141 +#: ../pretty-printer/src/ConfigUI.c:193 msgid "Spacing (<x/> to <x />)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:142 +#: ../pretty-printer/src/ConfigUI.c:194 msgid "Expansion (<x/> to <x></x>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:169 +#: ../pretty-printer/src/ConfigUI.c:221 #, fuzzy msgid "Indentation" msgstr "запущено"

-#: ../pretty-printer/src/ConfigUI.c:173 +#: ../pretty-printer/src/ConfigUI.c:225 msgid "Tab" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:174 +#: ../pretty-printer/src/ConfigUI.c:226 msgid "Space" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:198 +#: ../pretty-printer/src/ConfigUI.c:250 msgid "Line break" msgstr ""

Modified: trunk/geany-plugins/po/tr.po =================================================================== --- trunk/geany-plugins/po/tr.po 2011-07-22 13:31:33 UTC (rev 2105) +++ trunk/geany-plugins/po/tr.po 2011-07-22 14:28:09 UTC (rev 2106) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: geany-plugins 0.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-22 14:52+0200\n" +"POT-Creation-Date: 2011-07-22 16:21+0200\n" "PO-Revision-Date: \n" "Last-Translator: Gürkan Gür seqizz@gmail.com\n" "Language-Team: \n" @@ -3799,60 +3799,64 @@ msgid "Find in Files" msgstr "Projede Ara"

-#: ../pretty-printer/src/ConfigUI.c:58 +#: ../pretty-printer/src/ConfigUI.c:61 #, fuzzy msgid "Comments" msgstr "İçerik"

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Put on one line" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Inline if possible" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:59 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +msgid "Alignment" +msgstr "" + +#: ../pretty-printer/src/ConfigUI.c:62 msgid "Text nodes" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "CDATA" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:139 +#: ../pretty-printer/src/ConfigUI.c:191 #, fuzzy msgid "Empty nodes" msgstr "(Boş Satır)"

-#: ../pretty-printer/src/ConfigUI.c:140 +#: ../pretty-printer/src/ConfigUI.c:192 msgid "Concatenation (<x></x> to <x/>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:141 +#: ../pretty-printer/src/ConfigUI.c:193 msgid "Spacing (<x/> to <x />)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:142 +#: ../pretty-printer/src/ConfigUI.c:194 msgid "Expansion (<x/> to <x></x>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:169 +#: ../pretty-printer/src/ConfigUI.c:221 #, fuzzy msgid "Indentation" msgstr "Sunum"

-#: ../pretty-printer/src/ConfigUI.c:173 +#: ../pretty-printer/src/ConfigUI.c:225 msgid "Tab" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:174 +#: ../pretty-printer/src/ConfigUI.c:226 msgid "Space" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:198 +#: ../pretty-printer/src/ConfigUI.c:250 msgid "Line break" msgstr ""

Modified: trunk/geany-plugins/po/zh_CN.po =================================================================== --- trunk/geany-plugins/po/zh_CN.po 2011-07-22 13:31:33 UTC (rev 2105) +++ trunk/geany-plugins/po/zh_CN.po 2011-07-22 14:28:09 UTC (rev 2106) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Geany-plugins 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-22 14:52+0200\n" +"POT-Creation-Date: 2011-07-22 16:21+0200\n" "PO-Revision-Date: 2009-10-30 08:44+0800\n" "Last-Translator: Xhacker Liu liu.dongyuan@gmail.com\n" "Language-Team: zh_CN <>\n" @@ -3912,60 +3912,64 @@ msgid "Find in Files" msgstr "在项目中查找"

-#: ../pretty-printer/src/ConfigUI.c:58 +#: ../pretty-printer/src/ConfigUI.c:61 #, fuzzy msgid "Comments" msgstr "内容"

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Put on one line" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:58 ../pretty-printer/src/ConfigUI.c:59 -#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "Inline if possible" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:59 +#: ../pretty-printer/src/ConfigUI.c:61 ../pretty-printer/src/ConfigUI.c:62 +msgid "Alignment" +msgstr "" + +#: ../pretty-printer/src/ConfigUI.c:62 msgid "Text nodes" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:60 +#: ../pretty-printer/src/ConfigUI.c:63 msgid "CDATA" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:139 +#: ../pretty-printer/src/ConfigUI.c:191 #, fuzzy msgid "Empty nodes" msgstr "（空行）"

-#: ../pretty-printer/src/ConfigUI.c:140 +#: ../pretty-printer/src/ConfigUI.c:192 msgid "Concatenation (<x></x> to <x/>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:141 +#: ../pretty-printer/src/ConfigUI.c:193 msgid "Spacing (<x/> to <x />)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:142 +#: ../pretty-printer/src/ConfigUI.c:194 msgid "Expansion (<x/> to <x></x>)" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:169 +#: ../pretty-printer/src/ConfigUI.c:221 #, fuzzy msgid "Indentation" msgstr "简报"

-#: ../pretty-printer/src/ConfigUI.c:173 +#: ../pretty-printer/src/ConfigUI.c:225 msgid "Tab" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:174 +#: ../pretty-printer/src/ConfigUI.c:226 msgid "Space" msgstr ""

-#: ../pretty-printer/src/ConfigUI.c:198 +#: ../pretty-printer/src/ConfigUI.c:250 msgid "Line break" msgstr ""

Modified: trunk/geany-plugins/pretty-printer/src/ConfigUI.c =================================================================== --- trunk/geany-plugins/pretty-printer/src/ConfigUI.c 2011-07-22 13:31:33 UTC (rev 2105) +++ trunk/geany-plugins/pretty-printer/src/ConfigUI.c 2011-07-22 14:28:09 UTC (rev 2106) @@ -21,6 +21,7 @@ //======================= FUNCTIONS ====================================================================

static GtkWidget* createTwoOptionsBox(const char* label, const char* checkBox1, const char* checkBox2, gboolean cb1Active, gboolean cb2Active, GtkWidget** option1, GtkWidget** option2); +static GtkWidget* createThreeOptionsBox(const char* label, const char* checkBox1, const char* checkBox2, const char* checkBox3, gboolean cb1Active, gboolean cb2Active, gboolean cb3Active, GtkWidget** option1, GtkWidget** option2, GtkWidget** option3); static GtkWidget* createEmptyTextOptions(gboolean emptyNodeStripping, gboolean emptyNodeStrippingSpace, gboolean forceEmptyNodeSplit); static GtkWidget* createIndentationOptions(char indentation, int count); static GtkWidget* createLineReturnOptions(const char* lineReturn); @@ -29,8 +30,10 @@

static GtkWidget* commentOneLine; static GtkWidget* commentInline; +static GtkWidget* commentAlign; static GtkWidget* textOneLine; static GtkWidget* textInline; +static GtkWidget* textAlign; static GtkWidget* cdataOneLine; static GtkWidget* cdataInline; static GtkWidget* emptyNodeStripping; @@ -54,9 +57,9 @@

GtkWidget* container = gtk_hbox_new(FALSE, 10);

- GtkWidget* leftBox = gtk_vbox_new(TRUE, 6); - GtkWidget* commentOptions = createTwoOptionsBox(_("Comments"), _("Put on one line"), _("Inline if possible"), ppo->oneLineComment, ppo->inlineComment, &commentOneLine, &commentInline); - GtkWidget* textOptions = createTwoOptionsBox(_("Text nodes"), _("Put on one line"), _("Inline if possible"), ppo->oneLineText, ppo->inlineText, &textOneLine, &textInline); + GtkWidget* leftBox = gtk_vbox_new(FALSE, 6); + GtkWidget* commentOptions = createThreeOptionsBox(_("Comments"), _("Put on one line"), _("Inline if possible"), _("Alignment"), ppo->oneLineComment, ppo->inlineComment, ppo->alignComment, &commentOneLine, &commentInline, &commentAlign); + GtkWidget* textOptions = createThreeOptionsBox(_("Text nodes"), _("Put on one line"), _("Inline if possible"), _("Alignment"), ppo->oneLineText, ppo->inlineText, ppo->alignText, &textOneLine, &textInline, &textAlign); GtkWidget* cdataOptions = createTwoOptionsBox(_("CDATA"), _("Put on one line"), _("Inline if possible"), ppo->oneLineCdata, ppo->inlineCdata, &cdataOneLine, &cdataInline); GtkWidget* emptyOptions = createEmptyTextOptions(ppo->emptyNodeStripping, ppo->emptyNodeStrippingSpace, ppo->forceEmptyNodeSplit); GtkWidget* indentationOptions = createIndentationOptions(ppo->indentChar, ppo->indentLength); @@ -84,8 +87,12 @@

ppo->oneLineComment = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(commentOneLine)); ppo->inlineComment = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(commentInline)); + ppo->alignComment = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(commentAlign)); + ppo->oneLineText = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(textOneLine)); ppo->inlineText = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(textInline)); + ppo->alignText = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(textAlign)); + ppo->oneLineCdata = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cdataOneLine)); ppo->inlineCdata = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cdataInline));

@@ -104,7 +111,13 @@

//============================================= PRIVATE FUNCTIONS =======================================

-GtkWidget* createTwoOptionsBox(const char* label, const char* checkBox1, const char* checkBox2, gboolean cb1Active, gboolean cb2Active, GtkWidget** option1, GtkWidget** option2) +GtkWidget* createTwoOptionsBox(const char* label, + const char* checkBox1, + const char* checkBox2, + gboolean cb1Active, + gboolean cb2Active, + GtkWidget** option1, + GtkWidget** option2) { GtkWidget* container = gtk_hbox_new(TRUE, 2); GtkWidget* rightBox = gtk_vbox_new(FALSE, 6); @@ -130,6 +143,45 @@ return container; }

+static GtkWidget* createThreeOptionsBox(const char* label, + const char* checkBox1, + const char* checkBox2, + const char* checkBox3, + gboolean cb1Active, + gboolean cb2Active, + gboolean cb3Active, + GtkWidget** option1, + GtkWidget** option2, + GtkWidget** option3) +{ + GtkWidget* container = gtk_hbox_new(TRUE, 2); + GtkWidget* rightBox = gtk_vbox_new(FALSE, 6); + GtkWidget* leftBox = gtk_vbox_new(FALSE, 6); + + GtkWidget* lbl = gtk_label_new(label); + GtkWidget* chb1 = gtk_check_button_new_with_label(checkBox1); + GtkWidget* chb2 = gtk_check_button_new_with_label(checkBox2); + GtkWidget* chb3 = gtk_check_button_new_with_label(checkBox3); + + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chb1), cb1Active); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chb2), cb2Active); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chb3), cb3Active); + + gtk_box_pack_start(GTK_BOX(container), leftBox, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(container), rightBox, FALSE, FALSE, 3); + + gtk_box_pack_start(GTK_BOX(leftBox), lbl, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(rightBox), chb1, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(rightBox), chb2, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(rightBox), chb3, FALSE, FALSE, 3); + + *option1 = chb1; + *option2 = chb2; + *option3 = chb3; + + return container; +} + GtkWidget* createEmptyTextOptions(gboolean optEmptyNodeStripping, gboolean optEmptyNodeStrippingSpace, gboolean optForceEmptyNodeSplit) { GtkWidget* container = gtk_hbox_new(FALSE, 2);

Modified: trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c =================================================================== --- trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c 2011-07-22 13:31:33 UTC (rev 2105) +++ trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c 2011-07-22 14:28:09 UTC (rev 2106) @@ -160,7 +160,8 @@ defaultOptions->forceEmptyNodeSplit = FALSE; defaultOptions->trimLeadingWhites = TRUE; defaultOptions->trimTrailingWhites = TRUE; - defaultOptions->commentAlign = TRUE; + defaultOptions->alignComment = TRUE; + defaultOptions->alignText = TRUE;

return defaultOptions; } @@ -701,7 +702,7 @@ putCharInBuffer(nextChar); oldChar = nextChar;

- if (!loop && options->commentAlign) //end of comment + if (!loop && options->alignComment) //end of comment { //ensures the chars preceding the first '-' are all spaces gboolean onlySpaces = xmlPrettyPrinted[xmlPrettyPrintedIndex-3] == ' ' && @@ -720,21 +721,25 @@ } else if (!options->oneLineComment && !inlineAllowed) //oh ! there is a line break { - int read = readWhites(FALSE); //strip the whites and new line - if (nextChar == '\r' && read == 0 && getNextChar() == '\n') //handles the \r\n return line - { - readNextChar(); - readWhites(FALSE); - } - //if the comments need to be aligned, just add 5 spaces - if (options->commentAlign) + if (options->alignComment) { + int read = readWhites(FALSE); //strip the whites and new line + if (nextChar == '\r' && read == 0 && getNextChar() == '\n') //handles the \r\n return line + { + readNextChar(); + readWhites(FALSE); + } + putNewLine(); //put a new indentation line putCharsInBuffer(" "); + oldChar = ' '; //and update the last char } - - oldChar = ' '; //and update the last char + else + { + putCharInBuffer(nextChar); + oldChar = nextChar; + } } else //the comments must be inlined { @@ -767,7 +772,7 @@ gboolean inlineTextAllowed = FALSE; if (options->inlineText) { inlineTextAllowed = isInlineNodeAllowed(); } if (inlineTextAllowed && !options->oneLineText) { inlineTextAllowed = isOnSingleLine(0, '<', '/'); } - if (inlineTextAllowed) { resetBackwardIndentation(TRUE); } //remove previous indentation + if (inlineTextAllowed || !options->alignText) { resetBackwardIndentation(TRUE); } //remove previous indentation

//the leading whites are automatically stripped. So we re-add it if (!options->trimLeadingWhites) @@ -810,7 +815,7 @@ putCharInBuffer(' '); } } - else + else if (options->alignComment) { int read = readWhites(FALSE); if (nextChar == '\r' && read == 0 && getNextChar() == '\n') //handles the '\r\n' @@ -825,6 +830,10 @@ putNewLine(); } } + else + { + putCharInBuffer(nextChar); + } } else { @@ -843,7 +852,7 @@ }

//remove the indentation for the closing tag - if (inlineTextAllowed) { appendIndentation = FALSE; } + if (inlineTextAllowed || !options->alignText) { appendIndentation = FALSE; }

//there vas no node open lastNodeOpen = FALSE;

Modified: trunk/geany-plugins/pretty-printer/src/PrettyPrinter.h =================================================================== --- trunk/geany-plugins/pretty-printer/src/PrettyPrinter.h 2011-07-22 13:31:33 UTC (rev 2105) +++ trunk/geany-plugins/pretty-printer/src/PrettyPrinter.h 2011-07-22 14:28:09 UTC (rev 2106) @@ -57,7 +57,8 @@ gboolean forceEmptyNodeSplit; //force an empty node to be splitted : <node /> becomes <node></node> (only if emptyNodeStripping = false) gboolean trimLeadingWhites; //trim the leading whites in a text node gboolean trimTrailingWhites; //trim the trailing whites in a text node - gboolean commentAlign; //align the comments: add 5 spaces in indentation (only if oneLineComment = false) + gboolean alignComment; //align the comments. If false, comments are untouched (only if oneLineComment = false) + gboolean alignText; //align the text in a node. If false, text is untouched (only if oneLineText = false) } PrettyPrintingOptions;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.