Final string changes for 0.3 and some copyrights updated

This commit is contained in:
Jim Nelson 2013-02-26 16:16:20 -08:00
parent a8eb2bce88
commit 9c98e95cb4
5 changed files with 5 additions and 7 deletions

View file

@ -20,5 +20,5 @@
(such as being listed in an application menu) requires full installation.
Copyright 2012 Yorba Foundation
Copyright 2012-2013 Yorba Foundation

2
README
View file

@ -37,5 +37,5 @@
Copyright 2012 Yorba Foundation
Copyright 2012-2013 Yorba Foundation

2
debian/copyright vendored
View file

@ -3,7 +3,7 @@ Upstream-Name: geary
Source: <http://yorba.org>
Files: *
Copyright: 2012 Yorba Foundation
Copyright: 2012-2013 Yorba Foundation
License: LGPL-2.1
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public

View file

@ -14,7 +14,7 @@ public class GearyApplication : YorbaApplication {
public const string NAME = "Geary";
public const string PRGNAME = "geary";
public const string DESCRIPTION = DESKTOP_GENERIC_NAME;
public const string COPYRIGHT = _("Copyright 2011-2012 Yorba Foundation");
public const string COPYRIGHT = _("Copyright 2011-2013 Yorba Foundation");
public const string WEBSITE = "http://www.yorba.org";
public const string WEBSITE_LABEL = _("Visit the Yorba web site");
public const string BUGREPORT = "http://redmine.yorba.org/projects/geary/issues";

View file

@ -76,9 +76,7 @@ public string quote_email_for_forward(Geary.Email email, bool html_format) {
string from_line = email_addresses_for_reply(email.from, html_format);
if (!String.is_empty_or_whitespace(from_line))
quoted += _("From: %s\n").printf(from_line);
// TODO: Doing it this way because string change happened after string freeze and "Subject" is
// available but not "Subject: %s"
quoted += _("Subject:") + "%s\n".printf(email.subject != null ? email.subject.to_string() : "");
quoted += _("Subject: %s\n").printf(email.subject != null ? email.subject.to_string() : "");
quoted += _("Date: %s\n").printf(email.date != null ? email.date.to_string() : "");
string to_line = email_addresses_for_reply(email.to, html_format);
if (!String.is_empty_or_whitespace(to_line))