diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 470a33b4..221826f7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,12 +1,12 @@ Contribute to Geary ------------------- -Want to help improve Geary? There are a number of ways you can contribute: +Want to help improve Geary? There are a number of ways you can contribute! - * [Bug Reporting](https://wiki.gnome.org/Apps/Geary/ReportingABug)—report new bugs or request new features - * [Translating](https://wiki.gnome.org/Apps/Geary/Translating)—translate Geary’s user interface and user manual into new languages - * [Development](https://wiki.gnome.org/Apps/Geary/Development)—fix bugs and add new features + * [Bug Reporting](https://gitlab.gnome.org/GNOME/geary/-/wikis/Reporting-Bugs-and-Requesting-Features): report new bugs or request new features + * [Translating](https://gitlab.gnome.org/GNOME/geary/-/wikis/Translating): translate Geary’s user interface and user manual into new languages + * [Development](https://gitlab.gnome.org/GNOME/geary/-/wikis/Development): fix bugs and add new features -See [the wiki](https://wiki.gnome.org/Apps/Geary/Contribute) for more +See [the wiki](https://gitlab.gnome.org/GNOME/geary/-/wikis) for more information and options for contributing financially to Geary's development. diff --git a/README.md b/README.md index 823f83d9..f415130e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Geary is an email application built around conversations, for the GNOME desktop. It allows you to read, find and send email with a straight-forward, modern interface. -Visit https://wiki.gnome.org/Apps/Geary for more information. +Visit https://gitlab.gnome.org/GNOME/geary/-/wikis for more information. **GitHub users please note**: Bug reports, code contributions and translations are managed using GNOME's infrastructure, so we cannot @@ -27,7 +27,7 @@ and the licence granted by its copyright holders for redistribution. Getting in Touch ---------------- - * Geary wiki: https://wiki.gnome.org/Apps/Geary + * Geary wiki: https://gitlab.gnome.org/GNOME/geary/-/wikis * Support and discussion: See the `geary` tag on [GNOME Discourse](https://discourse.gnome.org/tags/c/applications/7/geary) * Matrix channel: [#geary:gnome.org](https://gnome.element.io/#/room/#geary:gnome.org) @@ -43,11 +43,11 @@ Contributing to Geary Want to help improve Geary? Here are some ways to contribute: - * Bug reporting: https://wiki.gnome.org/Apps/Geary/ReportingABug - * Translating: https://wiki.gnome.org/Apps/Geary/Translating - * Development: https://wiki.gnome.org/Apps/Geary/Development - * Donate: https://wiki.gnome.org/Apps/Geary/Donate + * Bug reporting: https://gitlab.gnome.org/GNOME/geary/-/wikis/Reporting-Bugs-and-Requesting-Features + * Translating: https://gitlab.gnome.org/GNOME/geary/-/wikis/Translating + * Development: https://gitlab.gnome.org/GNOME/geary/-/wikis/Development + * Donate: https://donate.gnome.org --- -Copyright © 2016 Software Freedom Conservancy Inc. +Copyright © 2016 Software Freedom Conservancy Inc. Copyright © 2017-2020 Michael Gratton diff --git a/code-of-conduct.md b/code-of-conduct.md index 3a3bf3bf..15b18854 100644 --- a/code-of-conduct.md +++ b/code-of-conduct.md @@ -56,7 +56,7 @@ a project may be further defined and clarified by project maintainers. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at: - https://wiki.gnome.org/Apps/Geary/Contact + https://gitlab.gnome.org/GNOME/geary/-/wikis/Contact All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an diff --git a/desktop/org.gnome.Geary.metainfo.xml.in.in b/desktop/org.gnome.Geary.metainfo.xml.in.in index bd49031d..598df696 100644 --- a/desktop/org.gnome.Geary.metainfo.xml.in.in +++ b/desktop/org.gnome.Geary.metainfo.xml.in.in @@ -34,12 +34,11 @@ - https://wiki.gnome.org/Apps/Geary - https://wiki.gnome.org/Apps/Geary/Documentation - https://wiki.gnome.org/Apps/Geary/FAQ + https://gitlab.gnome.org/GNOME/geary/-/wikis + https://gitlab.gnome.org/GNOME/geary/-/wikis/FAQ https://gitlab.gnome.org/GNOME/geary/-/issues https://gitlab.gnome.org/GNOME/geary/ - https://wiki.gnome.org/TranslationProject + https://gitlab.gnome.org/GNOME/geary/-/wikis/Translating https://gnome.org/donate diff --git a/geary.doap b/geary.doap index 640c1827..6b2b6732 100644 --- a/geary.doap +++ b/geary.doap @@ -13,7 +13,7 @@ around conversations, for the GNOME desktop. It allows you to read, find and send email with a straightforward, modern interface. - + diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala index e12e868a..6c8d6548 100644 --- a/src/client/application/application-client.vala +++ b/src/client/application/application-client.vala @@ -18,9 +18,6 @@ public class Application.Client : Gtk.Application { public const string DESCRIPTION = _("Send and receive email"); public const string COPYRIGHT_1 = _("Copyright © 2016 Software Freedom Conservancy Inc."); public const string COPYRIGHT_2 = _("Copyright © 2016-2021 Geary Development Team."); - public const string WEBSITE = "https://wiki.gnome.org/Apps/Geary"; - public const string WEBSITE_LABEL = _("Visit the Geary web site"); - public const string BUGREPORT = "https://wiki.gnome.org/Apps/Geary/ReportingABug"; // keep these in sync with meson_options.txt public const string PROFILE_RELEASE = "release"; @@ -543,8 +540,8 @@ public class Application.Client : Gtk.Application { "license-type", Gtk.License.LGPL_2_1, "logo-icon-name", Config.APP_ID, "version", Config.REVNO == "" ? Config.VERSION : "%s (%s)".printf(Config.VERSION, Config.REVNO), - "website", WEBSITE, - "website-label", WEBSITE_LABEL, + "website", "https://gitlab.gnome.org/GNOME/geary/-/wikis", + "website-label", _("Visit the Geary web site"), "title", _("About %s").printf(NAME), // Translators: add your name and email address to receive // credit in the About dialog For example: Yamada Taro diff --git a/ui/components-inspector-error-view.ui b/ui/components-inspector-error-view.ui index f9d48c9e..21e67aa1 100644 --- a/ui/components-inspector-error-view.ui +++ b/ui/components-inspector-error-view.ui @@ -24,7 +24,7 @@ baseline 12 True - If the problem is serious or persists, please save and send these details to one of the <a href="https://wiki.gnome.org/Apps/Geary/Contact">contact channels</a> or attach to a <a href="https://wiki.gnome.org/Apps/Geary/ReportingABug">new bug report</a>. + If the problem is serious or persists, please save and send these details to one of the <a href="https://gitlab.gnome.org/GNOME/geary/-/wikis/Contact">contact channels</a> or attach to a <a href="https://gitlab.gnome.org/GNOME/geary/-/wikis/Reporting-Bugs-and-Requesting-Features">new bug report</a>. True True 0