Merge lp:~codygarver/granite/fix-1358969 into lp:~elementary-pantheon/granite/granite

[Cody Garver]

Only use copyright symbol ©, not actual word 'Copyright' (lp:1358969)

[Robert Roth (evfool)]

Looks fine, please set a merge commit though, for the merge bot to be able to merge this.

review: Approve

=== modified file 'lib/GtkPatch/AboutDialog.vala'
--- lib/GtkPatch/AboutDialog.vala	2013-12-22 16:31:48 +0000
+++ lib/GtkPatch/AboutDialog.vala	2014-10-29 20:14:25 +0000
@@ -90,7 +90,7 @@
                 copyright_label.set_text("");
             }
             else {
-                copyright_label.set_markup ("<span size=\"small\">" + _("Copyright © %s").printf (_copyright.replace("&", "&amp;")) + "</span>\n");
+                copyright_label.set_markup ("<span size=\"small\">" + _("© %s").printf (_copyright.replace("&", "&amp;")) + "</span>\n");
                 copyright_label.show();
             }
         }

=== modified file 'po/granite.pot'
--- po/granite.pot	2014-08-09 16:10:41 +0000
+++ po/granite.pot	2014-10-29 20:14:25 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 11:10-0500\n"
+"POT-Creation-Date: 2014-10-29 15:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,6 +17,40 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:36
+msgid "Designed by:"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:55
+msgid "Written by:"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:93
+#, c-format
+msgid "© %s"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:111
+msgid "Documented by:"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:171
+#, c-format
+msgid "Translated by %s"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:355
+msgid "Close"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:456
+msgid "This program is published under the terms of the "
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:456
+msgid " license, it comes with ABSOLUTELY NO WARRANTY; for details, visit "
+msgstr ""
+
 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Application.vala:248
 msgid "Developers"
 msgstr ""
@@ -25,6 +59,62 @@
 msgid "Website"
 msgstr ""
 
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:229
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:268
+msgid "Close Tab"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:271
+msgid "Open in a new Window"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:272
+msgid "Duplicate"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:321
+msgid "Close Other Tab"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:321
+msgid "Close Other Tabs"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:497
+msgid "Clear All"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:782
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:815
+msgid "New Tab"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:783
+msgid "Undo Close Tab"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:825
+msgid "Closed Tabs"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AboutDialog.vala:95
+msgid "Suggest Translations"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AboutDialog.vala:100
+msgid "Report a Problem"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AppMenu.vala:48
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AppMenu.vala:59
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AppMenu.vala:72
+msgid "Menu"
+msgstr ""
+
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AppMenu.vala:82
+msgid "About"
+msgstr ""
+
 #. / TRANSLATORS: this will only show up when 12-hours clock is in use
 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/TimePicker.vala:129
 msgid "PM"
@@ -35,14 +125,12 @@
 msgid ":"
 msgstr ""
 
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AppMenu.vala:48
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AppMenu.vala:59
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AppMenu.vala:72
-msgid "Menu"
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/ContractorView.vala:105
+msgid "Could not contact Contractor. You may need to install it"
 msgstr ""
 
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AppMenu.vala:82
-msgid "About"
+#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/ContractorView.vala:105
+msgid "No action found for this file"
 msgstr ""
 
 #. / TRANSLATORS: a GLib.DateTime format showing the hour (12h format) with seconds
@@ -105,91 +193,3 @@
 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/Utils.vala:123
 msgid "%b"
 msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:229
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:268
-msgid "Close Tab"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:271
-msgid "Open in a new Window"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:272
-msgid "Duplicate"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:321
-msgid "Close Other Tab"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:321
-msgid "Close Other Tabs"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:497
-msgid "Clear All"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:773
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:806
-msgid "New Tab"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:774
-msgid "Undo Close Tab"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:816
-msgid "Closed Tabs"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/ContractorView.vala:105
-msgid "Could not contact Contractor. You may need to install it"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/ContractorView.vala:105
-msgid "No action found for this file"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AboutDialog.vala:95
-msgid "Suggest Translations"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AboutDialog.vala:100
-msgid "Report a Problem"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:36
-msgid "Designed by:"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:55
-msgid "Written by:"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:93
-#, c-format
-msgid "Copyright © %s"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:111
-msgid "Documented by:"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:171
-#, c-format
-msgid "Translated by %s"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:355
-msgid "Close"
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:456
-msgid "This program is published under the terms of the "
-msgstr ""
-
-#: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:456
-msgid " license, it comes with ABSOLUTELY NO WARRANTY; for details, visit "
-msgstr ""