From 9c98e95cb42356bd589ccaf13a4a130162265e7f Mon Sep 17 00:00:00 2001 From: Jim Nelson Date: Tue, 26 Feb 2013 16:16:20 -0800 Subject: [PATCH] Final string changes for 0.3 and some copyrights updated --- INSTALL | 2 +- README | 2 +- debian/copyright | 2 +- src/client/geary-application.vala | 2 +- src/engine/rfc822/rfc822-utils.vala | 4 +--- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/INSTALL b/INSTALL index de5bb6f5..6affdf2a 100644 --- a/INSTALL +++ b/INSTALL @@ -20,5 +20,5 @@ (such as being listed in an application menu) requires full installation. - Copyright 2012 Yorba Foundation + Copyright 2012-2013 Yorba Foundation diff --git a/README b/README index 563af3a2..4f030fb7 100644 --- a/README +++ b/README @@ -37,5 +37,5 @@ - Copyright 2012 Yorba Foundation + Copyright 2012-2013 Yorba Foundation diff --git a/debian/copyright b/debian/copyright index ee8a31bf..e2b8935d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: geary Source: 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 diff --git a/src/client/geary-application.vala b/src/client/geary-application.vala index 8af1f2c1..94e6eb77 100644 --- a/src/client/geary-application.vala +++ b/src/client/geary-application.vala @@ -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"; diff --git a/src/engine/rfc822/rfc822-utils.vala b/src/engine/rfc822/rfc822-utils.vala index 206d4302..5eec3a76 100644 --- a/src/engine/rfc822/rfc822-utils.vala +++ b/src/engine/rfc822/rfc822-utils.vala @@ -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))