From 71cb7d8ddbabf102501c9b245c2eea99a4ba1011 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Fri, 8 Jul 2016 09:17:55 +0200 Subject: Documentation. French documentation translation updated. (bzr r15013) --- src/ui/dialog/aboutbox.cpp | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'src/ui/dialog/aboutbox.cpp') diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index 1a87a9718..6276d3391 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -467,7 +467,8 @@ void AboutBox::initStrings() { "Adib Taraben , 2004-2014.\n" "Alan Monfort , 2009-2010.\n" "Alastair McKinstry , 2000.\n" -"Aleksandar Urošević , 2004-2006.\n" +"Aleksandar Marković , 2015.\n" +"Aleksandar Urošević , 2004-2009.\n" "Alessio Frusciante , 2002, 2003.\n" "Alexander Shopov , 2006.\n" "Alexandre Prokoudine , 2005, 2010-2014.\n" @@ -499,18 +500,19 @@ void AboutBox::initStrings() { "Cédric Gemy , 2006.\n" "Daniel Díaz , 2004.\n" "Didier Conchaudron , 2003.\n" -"Dimitris Spingos , 2011-2013.\n" +"Dimitris Spingos (Δημήτρης Σπίγγος) , 2011-2015.\n" "Dorji Tashi , 2006.\n" "Duarte Loreto 2002, 2003 (Maintainer).\n" "Elias Norberg , 2009.\n" "Equipe de Tradução Inkscape Brasil , 2007.\n" "Fatih Demir , 2000.\n" -"Firas Hanife , 2014-2015.\n" +"Firas Hanife , 2014-2016.\n" "Foppe Benedictus , 2007-2009.\n" "Francesc Dorca , 2003. Traducció sodipodi.\n" "Francisco Javier F. Serrador , 2003.\n" "Francisco Xosé Vázquez Grandal , 2001.\n" "Frederic Rodrigo , 2004-2005.\n" +"Ganesh Murmu , 2014.\n" "Ge'ez Frontier Foundation , 2002.\n" "George Boukeas , 2011.\n" "Heiko Wöhrle , 2014.\n" @@ -528,6 +530,7 @@ void AboutBox::initStrings() { "Jeroen van der Vegt , 2003, 2005, 2008.\n" "Jin-Hwan Jeong , 2009.\n" "Jonathan Ernst , 2006.\n" +"Jordi Mas i Hernàndez , 2015.\n" "Jose Antonio Salgueiro Aquino , 2003.\n" "Josef Vybiral , 2005-2006.\n" "Juarez Rudsatz , 2004.\n" @@ -542,10 +545,11 @@ void AboutBox::initStrings() { "Kingsley Turner , 2006.\n" "Kitae , 2006.\n" "Kjartan Maraas , 2000-2002.\n" -"Kris De Gussem , 2008-2014.\n" +"Kris De Gussem , 2008-2015.\n" "Lauris Kaplinski , 2000.\n" "Leandro Regueiro , 2006-2008, 2010.\n" "Liu Xiaoqin , 2008.\n" +"Louni Kandulna , 2014.\n" "Luca Bruno , 2005.\n" "Lucas Vieites Fariña, 2003-2013.\n" "Mahesh subedi , 2006.\n" @@ -561,8 +565,10 @@ void AboutBox::initStrings() { "Mufit Eribol , 2000.\n" "Muhammad Bashir Al-Noimi , 2008.\n" "Myckel Habets , 2008.\n" +"Nasreen , 2013.\n" "Nguyen Dinh Trung , 2007, 2008.\n" -"Nicolas Dufour , 2008-2014.\n" +"Nicolas Dufour , 2008-2016.\n" +"Paresh prabhu , 2013.\n" "Pawan Chitrakar , 2006.\n" "Przemysław Loesch , 2005.\n" "Quico Llach , 2000. Traducció sodipodi.\n" @@ -570,6 +576,8 @@ void AboutBox::initStrings() { "Riku Leino , 2006-2011.\n" "Rune Rønde Laursen , 2006.\n" "Ruud Steltenpool , 2006.\n" +"Sangeeta , 2011.\n" +"Savitha , 2013.\n" "Serdar Soytetir , 2005.\n" "shivaken , 2004.\n" "Shyam Krishna Bal , 2006.\n" @@ -577,8 +585,11 @@ void AboutBox::initStrings() { "Spyros Blanas , 2006, 2011.\n" "Stefan Graubner , 2005.\n" "Supranee Thirawatthanasuk , 2006.\n" +"Sushma Joshi , 2011.\n" +"Sveinn í Felli , 2014-2015.\n" +"Sylvain Chiron , 2016.\n" "Takeshi Aihana , 2000, 2001.\n" -"Tim Sheridan , 2007-2014.\n" +"Tim Sheridan , 2007-2016.\n" "Theppitak Karoonboonyanan , 2006.\n" "Thiago Pimentel , 2006.\n" "Toshifumi Sato , 2005.\n" @@ -592,6 +603,7 @@ void AboutBox::initStrings() { "Vital Khilko , 2003.\n" "Vitaly Lipatov , 2002, 2004.\n" "vonHalenbach , 2005.\n" +"vrundeshw , 2012.\n" "Waluyo Adi Siswanto , 2011.\n" "Wang Li , 2002.\n" "Wei-Lun Chao , 2006.\n" -- cgit v1.2.3 From dcd91f59f597ab4af07cee5929ce0e2e1f9104d5 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 28 Jul 2016 16:16:18 +0100 Subject: Drop remaining GTKMM 2 fallback support (bzr r15023.2.7) --- src/ui/dialog/aboutbox.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'src/ui/dialog/aboutbox.cpp') diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index 6276d3391..ffb46fd1b 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -98,11 +98,7 @@ AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) { tabs->append_page(*manage( make_scrolled_text(license_text)), _("_License"), true); -#if WITH_GTKMM_3_0 get_content_area()->pack_end(*manage(tabs), true, true); -#else - get_vbox()->pack_end(*manage(tabs), true, true); -#endif tabs->show_all(); @@ -130,20 +126,12 @@ AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) { link->set_selectable(true); link->show(); -#if WITH_GTKMM_3_0 get_content_area()->pack_start(*manage(label), false, false); get_content_area()->pack_start(*manage(link), false, false); -#else - get_vbox()->pack_start(*manage(label), false, false); - get_vbox()->pack_start(*manage(link), false, false); -#endif Gtk::Requisition requisition; -#if GTK_CHECK_VERSION(3,0,0) gtk_widget_get_preferred_size(reinterpret_cast(gobj()), &requisition, NULL); -#else - gtk_widget_size_request (reinterpret_cast(gobj()), &requisition); -#endif + // allow window to shrink set_size_request(0, 0); set_default_size(requisition.width, requisition.height); -- cgit v1.2.3 From 4f02d390a622c0e95f52c850e07578abbe0ddf7d Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 7 Aug 2016 14:41:48 +0100 Subject: aboutbox: Gtkmmify (bzr r15043.1.1) --- src/ui/dialog/aboutbox.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/ui/dialog/aboutbox.cpp') diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index ffb46fd1b..04cf9d02a 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -129,12 +129,13 @@ AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) { get_content_area()->pack_start(*manage(label), false, false); get_content_area()->pack_start(*manage(link), false, false); - Gtk::Requisition requisition; - gtk_widget_get_preferred_size(reinterpret_cast(gobj()), &requisition, NULL); + Gtk::Requisition minimum_size; + Gtk::Requisition natural_size; + get_preferred_size(minimum_size, natural_size); // allow window to shrink set_size_request(0, 0); - set_default_size(requisition.width, requisition.height); + set_default_size(minimum_size.width, minimum_size.height); } -- cgit v1.2.3 From 1277a92d4c1cd93e9a172718f557a8cd1a855625 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Wed, 19 Oct 2016 00:24:26 +0200 Subject: update author list in about dialog from AUTHORS file (bzr r15176) --- src/ui/dialog/aboutbox.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/ui/dialog/aboutbox.cpp') diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index 04cf9d02a..846f00d8a 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -256,6 +256,7 @@ void AboutBox::initStrings() { "Joshua L. Blocher\n" "Hanno Böck\n" "Tomasz Boczkowski\n" +"Adrian Boguszewski\n" "Henrik Bohre\n" "Boldewyn\n" "Daniel Borgmann\n" @@ -265,6 +266,7 @@ void AboutBox::initStrings() { "Christopher Brown\n" "Marcus Brubaker\n" "Luca Bruno\n" +"Brynn (brynn@inkscapecommunity.com)\n" "Nicu Buculei\n" "Bulia Byak\n" "Pierre Caclin\n" @@ -289,10 +291,12 @@ void AboutBox::initStrings() { "Nicolas Dufour\n" "Tim Dwyer\n" "Maxim V. Dziumanenko\n" +"Moritz Eberl\n" "Johan Engelen\n" "Miklos Erdelyi\n" "Ulf Erikson\n" "Noé Falzon\n" +"Sebastian Faubel\n" "Frank Felfe\n" "Andrew Fitzsimon\n" "Edward Flick\n" @@ -324,6 +328,7 @@ void AboutBox::initStrings() { "Jean-Olivier Irisson\n" "Bob Jamison\n" "Ted Janeczko\n" +"Marc Jeanmougin\n" "jEsuSdA\n" "Fernando Lucchesi Bastos Jurema\n" "Lauris Kaplinski\n" @@ -389,6 +394,7 @@ void AboutBox::initStrings() { "Shivaken\n" "Michael Sloan\n" "John Smith\n" +"Sandra Snan\n" "Boštjan Špetič\n" "Aaron Spike\n" "Kaushik Sridharan\n" @@ -413,7 +419,8 @@ void AboutBox::initStrings() { "Gellule Xg\n" "Daniel Yacob\n" "Masatake Yamato\n" -"David Yip"; +"David Yip" +; //############################## //# T R A N S L A T O R S -- cgit v1.2.3 From c65eeb6abd1a51c075c30fdf95e296fd7640bf25 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Fri, 21 Oct 2016 00:02:48 +0200 Subject: update translators (bzr r15184) --- src/ui/dialog/aboutbox.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/ui/dialog/aboutbox.cpp') diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index 846f00d8a..552500fe8 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -549,6 +549,8 @@ void AboutBox::initStrings() { "Luca Bruno , 2005.\n" "Lucas Vieites Fariña, 2003-2013.\n" "Mahesh subedi , 2006.\n" +"Marcin Floryan , 2016.\n" +"Maren Hachmann , 2015-2016.\n" "Martin Srebotnjak, , 2005, 2010.\n" "Masatake YAMATO , 2002.\n" "Masato Hashimoto , 2009-2014.\n" -- cgit v1.2.3 From 9144e83f27ca6ad76ec6d72a8426ebd76c63a6a5 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 27 Dec 2016 01:27:19 +0000 Subject: Rm some deprecated Gtk::Stock usage (bzr r15366) --- src/ui/dialog/aboutbox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/dialog/aboutbox.cpp') diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index 552500fe8..b7a48e859 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -102,7 +102,7 @@ AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) { tabs->show_all(); - add_button(Gtk::Stock::CLOSE, Gtk::RESPONSE_CLOSE); + add_button(_("_Close"), Gtk::RESPONSE_CLOSE); set_default_response(Gtk::RESPONSE_CLOSE); Gtk::Label *label=new Gtk::Label(); -- cgit v1.2.3 From 2e8438d76a5f26719d381843cd3ce3fa694809fb Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 27 Dec 2016 15:49:22 +0000 Subject: Rm remaining Gtk::Stock usage (bzr r15368) --- src/ui/dialog/aboutbox.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/ui/dialog/aboutbox.cpp') diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index b7a48e859..8f0545e96 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include "path-prefix.h" #include "document.h" @@ -39,8 +38,6 @@ #include "inkscape-version.h" - - namespace Inkscape { namespace UI { namespace Dialog { -- cgit v1.2.3 From bbb714926033738fb53a2d1fd794a391d4c5a292 Mon Sep 17 00:00:00 2001 From: jabiertxof <> Date: Thu, 26 Jan 2017 02:24:46 +0100 Subject: defaults to about.svg when localized versions fail (bzr r15453) --- src/ui/dialog/aboutbox.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/ui/dialog/aboutbox.cpp') diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index 8f0545e96..e7572b3ce 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -162,6 +162,9 @@ Gtk::Widget *build_splash_widget() { // should be in UTF-*8.. char *about=g_build_filename(INKSCAPE_SCREENSDIR, _("about.svg"), NULL); + if (!g_file_test (about, G_FILE_TEST_EXISTS)) { + about=g_build_filename(INKSCAPE_SCREENSDIR, "about.svg", NULL); + } SPDocument *doc=SPDocument::createNewDoc (about, TRUE); g_free(about); g_return_val_if_fail(doc != NULL, NULL); -- cgit v1.2.3 From 4a81c0fc9ecb2b9196f6cedeaf2ea39d68408936 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Thu, 26 Jan 2017 16:50:34 +0100 Subject: [Bug #1659426] About screen - Missing image and small window - Translation comment. Fixed bugs: - https://launchpad.net/bugs/1659426 (bzr r15456) --- src/ui/dialog/aboutbox.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/ui/dialog/aboutbox.cpp') diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index e7572b3ce..40b948a23 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -152,10 +152,7 @@ Gtk::Widget *build_splash_widget() { the `screens' directory. Thus the translation of "about.svg" should be the filename of its translated version, e.g. about.zh.svg for Chinese. - N.B. about.svg changes once per release. (We should probably rename - the original to about-0.40.svg etc. as soon as we have a translation. - If we do so, then add an item to release-checklist saying that the - string here should be changed.) */ + Please don't translate the filename unless the translated picture exists. */ // FIXME? INKSCAPE_SCREENSDIR and "about.svg" are in UTF-8, not the // native filename encoding... and the filename passed to sp_document_new -- cgit v1.2.3 From 38ecca9e4639b8aecc55a4becfc1ed9b2793fadc Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Mon, 13 Feb 2017 22:37:42 +0100 Subject: AboutBox: Remove superfluous space in website URL (bzr r15516) --- src/ui/dialog/aboutbox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/dialog/aboutbox.cpp') diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index 40b948a23..805bfb562 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -115,7 +115,7 @@ AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) { Gtk::Label *link = new Gtk::Label(); const gchar *website_link = - " https://www.inkscape.org"; + "https://www.inkscape.org"; link->set_markup(website_link); link->set_alignment(Gtk::ALIGN_END); -- cgit v1.2.3