Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <nshmyrev@src.gnome.org>2006-05-13 04:28:50 (GMT)
committer Nickolay V. Shmyrev <nshmyrev@src.gnome.org>2006-05-13 04:28:50 (GMT)
commit1f97fb3671fbcfd7f39cfb259d20f43c0704a56a (patch)
treed7ce10ccf1d4b4a49d8d426473d22b025c9f7db2
parent70f641411b2fbab930b481ac844984819b48805d (diff)
Do not wrap license. Fix for the bug #309460.
* shell/ev-window.c: (ev_window_cmd_help_about): Do not wrap license. Fix for the bug #309460.
-rw-r--r--ChangeLog6
-rw-r--r--shell/ev-window.c17
2 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index a977047..974c83d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-05-13 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+ * shell/ev-window.c: (ev_window_cmd_help_about):
+
+ Do not wrap license. Fix for the bug #309460.
+
+2006-05-13 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+
* configure.ac:
* properties/ev-properties-main.c: (ev_properties_get_pages):
* shell/ev-application.c: (ev_application_open_window),
diff --git a/shell/ev-window.c b/shell/ev-window.c
index d30e9cb..c78ba84 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -2373,16 +2373,16 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
};
const char *license[] = {
- N_("Evince is free software; you can redistribute it and/or modify\n"
- "it under the terms of the GNU General Public License as published by\n"
- "the Free Software Foundation; either version 2 of the License, or\n"
+ N_("Evince 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_("Evince is distributed in the hope that it will be useful,\n"
- "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
- "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+ N_("Evince 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\n"
- "along with Evince; if not, write to the Free Software Foundation, Inc.,\n"
+ N_("You should have received a copy of the GNU General Public License "
+ "along with Evince; if not, write to the Free Software Foundation, Inc., "
"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n")
};
@@ -2416,6 +2416,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
"documenters", documenters,
"translator-credits", _("translator-credits"),
"logo-icon-name", "evince",
+ "wrap-license", TRUE,
NULL);
g_free (comments);