Branch: refs/heads/master
Author: Philipp Wiesemann <philipp.wiesemann(a)arcor.de>
Committer: Philipp Wiesemann <philipp.wiesemann(a)arcor.de>
Date: Sat, 30 May 2015 20:56:18 UTC
Commit: d1137815db16f9dd8b375ebcc1ddbeaab76d6539
https://github.com/geany/geany-plugins/commit/d1137815db16f9dd8b375ebcc1ddb…
Log Message:
-----------
Fix typo in messages
Modified Paths:
--------------
geanymacro/src/geanymacro.c
po/be.po
po/ca.po
po/da.po
po/de.po
po/es.po
po/fr.po
po/gl.po
po/it.po
po/ja.po
po/nl.po
po/pt.po
po/pt_BR.po
po/ru.po
po/tr.po
po/zh_CN.po
Modified: geanymacro/src/geanymacro.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -823,7 +823,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog)
/* save pointer to check_button */
g_object_set_data(G_OBJECT(dialog),"GeanyMacros_cb1",cb1);
- cb2=gtk_check_button_new_with_label(_("Ask before replaceing existing Macros"));
+ cb2=gtk_check_button_new_with_label(_("Ask before replacing existing Macros"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb2),bQueryOverwriteMacros);
gtk_box_pack_start(GTK_BOX(vbox),cb2,FALSE,FALSE,2);
/* save pointer to check_button */
@@ -884,7 +884,7 @@ _("You can change:\n"),
_("Save Macros when close Geany - If this is selected then Geany will save any recorded macros and\
reload them for use the next time you open Geany, if not they will be lost when Geany is closed.\
\n"),
-_("Ask before replaceing existing Macros - If this is selected then if you try recording a macro o\
+_("Ask before replacing existing Macros - If this is selected then if you try recording a macro o\
ver an existing one it will check before over-writing it, giving you the option of trying a differ\
ent name or key trigger combination, otherwise it will simply erase any existing macros with the s\
ame name, or the same key trigger combination."),
Modified: po/be.po
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -3133,7 +3133,7 @@ msgid "Save Macros when close Geany"
msgstr ""
#: ../geanymacro/src/geanymacro.c:826
-msgid "Ask before replaceing existing Macros"
+msgid "Ask before replacing existing Macros"
msgstr ""
#. create dialog box
@@ -3251,7 +3251,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:887
msgid ""
-"Ask before replaceing existing Macros - If this is selected then if you try "
+"Ask before replacing existing Macros - If this is selected then if you try "
"recording a macro over an existing one it will check before over-writing it, "
"giving you the option of trying a different name or key trigger combination, "
"otherwise it will simply erase any existing macros with the same name, or "
Modified: po/ca.po
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -3067,7 +3067,7 @@ msgid "Save Macros when close Geany"
msgstr ""
#: ../geanymacro/src/geanymacro.c:826
-msgid "Ask before replaceing existing Macros"
+msgid "Ask before replacing existing Macros"
msgstr ""
#. create dialog box
@@ -3185,7 +3185,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:887
msgid ""
-"Ask before replaceing existing Macros - If this is selected then if you try "
+"Ask before replacing existing Macros - If this is selected then if you try "
"recording a macro over an existing one it will check before over-writing it, "
"giving you the option of trying a different name or key trigger combination, "
"otherwise it will simply erase any existing macros with the same name, or "
Modified: po/da.po
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -3094,7 +3094,7 @@ msgid "Save Macros when close Geany"
msgstr ""
#: ../geanymacro/src/geanymacro.c:826
-msgid "Ask before replaceing existing Macros"
+msgid "Ask before replacing existing Macros"
msgstr ""
#. create dialog box
@@ -3212,7 +3212,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:887
msgid ""
-"Ask before replaceing existing Macros - If this is selected then if you try "
+"Ask before replacing existing Macros - If this is selected then if you try "
"recording a macro over an existing one it will check before over-writing it, "
"giving you the option of trying a different name or key trigger combination, "
"otherwise it will simply erase any existing macros with the same name, or "
Modified: po/de.po
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -3577,7 +3577,7 @@ msgid "Save Macros when close Geany"
msgstr "Makros beim Beenden von Geany speichern"
#: ../geanymacro/src/geanymacro.c:826
-msgid "Ask before replaceing existing Macros"
+msgid "Ask before replacing existing Macros"
msgstr "Nachfragen vor dem Ersetzen von Makros"
#. create dialog box
@@ -3731,7 +3731,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:887
msgid ""
-"Ask before replaceing existing Macros - If this is selected then if you try "
+"Ask before replacing existing Macros - If this is selected then if you try "
"recording a macro over an existing one it will check before over-writing it, "
"giving you the option of trying a different name or key trigger combination, "
"otherwise it will simply erase any existing macros with the same name, or "
Modified: po/es.po
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -3200,7 +3200,7 @@ msgid "Save Macros when close Geany"
msgstr "Guardar macros al cerrar Geany"
#: ../geanymacro/src/geanymacro.c:826
-msgid "Ask before replaceing existing Macros"
+msgid "Ask before replacing existing Macros"
msgstr "Preguntar antes de reemplazar macros existentes"
#. create dialog box
@@ -3352,7 +3352,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:887
msgid ""
-"Ask before replaceing existing Macros - If this is selected then if you try "
+"Ask before replacing existing Macros - If this is selected then if you try "
"recording a macro over an existing one it will check before over-writing it, "
"giving you the option of trying a different name or key trigger combination, "
"otherwise it will simply erase any existing macros with the same name, or "
@@ -7162,7 +7162,7 @@ msgstr "Autocompleta etiquetas XML/HTML mediante recortes"
#~ "Save Macros when close Geany - If this is selected then Geany will save "
#~ "any recorded macros and reload them for use the next time you open Geany, "
#~ "if not they will be lost when Geany is closed.\n"
-#~ "Ask before replaceing existing Macros - If this is selected then if you "
+#~ "Ask before replacing existing Macros - If this is selected then if you "
#~ "try recording a macro over an existing one it will check before over-"
#~ "writing it, giving you the option of trying a different name or key "
#~ "trigger combination, otherwise it will simply erase any existing macros "
Modified: po/fr.po
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -3197,7 +3197,7 @@ msgid "Save Macros when close Geany"
msgstr "Enregistrer les macros à la fermeture de Geany"
#: ../geanymacro/src/geanymacro.c:826
-msgid "Ask before replaceing existing Macros"
+msgid "Ask before replacing existing Macros"
msgstr "Demander avant de remplacer les macros existantes"
#. create dialog box
@@ -3353,7 +3353,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:887
msgid ""
-"Ask before replaceing existing Macros - If this is selected then if you try "
+"Ask before replacing existing Macros - If this is selected then if you try "
"recording a macro over an existing one it will check before over-writing it, "
"giving you the option of trying a different name or key trigger combination, "
"otherwise it will simply erase any existing macros with the same name, or "
Modified: po/gl.po
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -3263,7 +3263,7 @@ msgid "Save Macros when close Geany"
msgstr ""
#: ../geanymacro/src/geanymacro.c:826
-msgid "Ask before replaceing existing Macros"
+msgid "Ask before replacing existing Macros"
msgstr ""
#. create dialog box
@@ -3381,7 +3381,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:887
msgid ""
-"Ask before replaceing existing Macros - If this is selected then if you try "
+"Ask before replacing existing Macros - If this is selected then if you try "
"recording a macro over an existing one it will check before over-writing it, "
"giving you the option of trying a different name or key trigger combination, "
"otherwise it will simply erase any existing macros with the same name, or "
Modified: po/it.po
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -3182,7 +3182,7 @@ msgid "Save Macros when close Geany"
msgstr "Salva le Macro quando chiudi Geany"
#: ../geanymacro/src/geanymacro.c:826
-msgid "Ask before replaceing existing Macros"
+msgid "Ask before replacing existing Macros"
msgstr "Chiedi prima di sovrascrivere le Macro esistenti"
#. create dialog box
@@ -3335,7 +3335,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:887
msgid ""
-"Ask before replaceing existing Macros - If this is selected then if you try "
+"Ask before replacing existing Macros - If this is selected then if you try "
"recording a macro over an existing one it will check before over-writing it, "
"giving you the option of trying a different name or key trigger combination, "
"otherwise it will simply erase any existing macros with the same name, or "
Modified: po/ja.po
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -3154,7 +3154,7 @@ msgid "Save Macros when close Geany"
msgstr "Geanyを閉じるときにマクロを保存する"
#: ../geanymacro/src/geanymacro.c:826
-msgid "Ask before replaceing existing Macros"
+msgid "Ask before replacing existing Macros"
msgstr "既存のマクロに上書きするときに問い合わせる"
#. create dialog box
@@ -3301,7 +3301,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:887
msgid ""
-"Ask before replaceing existing Macros - If this is selected then if you try "
+"Ask before replacing existing Macros - If this is selected then if you try "
"recording a macro over an existing one it will check before over-writing it, "
"giving you the option of trying a different name or key trigger combination, "
"otherwise it will simply erase any existing macros with the same name, or "
@@ -7055,7 +7055,7 @@ msgstr "スニペットを使用してXML/HTMLタグを自動補完"
#~ "Save Macros when close Geany - If this is selected then Geany will save "
#~ "any recorded macros and reload them for use the next time you open Geany, "
#~ "if not they will be lost when Geany is closed.\n"
-#~ "Ask before replaceing existing Macros - If this is selected then if you "
+#~ "Ask before replacing existing Macros - If this is selected then if you "
#~ "try recording a macro over an existing one it will check before over-"
#~ "writing it, giving you the option of trying a different name or key "
#~ "trigger combination, otherwise it will simply erase any existing macros "
@@ -7195,7 +7195,7 @@ msgstr "スニペットを使用してXML/HTMLタグを自動補完"
#~ "Save Macros when close Geany - If this is selected then Geany will save "
#~ "any recorded macros and reload them for use the next time you open Geany, "
#~ "if not they will be lost when Geany is closed.\n"
-#~ "Ask before replaceing existing Macros - If this is selected then if you "
+#~ "Ask before replacing existing Macros - If this is selected then if you "
#~ "try recording a macro over an existing one it will check before over-"
#~ "writing it, giving you the option of trying a different name or key "
#~ "trigger combination, otherwise it will simply erase any existing macros "
Modified: po/nl.po
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -3089,7 +3089,7 @@ msgid "Save Macros when close Geany"
msgstr ""
#: ../geanymacro/src/geanymacro.c:826
-msgid "Ask before replaceing existing Macros"
+msgid "Ask before replacing existing Macros"
msgstr ""
#. create dialog box
@@ -3207,7 +3207,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:887
msgid ""
-"Ask before replaceing existing Macros - If this is selected then if you try "
+"Ask before replacing existing Macros - If this is selected then if you try "
"recording a macro over an existing one it will check before over-writing it, "
"giving you the option of trying a different name or key trigger combination, "
"otherwise it will simply erase any existing macros with the same name, or "
Modified: po/pt.po
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -3524,7 +3524,7 @@ msgid "Save Macros when close Geany"
msgstr "Gravar macros ao fechar o Geany"
#: ../geanymacro/src/geanymacro.c:826
-msgid "Ask before replaceing existing Macros"
+msgid "Ask before replacing existing Macros"
msgstr "Perguntar antes de substituir macros existentes"
#. create dialog box
@@ -3673,7 +3673,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:887
msgid ""
-"Ask before replaceing existing Macros - If this is selected then if you try "
+"Ask before replacing existing Macros - If this is selected then if you try "
"recording a macro over an existing one it will check before over-writing it, "
"giving you the option of trying a different name or key trigger combination, "
"otherwise it will simply erase any existing macros with the same name, or "
@@ -7747,7 +7747,7 @@ msgstr "Auto completar etiquetas XML/HTML usando excertos de código."
#~ "Save Macros when close Geany - If this is selected then Geany will save "
#~ "any recorded macros and reload them for use the next time you open Geany, "
#~ "if not they will be lost when Geany is closed.\n"
-#~ "Ask before replaceing existing Macros - If this is selected then if you "
+#~ "Ask before replacing existing Macros - If this is selected then if you "
#~ "try recording a macro over an existing one it will check before over-"
#~ "writing it, giving you the option of trying a different name or key "
#~ "trigger combination, otherwise it will simply erase any existing macros "
@@ -7893,7 +7893,7 @@ msgstr "Auto completar etiquetas XML/HTML usando excertos de código."
#~ "Save Macros when close Geany - If this is selected then Geany will save "
#~ "any recorded macros and reload them for use the next time you open Geany, "
#~ "if not they will be lost when Geany is closed.\n"
-#~ "Ask before replaceing existing Macros - If this is selected then if you "
+#~ "Ask before replacing existing Macros - If this is selected then if you "
#~ "try recording a macro over an existing one it will check before over-"
#~ "writing it, giving you the option of trying a different name or key "
#~ "trigger combination, otherwise it will simply erase any existing macros "
Modified: po/pt_BR.po
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -3273,7 +3273,7 @@ msgid "Save Macros when close Geany"
msgstr ""
#: ../geanymacro/src/geanymacro.c:826
-msgid "Ask before replaceing existing Macros"
+msgid "Ask before replacing existing Macros"
msgstr ""
#. create dialog box
@@ -3391,7 +3391,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:887
msgid ""
-"Ask before replaceing existing Macros - If this is selected then if you try "
+"Ask before replacing existing Macros - If this is selected then if you try "
"recording a macro over an existing one it will check before over-writing it, "
"giving you the option of trying a different name or key trigger combination, "
"otherwise it will simply erase any existing macros with the same name, or "
Modified: po/ru.po
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -3437,7 +3437,7 @@ msgid "Save Macros when close Geany"
msgstr "Сохранять макрос при выходе из Geany"
#: ../geanymacro/src/geanymacro.c:826
-msgid "Ask before replaceing existing Macros"
+msgid "Ask before replacing existing Macros"
msgstr "Спрашивать перед перезаписью существующего макроса"
#. create dialog box
@@ -3586,7 +3586,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:887
msgid ""
-"Ask before replaceing existing Macros - If this is selected then if you try "
+"Ask before replacing existing Macros - If this is selected then if you try "
"recording a macro over an existing one it will check before over-writing it, "
"giving you the option of trying a different name or key trigger combination, "
"otherwise it will simply erase any existing macros with the same name, or "
Modified: po/tr.po
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -3115,7 +3115,7 @@ msgid "Save Macros when close Geany"
msgstr "Geany kapatılırken Makroları kaydet"
#: ../geanymacro/src/geanymacro.c:826
-msgid "Ask before replaceing existing Macros"
+msgid "Ask before replacing existing Macros"
msgstr "Önceki Makroların üzerine yazarken sor"
#. create dialog box
@@ -3245,7 +3245,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:887
msgid ""
-"Ask before replaceing existing Macros - If this is selected then if you try "
+"Ask before replacing existing Macros - If this is selected then if you try "
"recording a macro over an existing one it will check before over-writing it, "
"giving you the option of trying a different name or key trigger combination, "
"otherwise it will simply erase any existing macros with the same name, or "
Modified: po/zh_CN.po
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -3279,7 +3279,7 @@ msgid "Save Macros when close Geany"
msgstr ""
#: ../geanymacro/src/geanymacro.c:826
-msgid "Ask before replaceing existing Macros"
+msgid "Ask before replacing existing Macros"
msgstr ""
#. create dialog box
@@ -3397,7 +3397,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:887
msgid ""
-"Ask before replaceing existing Macros - If this is selected then if you try "
+"Ask before replacing existing Macros - If this is selected then if you try "
"recording a macro over an existing one it will check before over-writing it, "
"giving you the option of trying a different name or key trigger combination, "
"otherwise it will simply erase any existing macros with the same name, or "
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Philipp Wiesemann <philipp.wiesemann(a)arcor.de>
Committer: Philipp Wiesemann <philipp.wiesemann(a)arcor.de>
Date: Sat, 30 May 2015 20:53:15 UTC
Commit: 9dc4b78279c12737cb463ed80eae978750408005
https://github.com/geany/geany-plugins/commit/9dc4b78279c12737cb463ed80eae9…
Log Message:
-----------
Fix typo in message
Modified Paths:
--------------
geanyvc/src/geanyvc.c
po/be.po
po/ca.po
po/da.po
po/de.po
po/es.po
po/fr.po
po/gl.po
po/it.po
po/ja.po
po/nl.po
po/pt.po
po/pt_BR.po
po/ru.po
po/tr.po
po/zh_CN.po
Modified: geanyvc/src/geanyvc.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1095,7 +1095,7 @@ set_diff_buff(GtkWidget * textview, GtkTextBuffer * buffer, const gchar * txt)
"the changes are too big to display here and would slow down the UI significantly."
"\n\n"
"To view the differences, cancel this dialog and open the differences "
- "in Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."), -1);
+ "in Geany directly by using the GeanyVC menu (Base Directory -> Diff)."), -1);
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_WORD);
return;
}
Modified: po/be.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4230,7 +4230,7 @@ msgid ""
"big to display here and would slow down the UI significantly.\n"
"\n"
"To view the differences, cancel this dialog and open the differences in "
-"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."
+"Geany directly by using the GeanyVC menu (Base Directory -> Diff)."
msgstr ""
#: ../geanyvc/src/geanyvc.c:1243
Modified: po/ca.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4152,7 +4152,7 @@ msgid ""
"big to display here and would slow down the UI significantly.\n"
"\n"
"To view the differences, cancel this dialog and open the differences in "
-"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."
+"Geany directly by using the GeanyVC menu (Base Directory -> Diff)."
msgstr ""
#: ../geanyvc/src/geanyvc.c:1243
Modified: po/da.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4174,7 +4174,7 @@ msgid ""
"big to display here and would slow down the UI significantly.\n"
"\n"
"To view the differences, cancel this dialog and open the differences in "
-"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."
+"Geany directly by using the GeanyVC menu (Base Directory -> Diff)."
msgstr ""
#: ../geanyvc/src/geanyvc.c:1243
Modified: po/de.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4791,7 +4791,7 @@ msgid ""
"big to display here and would slow down the UI significantly.\n"
"\n"
"To view the differences, cancel this dialog and open the differences in "
-"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."
+"Geany directly by using the GeanyVC menu (Base Directory -> Diff)."
msgstr ""
"Die Veränderungen können hier nicht angezeigt werden, da sie zu viele sind. "
"Andernfalls könnte es passieren, dass die Anzeige unbenutzbar wird.\n"
Modified: po/es.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4411,7 +4411,7 @@ msgid ""
"big to display here and would slow down the UI significantly.\n"
"\n"
"To view the differences, cancel this dialog and open the differences in "
-"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."
+"Geany directly by using the GeanyVC menu (Base Directory -> Diff)."
msgstr ""
"Las diferencias resultantes no se pueden mostrar porque son demasiado "
"grandes para mostrar aquí y ralentizarían la UI considerablemente.\n"
Modified: po/fr.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4426,7 +4426,7 @@ msgid ""
"big to display here and would slow down the UI significantly.\n"
"\n"
"To view the differences, cancel this dialog and open the differences in "
-"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."
+"Geany directly by using the GeanyVC menu (Base Directory -> Diff)."
msgstr ""
"Les différences résultantes ne peuvent être affichées car les "
"changements sont trop importants et ralentiraient significativement "
Modified: po/gl.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4408,7 +4408,7 @@ msgid ""
"big to display here and would slow down the UI significantly.\n"
"\n"
"To view the differences, cancel this dialog and open the differences in "
-"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."
+"Geany directly by using the GeanyVC menu (Base Directory -> Diff)."
msgstr ""
#: ../geanyvc/src/geanyvc.c:1243
Modified: po/it.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4388,7 +4388,7 @@ msgid ""
"big to display here and would slow down the UI significantly.\n"
"\n"
"To view the differences, cancel this dialog and open the differences in "
-"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."
+"Geany directly by using the GeanyVC menu (Base Directory -> Diff)."
msgstr ""
"Le differenze risultanti non possono essere visualizzare perché i cambiamenti "
"sono troppo grandi da mostrare e rallenterebbero eccessivamente l'interfaccia.\n"
Modified: po/ja.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4320,7 +4320,7 @@ msgid ""
"big to display here and would slow down the UI significantly.\n"
"\n"
"To view the differences, cancel this dialog and open the differences in "
-"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."
+"Geany directly by using the GeanyVC menu (Base Directory -> Diff)."
msgstr ""
#: ../geanyvc/src/geanyvc.c:1243
Modified: po/nl.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4193,7 +4193,7 @@ msgid ""
"big to display here and would slow down the UI significantly.\n"
"\n"
"To view the differences, cancel this dialog and open the differences in "
-"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."
+"Geany directly by using the GeanyVC menu (Base Directory -> Diff)."
msgstr ""
#: ../geanyvc/src/geanyvc.c:1243
Modified: po/pt.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4724,7 +4724,7 @@ msgid ""
"big to display here and would slow down the UI significantly.\n"
"\n"
"To view the differences, cancel this dialog and open the differences in "
-"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."
+"Geany directly by using the GeanyVC menu (Base Directory -> Diff)."
msgstr ""
"As diferenças resultantes não podem ser mostradas porque as alterações são "
"demasiado grandes para mostrar aqui e atrasaria significativamente o UI.\n"
Modified: po/pt_BR.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4421,7 +4421,7 @@ msgid ""
"big to display here and would slow down the UI significantly.\n"
"\n"
"To view the differences, cancel this dialog and open the differences in "
-"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."
+"Geany directly by using the GeanyVC menu (Base Directory -> Diff)."
msgstr ""
#: ../geanyvc/src/geanyvc.c:1243
Modified: po/ru.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4639,7 +4639,7 @@ msgid ""
"big to display here and would slow down the UI significantly.\n"
"\n"
"To view the differences, cancel this dialog and open the differences in "
-"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."
+"Geany directly by using the GeanyVC menu (Base Directory -> Diff)."
msgstr ""
"Полученный список различий не может быть отображен так как изменений слишком "
"много и это может значительно замедлить интерфейс.\n"
Modified: po/tr.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4228,7 +4228,7 @@ msgid ""
"big to display here and would slow down the UI significantly.\n"
"\n"
"To view the differences, cancel this dialog and open the differences in "
-"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."
+"Geany directly by using the GeanyVC menu (Base Directory -> Diff)."
msgstr ""
#: ../geanyvc/src/geanyvc.c:1243
Modified: po/zh_CN.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4404,7 +4404,7 @@ msgid ""
"big to display here and would slow down the UI significantly.\n"
"\n"
"To view the differences, cancel this dialog and open the differences in "
-"Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)."
+"Geany directly by using the GeanyVC menu (Base Directory -> Diff)."
msgstr ""
#: ../geanyvc/src/geanyvc.c:1243
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Philipp Wiesemann <philipp.wiesemann(a)arcor.de>
Committer: Philipp Wiesemann <philipp.wiesemann(a)arcor.de>
Date: Sat, 30 May 2015 20:47:58 UTC
Commit: 5c3ec275bc03369e4935678fb87dc90651f8016c
https://github.com/geany/geany-plugins/commit/5c3ec275bc03369e4935678fb87dc…
Log Message:
-----------
Fix typo in message
Modified Paths:
--------------
geanymacro/src/geanymacro.c
po/be.po
po/ca.po
po/da.po
po/de.po
po/es.po
po/fr.po
po/gl.po
po/it.po
po/ja.po
po/nl.po
po/pt.po
po/pt_BR.po
po/ru.po
po/tr.po
po/zh_CN.po
Modified: geanymacro/src/geanymacro.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -871,7 +871,7 @@ _("You can also click on a macro's name and change it, or the key combination an
ssuming that it's not already in use. "),
_("Selecting the edit option allows you to view all the individual elements that make up the macro\
. "),
-_("You can select a diferent command for each element, move them, add new elements, delete element\
+_("You can select a different command for each element, move them, add new elements, delete element\
s, or if it's replace/insert, you can edit the text that replaces the selected text, or is inserte\
d.\n\n"),
Modified: po/be.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3218,7 +3218,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:874
msgid ""
-"You can select a diferent command for each element, move them, add new "
+"You can select a different command for each element, move them, add new "
"elements, delete elements, or if it's replace/insert, you can edit the text "
"that replaces the selected text, or is inserted.\n"
"\n"
Modified: po/ca.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3152,7 +3152,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:874
msgid ""
-"You can select a diferent command for each element, move them, add new "
+"You can select a different command for each element, move them, add new "
"elements, delete elements, or if it's replace/insert, you can edit the text "
"that replaces the selected text, or is inserted.\n"
"\n"
Modified: po/da.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3179,7 +3179,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:874
msgid ""
-"You can select a diferent command for each element, move them, add new "
+"You can select a different command for each element, move them, add new "
"elements, delete elements, or if it's replace/insert, you can edit the text "
"that replaces the selected text, or is inserted.\n"
"\n"
Modified: po/de.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3686,7 +3686,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:874
msgid ""
-"You can select a diferent command for each element, move them, add new "
+"You can select a different command for each element, move them, add new "
"elements, delete elements, or if it's replace/insert, you can edit the text "
"that replaces the selected text, or is inserted.\n"
"\n"
Modified: po/es.po
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -3306,7 +3306,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:874
msgid ""
-"You can select a diferent command for each element, move them, add new "
+"You can select a different command for each element, move them, add new "
"elements, delete elements, or if it's replace/insert, you can edit the text "
"that replaces the selected text, or is inserted.\n"
"\n"
@@ -7148,7 +7148,7 @@ msgstr "Autocompleta etiquetas XML/HTML mediante recortes"
#~ "it, or re-record it. You can also click on a macro's name and change it, "
#~ "or the key combination and re-define that assuming that it's not already "
#~ "in use. Selecting the edit option allows you to view all the individual "
-#~ "elements that make up the macro. You can select a diferent command for "
+#~ "elements that make up the macro. You can select a different command for "
#~ "each element, move them, add new elements, delete elements, or if it's "
#~ "replace/insert, you can edit the text that replaces the selected text, or "
#~ "is inserted.\n"
Modified: po/fr.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3305,7 +3305,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:874
msgid ""
-"You can select a diferent command for each element, move them, add new "
+"You can select a different command for each element, move them, add new "
"elements, delete elements, or if it's replace/insert, you can edit the text "
"that replaces the selected text, or is inserted.\n"
"\n"
Modified: po/gl.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3348,7 +3348,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:874
msgid ""
-"You can select a diferent command for each element, move them, add new "
+"You can select a different command for each element, move them, add new "
"elements, delete elements, or if it's replace/insert, you can edit the text "
"that replaces the selected text, or is inserted.\n"
"\n"
Modified: po/it.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3289,7 +3289,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:874
msgid ""
-"You can select a diferent command for each element, move them, add new "
+"You can select a different command for each element, move them, add new "
"elements, delete elements, or if it's replace/insert, you can edit the text "
"that replaces the selected text, or is inserted.\n"
"\n"
Modified: po/ja.po
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -3256,7 +3256,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:874
msgid ""
-"You can select a diferent command for each element, move them, add new "
+"You can select a different command for each element, move them, add new "
"elements, delete elements, or if it's replace/insert, you can edit the text "
"that replaces the selected text, or is inserted.\n"
"\n"
@@ -7041,7 +7041,7 @@ msgstr "スニペットを使用してXML/HTMLタグを自動補完"
#~ "it, or re-record it. You can also click on a macro's name and change it, "
#~ "or the key combination and re-define that assuming that it's not already "
#~ "in use. Selecting the edit option allows you to view all the individual "
-#~ "elements that make up the macro. You can select a diferent command for "
+#~ "elements that make up the macro. You can select a different command for "
#~ "each element, move them, add new elements, delete elements, or if it's "
#~ "replace/insert, you can edit the text that replaces the selected text, or "
#~ "is inserted.\n"
Modified: po/nl.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3174,7 +3174,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:874
msgid ""
-"You can select a diferent command for each element, move them, add new "
+"You can select a different command for each element, move them, add new "
"elements, delete elements, or if it's replace/insert, you can edit the text "
"that replaces the selected text, or is inserted.\n"
"\n"
Modified: po/pt.po
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -3627,7 +3627,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:874
msgid ""
-"You can select a diferent command for each element, move them, add new "
+"You can select a different command for each element, move them, add new "
"elements, delete elements, or if it's replace/insert, you can edit the text "
"that replaces the selected text, or is inserted.\n"
"\n"
@@ -7733,7 +7733,7 @@ msgstr "Auto completar etiquetas XML/HTML usando excertos de código."
#~ "it, or re-record it. You can also click on a macro's name and change it, "
#~ "or the key combination and re-define that assuming that it's not already "
#~ "in use. Selecting the edit option allows you to view all the individual "
-#~ "elements that make up the macro. You can select a diferent command for "
+#~ "elements that make up the macro. You can select a different command for "
#~ "each element, move them, add new elements, delete elements, or if it's "
#~ "replace/insert, you can edit the text that replaces the selected text, or "
#~ "is inserted.\n"
Modified: po/pt_BR.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3358,7 +3358,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:874
msgid ""
-"You can select a diferent command for each element, move them, add new "
+"You can select a different command for each element, move them, add new "
"elements, delete elements, or if it's replace/insert, you can edit the text "
"that replaces the selected text, or is inserted.\n"
"\n"
Modified: po/ru.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3541,7 +3541,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:874
msgid ""
-"You can select a diferent command for each element, move them, add new "
+"You can select a different command for each element, move them, add new "
"elements, delete elements, or if it's replace/insert, you can edit the text "
"that replaces the selected text, or is inserted.\n"
"\n"
Modified: po/tr.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3212,7 +3212,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:874
msgid ""
-"You can select a diferent command for each element, move them, add new "
+"You can select a different command for each element, move them, add new "
"elements, delete elements, or if it's replace/insert, you can edit the text "
"that replaces the selected text, or is inserted.\n"
"\n"
Modified: po/zh_CN.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3364,7 +3364,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:874
msgid ""
-"You can select a diferent command for each element, move them, add new "
+"You can select a different command for each element, move them, add new "
"elements, delete elements, or if it's replace/insert, you can edit the text "
"that replaces the selected text, or is inserted.\n"
"\n"
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Philipp Wiesemann <philipp.wiesemann(a)arcor.de>
Committer: Philipp Wiesemann <philipp.wiesemann(a)arcor.de>
Date: Sat, 30 May 2015 20:39:50 UTC
Commit: c296e9457a07f771b09095a9b77f002e11fb3561
https://github.com/geany/geany-plugins/commit/c296e9457a07f771b09095a9b77f0…
Log Message:
-----------
Fix typo in message
Modified Paths:
--------------
geanymacro/src/geanymacro.c
po/be.po
po/ca.po
po/da.po
po/de.po
po/es.po
po/fr.po
po/gl.po
po/it.po
po/ja.po
po/nl.po
po/pt.po
po/pt_BR.po
po/ru.po
po/tr.po
po/zh_CN.po
Modified: geanymacro/src/geanymacro.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -879,7 +879,7 @@ _("The only thing to bear in mind is that undo and redo actions are not recorded
layed when the macro is re-run.\n\n"),
_("You can alter the default behaviour of this plugin by selecting Plugin Manager under the Tools \
-menu, selecting this plugin, and cliking Preferences. "),
+menu, selecting this plugin, and clicking Preferences. "),
_("You can change:\n"),
_("Save Macros when close Geany - If this is selected then Geany will save any recorded macros and\
reload them for use the next time you open Geany, if not they will be lost when Geany is closed.\
Modified: po/be.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3234,7 +3234,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:881
msgid ""
"You can alter the default behaviour of this plugin by selecting Plugin "
-"Manager under the Tools menu, selecting this plugin, and cliking "
+"Manager under the Tools menu, selecting this plugin, and clicking "
"Preferences. "
msgstr ""
Modified: po/ca.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3168,7 +3168,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:881
msgid ""
"You can alter the default behaviour of this plugin by selecting Plugin "
-"Manager under the Tools menu, selecting this plugin, and cliking "
+"Manager under the Tools menu, selecting this plugin, and clicking "
"Preferences. "
msgstr ""
Modified: po/da.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3195,7 +3195,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:881
msgid ""
"You can alter the default behaviour of this plugin by selecting Plugin "
-"Manager under the Tools menu, selecting this plugin, and cliking "
+"Manager under the Tools menu, selecting this plugin, and clicking "
"Preferences. "
msgstr ""
Modified: po/de.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3708,7 +3708,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:881
msgid ""
"You can alter the default behaviour of this plugin by selecting Plugin "
-"Manager under the Tools menu, selecting this plugin, and cliking "
+"Manager under the Tools menu, selecting this plugin, and clicking "
"Preferences. "
msgstr ""
"Sie können das Standardverhalten des Plugins ändern, indem Sie die "
Modified: po/es.po
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -3329,7 +3329,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:881
msgid ""
"You can alter the default behaviour of this plugin by selecting Plugin "
-"Manager under the Tools menu, selecting this plugin, and cliking "
+"Manager under the Tools menu, selecting this plugin, and clicking "
"Preferences. "
msgstr ""
"Puede alterar el comportamiento predeterminado de este plugin seleccionando "
@@ -7157,7 +7157,7 @@ msgstr "Autocompleta etiquetas XML/HTML mediante recortes"
#~ "recorded, and won't be replayed when the macro is re-run.\n"
#~ "\n"
#~ "You can alter the default behaviour of this plugin by selecting Plugin "
-#~ "Manager under the Tools menu, selecting this plugin, and cliking "
+#~ "Manager under the Tools menu, selecting this plugin, and clicking "
#~ "Preferences. You can change:\n"
#~ "Save Macros when close Geany - If this is selected then Geany will save "
#~ "any recorded macros and reload them for use the next time you open Geany, "
@@ -7221,7 +7221,7 @@ msgstr "Autocompleta etiquetas XML/HTML mediante recortes"
#~ "are set the next time you open the file.\n"
#~ "\n"
#~ "You can alter the default behaviour of this plugin by selecting Plugin "
-#~ "Manager under the Tools menu, selecting this plugin, and cliking "
+#~ "Manager under the Tools menu, selecting this plugin, and clicking "
#~ "Preferences. You can change:\n"
#~ "Remember fold state - if this is set then this plugin will remember the "
#~ "state of any folds along with the numbered bookmarks and set them when "
Modified: po/fr.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3329,7 +3329,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:881
msgid ""
"You can alter the default behaviour of this plugin by selecting Plugin "
-"Manager under the Tools menu, selecting this plugin, and cliking "
+"Manager under the Tools menu, selecting this plugin, and clicking "
"Preferences. "
msgstr ""
"Vous pouvez changer le comportement du plugin en choisissant « Gestionnaire "
Modified: po/gl.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3364,7 +3364,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:881
msgid ""
"You can alter the default behaviour of this plugin by selecting Plugin "
-"Manager under the Tools menu, selecting this plugin, and cliking "
+"Manager under the Tools menu, selecting this plugin, and clicking "
"Preferences. "
msgstr ""
Modified: po/it.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3311,7 +3311,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:881
msgid ""
"You can alter the default behaviour of this plugin by selecting Plugin "
-"Manager under the Tools menu, selecting this plugin, and cliking "
+"Manager under the Tools menu, selecting this plugin, and clicking "
"Preferences. "
msgstr ""
"Puoi modificare il comportamento di questo plugin selezionando Plugin "
Modified: po/ja.po
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -3278,7 +3278,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:881
msgid ""
"You can alter the default behaviour of this plugin by selecting Plugin "
-"Manager under the Tools menu, selecting this plugin, and cliking "
+"Manager under the Tools menu, selecting this plugin, and clicking "
"Preferences. "
msgstr ""
"このプラグインの既定の動作を変更することも可能です。ツールメニューのプラグイ"
@@ -7050,7 +7050,7 @@ msgstr "スニペットを使用してXML/HTMLタグを自動補完"
#~ "recorded, and won't be replayed when the macro is re-run.\n"
#~ "\n"
#~ "You can alter the default behaviour of this plugin by selecting Plugin "
-#~ "Manager under the Tools menu, selecting this plugin, and cliking "
+#~ "Manager under the Tools menu, selecting this plugin, and clicking "
#~ "Preferences. You can change:\n"
#~ "Save Macros when close Geany - If this is selected then Geany will save "
#~ "any recorded macros and reload them for use the next time you open Geany, "
@@ -7108,7 +7108,7 @@ msgstr "スニペットを使用してXML/HTMLタグを自動補完"
#~ "are set the next time you open the file.\n"
#~ "\n"
#~ "You can alter the default behaviour of this plugin by selecting Plugin "
-#~ "Manager under the Tools menu, selecting this plugin, and cliking "
+#~ "Manager under the Tools menu, selecting this plugin, and clicking "
#~ "Preferences. You can change:\n"
#~ "Remember fold state - if this is set then this plugin will remember the "
#~ "state of any folds along with the numbered bookmarks and set them when "
@@ -7184,7 +7184,7 @@ msgstr "スニペットを使用してXML/HTMLタグを自動補完"
#~ "key combination and re-define that asuming that it's not already in use.\n"
#~ "\n"
#~ "You can alter the default behaviur of this plugin by selecting Plugin "
-#~ "Manager under the Tools menu, selecting this plugin, and cliking "
+#~ "Manager under the Tools menu, selecting this plugin, and clicking "
#~ "Preferences. You can change:\n"
#~ "Remember fold state - if this is set then this plugin will remember the "
#~ "state of any folds along with the numbered bookmarks and set them when "
Modified: po/nl.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3190,7 +3190,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:881
msgid ""
"You can alter the default behaviour of this plugin by selecting Plugin "
-"Manager under the Tools menu, selecting this plugin, and cliking "
+"Manager under the Tools menu, selecting this plugin, and clicking "
"Preferences. "
msgstr ""
Modified: po/pt.po
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -3650,7 +3650,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:881
msgid ""
"You can alter the default behaviour of this plugin by selecting Plugin "
-"Manager under the Tools menu, selecting this plugin, and cliking "
+"Manager under the Tools menu, selecting this plugin, and clicking "
"Preferences. "
msgstr ""
"Pode alterar o comportamento predefinido desta extensão selecionando Gestor "
@@ -7742,7 +7742,7 @@ msgstr "Auto completar etiquetas XML/HTML usando excertos de código."
#~ "recorded, and won't be replayed when the macro is re-run.\n"
#~ "\n"
#~ "You can alter the default behaviour of this plugin by selecting Plugin "
-#~ "Manager under the Tools menu, selecting this plugin, and cliking "
+#~ "Manager under the Tools menu, selecting this plugin, and clicking "
#~ "Preferences. You can change:\n"
#~ "Save Macros when close Geany - If this is selected then Geany will save "
#~ "any recorded macros and reload them for use the next time you open Geany, "
@@ -7801,7 +7801,7 @@ msgstr "Auto completar etiquetas XML/HTML usando excertos de código."
#~ "are set the next time you open the file.\n"
#~ "\n"
#~ "You can alter the default behaviour of this plugin by selecting Plugin "
-#~ "Manager under the Tools menu, selecting this plugin, and cliking "
+#~ "Manager under the Tools menu, selecting this plugin, and clicking "
#~ "Preferences. You can change:\n"
#~ "Remember fold state - if this is set then this plugin will remember the "
#~ "state of any folds along with the numbered bookmarks and set them when "
@@ -7882,7 +7882,7 @@ msgstr "Auto completar etiquetas XML/HTML usando excertos de código."
#~ "key combination and re-define that asuming that it's not already in use.\n"
#~ "\n"
#~ "You can alter the default behaviur of this plugin by selecting Plugin "
-#~ "Manager under the Tools menu, selecting this plugin, and cliking "
+#~ "Manager under the Tools menu, selecting this plugin, and clicking "
#~ "Preferences. You can change:\n"
#~ "Remember fold state - if this is set then this plugin will remember the "
#~ "state of any folds along with the numbered bookmarks and set them when "
Modified: po/pt_BR.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3374,7 +3374,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:881
msgid ""
"You can alter the default behaviour of this plugin by selecting Plugin "
-"Manager under the Tools menu, selecting this plugin, and cliking "
+"Manager under the Tools menu, selecting this plugin, and clicking "
"Preferences. "
msgstr ""
Modified: po/ru.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3564,7 +3564,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:881
msgid ""
"You can alter the default behaviour of this plugin by selecting Plugin "
-"Manager under the Tools menu, selecting this plugin, and cliking "
+"Manager under the Tools menu, selecting this plugin, and clicking "
"Preferences. "
msgstr ""
"Вы можете изменить стандартное поведение модуля, выделив модуль в Менеджере "
Modified: po/tr.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3228,7 +3228,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:881
msgid ""
"You can alter the default behaviour of this plugin by selecting Plugin "
-"Manager under the Tools menu, selecting this plugin, and cliking "
+"Manager under the Tools menu, selecting this plugin, and clicking "
"Preferences. "
msgstr ""
Modified: po/zh_CN.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3380,7 +3380,7 @@ msgstr ""
#: ../geanymacro/src/geanymacro.c:881
msgid ""
"You can alter the default behaviour of this plugin by selecting Plugin "
-"Manager under the Tools menu, selecting this plugin, and cliking "
+"Manager under the Tools menu, selecting this plugin, and clicking "
"Preferences. "
msgstr ""
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Philipp Wiesemann <philipp.wiesemann(a)arcor.de>
Committer: Philipp Wiesemann <philipp.wiesemann(a)arcor.de>
Date: Sat, 30 May 2015 20:36:22 UTC
Commit: 53e268a5b605d3ec67cdeb5a7dcf7208a22ebe71
https://github.com/geany/geany-plugins/commit/53e268a5b605d3ec67cdeb5a7dcf7…
Log Message:
-----------
Fix typo in message
Modified Paths:
--------------
geanynumberedbookmarks/src/geanynumberedbookmarks.c
po/be.po
po/ca.po
po/da.po
po/de.po
po/es.po
po/fr.po
po/gl.po
po/it.po
po/ja.po
po/nl.po
po/pt.po
po/pt_BR.po
po/ru.po
po/tr.po
po/zh_CN.po
Modified: geanynumberedbookmarks/src/geanynumberedbookmarks.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1274,7 +1274,7 @@ void plugin_help(void)
_("This Plugin implements Numbered Bookmarks in Geany, as well as remembering the state of folds, \
and positions of standard non-numbered bookmarks when a file is saved.\n\n"
"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark press Ctrl+Shift+a n\
-umber from 0 to 9. You will see a marker apear next to the line number. If you press Ctrl+Shift+a \
+umber from 0 to 9. You will see a marker appear next to the line number. If you press Ctrl+Shift+a \
number on a line that already has that bookmark number then it removes the bookmark, otherwise it \
will move the bookmark there if it was set on a different line, or create it if it had not already\
been set. Only the most recently set bookmark on a line will be shown, but you can have more than\
Modified: po/be.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3637,7 +3637,7 @@ msgid ""
"file is saved.\n"
"\n"
"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark "
-"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to "
+"press Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to "
"the line number. If you press Ctrl+Shift+a number on a line that already has "
"that bookmark number then it removes the bookmark, otherwise it will move "
"the bookmark there if it was set on a different line, or create it if it had "
Modified: po/ca.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3567,7 +3567,7 @@ msgid ""
"file is saved.\n"
"\n"
"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark "
-"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to "
+"press Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to "
"the line number. If you press Ctrl+Shift+a number on a line that already has "
"that bookmark number then it removes the bookmark, otherwise it will move "
"the bookmark there if it was set on a different line, or create it if it had "
Modified: po/da.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3593,7 +3593,7 @@ msgid ""
"file is saved.\n"
"\n"
"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark "
-"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to "
+"press Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to "
"the line number. If you press Ctrl+Shift+a number on a line that already has "
"that bookmark number then it removes the bookmark, otherwise it will move "
"the bookmark there if it was set on a different line, or create it if it had "
Modified: po/de.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4147,7 +4147,7 @@ msgid ""
"file is saved.\n"
"\n"
"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark "
-"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to "
+"press Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to "
"the line number. If you press Ctrl+Shift+a number on a line that already has "
"that bookmark number then it removes the bookmark, otherwise it will move "
"the bookmark there if it was set on a different line, or create it if it had "
Modified: po/es.po
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -3771,7 +3771,7 @@ msgid ""
"file is saved.\n"
"\n"
"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark "
-"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to "
+"press Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to "
"the line number. If you press Ctrl+Shift+a number on a line that already has "
"that bookmark number then it removes the bookmark, otherwise it will move "
"the bookmark there if it was set on a different line, or create it if it had "
@@ -7210,7 +7210,7 @@ msgstr "Autocompleta etiquetas XML/HTML mediante recortes"
#~ "one bookmark, you would have to cycle through them until you reached the "
#~ "one you wanted. With this plugin you can go straight to the bookmark that "
#~ "you want with a single key combination. To set a numbered bookmark press "
-#~ "Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to the "
+#~ "Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to the "
#~ "line number. If you press Ctrl+Shift+a number on a line that already has "
#~ "that bookmark number then it removes the bookmark, otherwise it will move "
#~ "the bookmark there if it was set on a different line, or create it if it "
Modified: po/fr.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3778,7 +3778,7 @@ msgid ""
"file is saved.\n"
"\n"
"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark "
-"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to "
+"press Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to "
"the line number. If you press Ctrl+Shift+a number on a line that already has "
"that bookmark number then it removes the bookmark, otherwise it will move "
"the bookmark there if it was set on a different line, or create it if it had "
Modified: po/gl.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3784,7 +3784,7 @@ msgid ""
"file is saved.\n"
"\n"
"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark "
-"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to "
+"press Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to "
"the line number. If you press Ctrl+Shift+a number on a line that already has "
"that bookmark number then it removes the bookmark, otherwise it will move "
"the bookmark there if it was set on a different line, or create it if it had "
Modified: po/it.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3752,7 +3752,7 @@ msgid ""
"file is saved.\n"
"\n"
"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark "
-"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to "
+"press Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to "
"the line number. If you press Ctrl+Shift+a number on a line that already has "
"that bookmark number then it removes the bookmark, otherwise it will move "
"the bookmark there if it was set on a different line, or create it if it had "
Modified: po/ja.po
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -3692,7 +3692,7 @@ msgid ""
"file is saved.\n"
"\n"
"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark "
-"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to "
+"press Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to "
"the line number. If you press Ctrl+Shift+a number on a line that already has "
"that bookmark number then it removes the bookmark, otherwise it will move "
"the bookmark there if it was set on a different line, or create it if it had "
@@ -7097,7 +7097,7 @@ msgstr "スニペットを使用してXML/HTMLタグを自動補完"
#~ "one bookmark, you would have to cycle through them until you reached the "
#~ "one you wanted. With this plugin you can go straight to the bookmark that "
#~ "you want with a single key combination. To set a numbered bookmark press "
-#~ "Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to the "
+#~ "Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to the "
#~ "line number. If you press Ctrl+Shift+a number on a line that already has "
#~ "that bookmark number then it removes the bookmark, otherwise it will move "
#~ "the bookmark there if it was set on a different line, or create it if it "
@@ -7157,7 +7157,7 @@ msgstr "スニペットを使用してXML/HTMLタグを自動補完"
#~ "reached the one you wanted. With this plugin you can go straight to the "
#~ "bookmark that you want with a single key combination. To set a numbered "
#~ "bookmark press Ctrl+Shift+a number from 0 to 9. You will see a marker "
-#~ "apear next to the line number. If you press Ctrl+Shift+a number on a line "
+#~ "appear next to the line number. If you press Ctrl+Shift+a number on a line "
#~ "that already has that bookmark number then it removes the bookmark, "
#~ "otherwise it will move the bookmark there if it was set on a different "
#~ "line, or create it if it had not already been set. Only the bookmark with "
Modified: po/nl.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3591,7 +3591,7 @@ msgid ""
"file is saved.\n"
"\n"
"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark "
-"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to "
+"press Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to "
"the line number. If you press Ctrl+Shift+a number on a line that already has "
"that bookmark number then it removes the bookmark, otherwise it will move "
"the bookmark there if it was set on a different line, or create it if it had "
Modified: po/pt.po
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -4088,7 +4088,7 @@ msgid ""
"file is saved.\n"
"\n"
"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark "
-"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to "
+"press Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to "
"the line number. If you press Ctrl+Shift+a number on a line that already has "
"that bookmark number then it removes the bookmark, otherwise it will move "
"the bookmark there if it was set on a different line, or create it if it had "
@@ -7790,7 +7790,7 @@ msgstr "Auto completar etiquetas XML/HTML usando excertos de código."
#~ "one bookmark, you would have to cycle through them until you reached the "
#~ "one you wanted. With this plugin you can go straight to the bookmark that "
#~ "you want with a single key combination. To set a numbered bookmark press "
-#~ "Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to the "
+#~ "Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to the "
#~ "line number. If you press Ctrl+Shift+a number on a line that already has "
#~ "that bookmark number then it removes the bookmark, otherwise it will move "
#~ "the bookmark there if it was set on a different line, or create it if it "
@@ -7855,7 +7855,7 @@ msgstr "Auto completar etiquetas XML/HTML usando excertos de código."
#~ "reached the one you wanted. With this plugin you can go straight to the "
#~ "bookmark that you want with a single key combination. To set a numbered "
#~ "bookmark press Ctrl+Shift+a number from 0 to 9. You will see a marker "
-#~ "apear next to the line number. If you press Ctrl+Shift+a number on a line "
+#~ "appear next to the line number. If you press Ctrl+Shift+a number on a line "
#~ "that already has that bookmark number then it removes the bookmark, "
#~ "otherwise it will move the bookmark there if it was set on a different "
#~ "line, or create it if it had not already been set. Only the bookmark with "
Modified: po/pt_BR.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3796,7 +3796,7 @@ msgid ""
"file is saved.\n"
"\n"
"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark "
-"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to "
+"press Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to "
"the line number. If you press Ctrl+Shift+a number on a line that already has "
"that bookmark number then it removes the bookmark, otherwise it will move "
"the bookmark there if it was set on a different line, or create it if it had "
Modified: po/ru.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4002,7 +4002,7 @@ msgid ""
"file is saved.\n"
"\n"
"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark "
-"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to "
+"press Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to "
"the line number. If you press Ctrl+Shift+a number on a line that already has "
"that bookmark number then it removes the bookmark, otherwise it will move "
"the bookmark there if it was set on a different line, or create it if it had "
Modified: po/tr.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3630,7 +3630,7 @@ msgid ""
"file is saved.\n"
"\n"
"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark "
-"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to "
+"press Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to "
"the line number. If you press Ctrl+Shift+a number on a line that already has "
"that bookmark number then it removes the bookmark, otherwise it will move "
"the bookmark there if it was set on a different line, or create it if it had "
Modified: po/zh_CN.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3794,7 +3794,7 @@ msgid ""
"file is saved.\n"
"\n"
"It allows you to use up to 10 numbered bookmarks. To set a numbered bookmark "
-"press Ctrl+Shift+a number from 0 to 9. You will see a marker apear next to "
+"press Ctrl+Shift+a number from 0 to 9. You will see a marker appear next to "
"the line number. If you press Ctrl+Shift+a number on a line that already has "
"that bookmark number then it removes the bookmark, otherwise it will move "
"the bookmark there if it was set on a different line, or create it if it had "
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Mon, 13 Apr 2015 14:15:18 UTC
Commit: 5a4bf67e6aa612a109980d1ee4ebd0be23ed36c5
https://github.com/geany/geany-plugins/commit/5a4bf67e6aa612a109980d1ee4ebd…
Log Message:
-----------
Extend a bit the docs on how to add a plugin the the build system
Modified Paths:
--------------
HACKING
Modified: HACKING
57 lines changed, 39 insertions(+), 18 deletions(-)
===================================================================
@@ -170,24 +170,25 @@ configure.ac
^^^^^^^^^^^^
Add an entry into configure.ac for your plugin. The entry should look like
-``GP_CHECK_YOURFANCYPLUGINNAME``
+``GP_CHECK_YOURFANCYPLUGINNAME``. This is a custom macro that will be
+discussed in the `build sub-folder`_ section below.
-Makefile.am
-^^^^^^^^^^^
+Root Makefile.am
+^^^^^^^^^^^^^^^^
-Add an entry into Makefile.am where to find the sources of your plugin.
-This entry shall look like this::
+Add an entry into the root Makefile.am where to find the sources of your
+plugin. This entry shall look like this::
if ENABLE_YOURFANCYPLUGINNAME
SUBDIRS += yourfancyplugin
endif
-build-subfolder
-^^^^^^^^^^^^^^^
+`build` sub-folder
+^^^^^^^^^^^^^^^^^^
-To build your plugin you will also need to add an m4-script inside
-the ``build`` subfolder of the geany-plugin sources. The file should
+To build your plugin you will also need to add an M4 script inside
+the ``build`` sub-folder of the geany-plugin sources. The file should
be called ``yourfancypluginname.m4`` and contain the definition of the M4
macro that checks for your plugin's dependencies and generates its
build files, which macro is called from configure.ac::
@@ -227,16 +228,16 @@ GTK 2 and 3 but you want to check for a minimal GTK2 version, you may
use ``$GP_GTK_PACKAGE >= 2.XX`` in a ``GP_CHECK_PLUGIN_DEPS`` call.
-Makefile inside your plugin folder
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Makefiles inside your plugin folder
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-The Makefile inside your plugin folder can be seperated at least
+The Makefiles inside your plugin folder can be separated at least
into two parts: The first part is located inside the root folder of
-your plugin, whereas the second one is located inside src/ of your
+your plugin, whereas the second one is located inside ``src/`` of your
plugin.
-Plugin-root
+Plugin root
###########
The file should be called ``Makefile.am`` and contains the entry
@@ -248,11 +249,11 @@ similar to this::
plugin = yourfancypluginname
-src-folder
-###########
+`src` folder
+############
-The ``Makefile.am`` inside the src-Folder is containing the
-informationen how to build the sources. An example could look like::
+The ``Makefile.am`` inside the ``src`` folder declares how to build the
+sources. An example could look like::
include $(top_srcdir)/build/vars.build.mk
@@ -263,6 +264,26 @@ informationen how to build the sources. An example could look like::
include $(top_srcdir)/build/cppcheck.mk
+If you checked for additional dependencies in ``yourfancypluginname.m4``
+(besides Geany, GLib and GTK, which are included in ``$(COMMONLIBS)``),
+you will need to use the various flags they might require.
+
+For a library checked with ``GP_CHECK_PLUGIN_DEPS`` you will have to add
+``$(PREFIX_CFLAGS)`` to ``yourfancypluginname_la_CFLAGS`` and
+``$(PREFIX_LIBS)`` to ``yourfancypluginname_la_LIBADD`` (where
+``PREFIX`` is the name you chose to store the results in the
+``GP_CHECK_PLUGIN_DEPS`` call). Note that if you set
+``yourfancypluginname_la_CFLAGS`` you will need to explicitly mention
+``$(AM_CFLAGS)`` in it.
+
+For example, if you checked for the hypothetical library ``foo`` and
+used the ``FOO`` prefix to store the results, you should alter the
+Makefile.am to references them::
+
+ yourfancypluginname_la_CFLAGS = $(AM_CFLAGS) $(FOO_CFLAGS)
+ yourfancypluginname_la_LIBADD = $(COMMONLIBS) $(FOO_LIBS)
+
+
Additional things to do for a new plugin
----------------------------------------
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Mon, 13 Apr 2015 15:04:08 UTC
Commit: 07a32b8dcf14980e31cb06fbe4f96fac6b787fdd
https://github.com/geany/geany-plugins/commit/07a32b8dcf14980e31cb06fbe4f96…
Log Message:
-----------
Add docs on how to add a plugin to the Waf build system
Modified Paths:
--------------
HACKING
Modified: HACKING
49 lines changed, 49 insertions(+), 0 deletions(-)
===================================================================
@@ -284,6 +284,55 @@ Makefile.am to references them::
yourfancypluginname_la_LIBADD = $(COMMONLIBS) $(FOO_LIBS)
+Adding a new plugin to Waf build system
+---------------------------------------
+
+Configuration checks
+^^^^^^^^^^^^^^^^^^^^
+
+Add a ``wscript_configure`` file in your plugin's root folder.
+This file contains checks for dependencies, like libraries your plugin
+requires. If your plugin does not have any additional dependencies
+besides Geany, GLib and GTK, you can leave this file empty (but you need
+to create it nonetheless).
+
+Generally checks are performed with ``check_cfg_cached``. An example
+to check for library ``foo`` at version 2.0 or newer might look like
+this::
+
+ from build.wafutils import check_cfg_cached
+
+ check_cfg_cached(conf,
+ package='foo',
+ atleast_version='2.0',
+ uselib_store='FOO',
+ mandatory=True,
+ args='--cflags --libs')
+
+
+Build rules
+^^^^^^^^^^^
+
+Add a ``wscript_build`` file inside your plugin's root folder.
+This files defines how the plugin is built, and has to at least call
+``build_plugin()``. An example could look like this::
+
+ from build.wafutils import build_plugin
+
+ name = 'YourFancyPluginName'
+ sources = ['src/yourfancypluginname.c']
+
+ build_plugin(bld, name, sources=sources)
+
+If you checked for additional dependencies in ``wscript_configure``
+in addition to the standard Geany, GLib or GTK, you might need to make
+use of some results of these checks. Given the configuration example
+above, you would need to add the ``libraries=['FOO']`` argument to
+the ``build_plugin()`` call::
+
+ build_plugin(bld, name, sources=sources, libraries=['FOO'])
+
+
Additional things to do for a new plugin
----------------------------------------
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Wed, 27 May 2015 21:17:23 UTC
Commit: da466b327d959208b5a8205e1018a03962c3a5ec
https://github.com/geany/geany-plugins/commit/da466b327d959208b5a8205e1018a…
Log Message:
-----------
Merge pull request #215 from b4n/hacking
Extend docs on adding a plugin to the build systems
Modified Paths:
--------------
HACKING
Modified: HACKING
106 lines changed, 88 insertions(+), 18 deletions(-)
===================================================================
@@ -170,24 +170,25 @@ configure.ac
^^^^^^^^^^^^
Add an entry into configure.ac for your plugin. The entry should look like
-``GP_CHECK_YOURFANCYPLUGINNAME``
+``GP_CHECK_YOURFANCYPLUGINNAME``. This is a custom macro that will be
+discussed in the `build sub-folder`_ section below.
-Makefile.am
-^^^^^^^^^^^
+Root Makefile.am
+^^^^^^^^^^^^^^^^
-Add an entry into Makefile.am where to find the sources of your plugin.
-This entry shall look like this::
+Add an entry into the root Makefile.am where to find the sources of your
+plugin. This entry shall look like this::
if ENABLE_YOURFANCYPLUGINNAME
SUBDIRS += yourfancyplugin
endif
-build-subfolder
-^^^^^^^^^^^^^^^
+`build` sub-folder
+^^^^^^^^^^^^^^^^^^
-To build your plugin you will also need to add an m4-script inside
-the ``build`` subfolder of the geany-plugin sources. The file should
+To build your plugin you will also need to add an M4 script inside
+the ``build`` sub-folder of the geany-plugin sources. The file should
be called ``yourfancypluginname.m4`` and contain the definition of the M4
macro that checks for your plugin's dependencies and generates its
build files, which macro is called from configure.ac::
@@ -227,16 +228,16 @@ GTK 2 and 3 but you want to check for a minimal GTK2 version, you may
use ``$GP_GTK_PACKAGE >= 2.XX`` in a ``GP_CHECK_PLUGIN_DEPS`` call.
-Makefile inside your plugin folder
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Makefiles inside your plugin folder
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-The Makefile inside your plugin folder can be seperated at least
+The Makefiles inside your plugin folder can be separated at least
into two parts: The first part is located inside the root folder of
-your plugin, whereas the second one is located inside src/ of your
+your plugin, whereas the second one is located inside ``src/`` of your
plugin.
-Plugin-root
+Plugin root
###########
The file should be called ``Makefile.am`` and contains the entry
@@ -248,11 +249,11 @@ similar to this::
plugin = yourfancypluginname
-src-folder
-###########
+`src` folder
+############
-The ``Makefile.am`` inside the src-Folder is containing the
-informationen how to build the sources. An example could look like::
+The ``Makefile.am`` inside the ``src`` folder declares how to build the
+sources. An example could look like::
include $(top_srcdir)/build/vars.build.mk
@@ -263,6 +264,75 @@ informationen how to build the sources. An example could look like::
include $(top_srcdir)/build/cppcheck.mk
+If you checked for additional dependencies in ``yourfancypluginname.m4``
+(besides Geany, GLib and GTK, which are included in ``$(COMMONLIBS)``),
+you will need to use the various flags they might require.
+
+For a library checked with ``GP_CHECK_PLUGIN_DEPS`` you will have to add
+``$(PREFIX_CFLAGS)`` to ``yourfancypluginname_la_CFLAGS`` and
+``$(PREFIX_LIBS)`` to ``yourfancypluginname_la_LIBADD`` (where
+``PREFIX`` is the name you chose to store the results in the
+``GP_CHECK_PLUGIN_DEPS`` call). Note that if you set
+``yourfancypluginname_la_CFLAGS`` you will need to explicitly mention
+``$(AM_CFLAGS)`` in it.
+
+For example, if you checked for the hypothetical library ``foo`` and
+used the ``FOO`` prefix to store the results, you should alter the
+Makefile.am to references them::
+
+ yourfancypluginname_la_CFLAGS = $(AM_CFLAGS) $(FOO_CFLAGS)
+ yourfancypluginname_la_LIBADD = $(COMMONLIBS) $(FOO_LIBS)
+
+
+Adding a new plugin to Waf build system
+---------------------------------------
+
+Configuration checks
+^^^^^^^^^^^^^^^^^^^^
+
+Add a ``wscript_configure`` file in your plugin's root folder.
+This file contains checks for dependencies, like libraries your plugin
+requires. If your plugin does not have any additional dependencies
+besides Geany, GLib and GTK, you can leave this file empty (but you need
+to create it nonetheless).
+
+Generally checks are performed with ``check_cfg_cached``. An example
+to check for library ``foo`` at version 2.0 or newer might look like
+this::
+
+ from build.wafutils import check_cfg_cached
+
+ check_cfg_cached(conf,
+ package='foo',
+ atleast_version='2.0',
+ uselib_store='FOO',
+ mandatory=True,
+ args='--cflags --libs')
+
+
+Build rules
+^^^^^^^^^^^
+
+Add a ``wscript_build`` file inside your plugin's root folder.
+This files defines how the plugin is built, and has to at least call
+``build_plugin()``. An example could look like this::
+
+ from build.wafutils import build_plugin
+
+ name = 'YourFancyPluginName'
+ sources = ['src/yourfancypluginname.c']
+
+ build_plugin(bld, name, sources=sources)
+
+If you checked for additional dependencies in ``wscript_configure``
+in addition to the standard Geany, GLib or GTK, you might need to make
+use of some results of these checks. Given the configuration example
+above, you would need to add the ``libraries=['FOO']`` argument to
+the ``build_plugin()`` call::
+
+ build_plugin(bld, name, sources=sources, libraries=['FOO'])
+
+
Additional things to do for a new plugin
----------------------------------------
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).