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.

diff --git a/ChangeLog b/ChangeLog
index a9770479fc00b9306384a88940c38316b429ed75..974c83d28df90fa3c4306c2dd304983b1fe43f06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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:

diff --git a/shell/ev-window.c b/shell/ev-window.c
index d30e9cb4d784c822fb7a0b970c1c71143d8166a2..c78ba84d092a1cd9c59689805a2db1c879b84109 100644 (file)
--- 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);