[geany/geany-plugins] 1310a1: Merge pull request #17 from WilliamFraser/master

[Frank Lanitz]

Branch:      refs/heads/master
Author:      Frank Lanitz <frank at frank.uvena.de>
Committer:   Frank Lanitz <frank at frank.uvena.de>
Date:        Wed, 14 Mar 2012 19:57:09
Commit:      1310a1e568e7047c774943821c139addb0e02958
             https://github.com/geany/geany-plugins/commit/1310a1e568e7047c774943821c139addb0e02958

Log Message:
-----------
Merge pull request #17 from WilliamFraser/master

breaking up sentence for easier translation


Modified Paths:
--------------
    geanymacro/src/geanymacro.c

Modified: geanymacro/src/geanymacro.c
77 files changed, 48 insertions(+), 29 deletions(-)
===================================================================
@@ -50,7 +50,7 @@
 typedef struct
 {
 	gint message;
-	gchar *description;
+	const gchar *description;
 } MacroDetailEntry;
 
 /* list of editor messages this plugin can handle & a description */
@@ -758,6 +758,7 @@ static void on_configure_response(GtkDialog *dialog, gint response, gpointer use
 void plugin_help(void)
 {
 	GtkWidget *dialog,*label,*scroll;
+	gchar *cText;
 
 	/* create dialog box */
 	dialog=gtk_dialog_new_with_buttons(_("Geany Macros help"),
@@ -766,34 +767,48 @@ void plugin_help(void)
 		GTK_STOCK_OK,GTK_RESPONSE_ACCEPT,
 		NULL);
 
+/* setup help text */
+	cText=g_strconcat(
+_("This Plugin implements Macros in Geany.\n\n"),
+_("This plugin allows you to record and use your own macros. "),
+_("These are sequences of actions that can then be repeated with a single key combination. "),
+_("So if you had dozens of lines where you wanted to delete the last 2 characters, you could simpl\
+y start recording, press End, Backspace, Backspace, down line and then stop recording. "),
+_("Then simply trigger the macro and it would automatically edit the line and move to the next. "),
+_("Select Record Macro from the Tools menu and you will be prompted with a dialog box. "),
+_("You need to specify a key combination that isn't being used, and a name for the macro to help y\
+ou identify it. "),
+_("Then press Record. "),
+_("What you do in the editor is then recorded until you select Stop Recording Macro from the Tools\
+ menu. "),
+_("Simply pressing the specified key combination will re-run the macro. "),
+_("To edit the macros you have, select Edit Macro from the Tools menu. "),
+_("You can select a macro and delete 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 a\
+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\
+s, or if it's replace/insert, you can edit the text that replaces the selected text, or is inserte\
+d.\n\n"),
+
+_("The only thing to bear in mind is that undo and redo actions are not recorded, and won't be rep\
+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. "),
+_("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\
+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."),
+NULL);
+
 	/* create label */
-	label=gtk_label_new(
-		_("This Plugin implements Macros in Geany.\n\n"
-		"This plugin allows you to record and use your own macros. These are sequences of \
-actions that can then be repeated with a single key combination. So if you had dozens of lines \
-where you wanted to delete the last 2 characters, you could simple start recording, press End, \
-Backspace, Backspace, down line and then stop recording. Then simply trigger the macro and it \
-would automatically edit the line and move to the next. Select Record Macro from the Tools menu \
-and you will be prompted with a dialog box. You need to specify a key combination that isn't being\
- used, and a name for the macro to help you identify it. Then press Record. What you do in the \
-editor is then recorded until you select Stop Recording Macro from the Tools menu. Simply pressing\
- the specified key combination will re-run the macro. To edit the macros you have, select Edit \
-Macro from the Tools menu. You can select a macro and delete 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 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"
-		"The only thing to bear in mind is that undo and redo actions are not 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 Preferences. You can change:\nSave 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.\nAsk before \
-replaceing 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 the same key trigger combination."));
+	label=gtk_label_new(cText);
 	gtk_label_set_line_wrap(GTK_LABEL(label),TRUE);
 	gtk_widget_show(label);
 
@@ -812,6 +827,10 @@ void plugin_help(void)
 	/* display the dialog */
 	gtk_dialog_run(GTK_DIALOG(dialog));
 	gtk_widget_destroy(dialog);
+
+	/* free memory */
+	g_free(cText);
+
 }
 
 
@@ -1909,4 +1928,4 @@ void plugin_cleanup(void)
 
 	/* clean up memory used by macros */
 	ClearAllMacros();
-}
\ No newline at end of file
+}



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).