diff options
| author | rbuj <[email protected]> | 2019-03-20 18:13:45 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-03-24 11:18:16 +0100 |
| commit | ad3ae7d752f1f7ff9baa3cae76be822efb06c640 (patch) | |
| tree | 240eea4ce589bd43d2b6149864cd6a60e7fd86f6 | |
| parent | 1783e808873d96c5d6e887a41813c6c40fe06b09 (diff) | |
| download | mate-utils-ad3ae7d752f1f7ff9baa3cae76be822efb06c640.tar.bz2 mate-utils-ad3ae7d752f1f7ff9baa3cae76be822efb06c640.tar.xz | |
mate-dictionary: Use g_strjoin to build license text
full stop at end of sentence in license paragraphs
| -rw-r--r-- | baobab/src/callbacks.c | 4 | ||||
| -rw-r--r-- | logview/src/logview-about.h | 2 | ||||
| -rw-r--r-- | mate-dictionary/src/gdict-about.c | 41 |
3 files changed, 26 insertions, 21 deletions
diff --git a/baobab/src/callbacks.c b/baobab/src/callbacks.c index 1f6ddbc8..bc4915cd 100644 --- a/baobab/src/callbacks.c +++ b/baobab/src/callbacks.c @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301 USA + * Boston, MA 02110-1301 USA. */ #ifdef HAVE_CONFIG_H @@ -85,7 +85,7 @@ on_about_activate (GtkMenuItem *menuitem, gpointer user_data) N_("You should have received a copy of the GNU General Public License " "along with this program; if not, write to the Free Software Foundation, Inc., 51 " - "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA") + "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.") }; diff --git a/logview/src/logview-about.h b/logview/src/logview-about.h index 9b4b0949..15f4068d 100644 --- a/logview/src/logview-about.h +++ b/logview/src/logview-about.h @@ -56,7 +56,7 @@ static const char * logview_about_license[] = { "GNU General Public License for more details."), N_("You should have received a copy of the GNU General Public License " "along with this program; if not, write to the Free Software Foundation, Inc., " - "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA") + "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.") }; /* translator credits */ diff --git a/mate-dictionary/src/gdict-about.c b/mate-dictionary/src/gdict-about.c index dbd13698..ac8bd073 100644 --- a/mate-dictionary/src/gdict-about.c +++ b/mate-dictionary/src/gdict-about.c @@ -54,25 +54,28 @@ gdict_show_about_dialog (GtkWidget *parent) const gchar *translator_credits = _("translator-credits"); const gchar *comments = _("Look up words in dictionaries"); - - const gchar *license = - "This program is free software; you can redistribute it and/or " - "modify it under the terms of the GNU General Public License as " - "published by the Free Software Foundation; either version 2 of " - "the License, or (at your option) any later version.\n" - "\n" - "This program is distributed in the hope that it will be useful, " - "but WITHOUT ANY WARRANTY; without even the implied warranty of " - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU " - "General Public License for more details.\n" - "\n" - "You should have received a copy of the GNU General Public License " - "along with this program; if not, write to the Free Software " - "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA " - "02110-1301, USA.\n"; + + const gchar* license[] = { + N_("This program is free software; you can redistribute it and/or " + "modify it under the terms of the GNU General Public License as " + "published by the Free Software Foundation; either version 2 of " + "the License, or (at your option) any later version."), + + N_("This program is distributed in the hope that it will be useful, " + "but WITHOUT ANY WARRANTY; without even the implied warranty of " + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU " + "General Public License for more details."), + + N_("You should have received a copy of the GNU General Public License " + "along with this program; if not, write to the Free Software " + "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA " + "02110-1301, USA") + }; g_return_if_fail (GTK_IS_WIDGET (parent)); - + + char *license_trans = g_strjoin ("\n\n", _(license[0]), _(license[1]), _(license[2]), NULL); + gtk_show_about_dialog (GTK_IS_WINDOW (parent) ? GTK_WINDOW (parent) : NULL, "program-name", _("Dictionary"), "version", VERSION, @@ -84,8 +87,10 @@ gdict_show_about_dialog (GtkWidget *parent) "documenters", documenters, "translator-credits", translator_credits, "logo-icon-name", "accessories-dictionary", - "license", license, + "license", license_trans, "wrap-license", TRUE, "screen", gtk_widget_get_screen (parent), NULL); + + g_free(license_trans); } |