diff --git a/README.md b/README.md
index 4d732bb2..2fd6153e 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,8 @@ The aurweb project includes
 * A web interface to search for packaging scripts and display package details.
 * An SSH/Git interface to submit and update packages and package meta data.
 * Community features such as comments, votes, package flagging and requests.
-* Editing/deletion of packages and accounts by Trusted Users and Developers.
-* Area for Trusted Users to post AUR-related proposals and vote on them.
+* Editing/deletion of packages and accounts by Package Maintainers and Developers.
+* Area for Package Maintainers to post AUR-related proposals and vote on them.
 
 Directory Layout
 ----------------
diff --git a/aurweb/git/serve.py b/aurweb/git/serve.py
index 333d0394..5888c6b4 100755
--- a/aurweb/git/serve.py
+++ b/aurweb/git/serve.py
@@ -265,7 +265,7 @@ def pkgbase_disown(pkgbase, user, privileged):
     conn = aurweb.db.Connection()
 
     # Make the first co-maintainer the new maintainer, unless the action was
-    # enforced by a Trusted User.
+    # enforced by a Package Maintainer.
     if initialized_by_owner:
         comaintainers = pkgbase_get_comaintainers(pkgbase)
         if len(comaintainers) > 0:
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index f90d19eb..b64c1c2e 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -171,7 +171,7 @@ class User(Base):
 
     def is_elevated(self):
         """A User is 'elevated' when they have either a
-        Trusted User or Developer AccountType."""
+        Package Maintainer or Developer AccountType."""
         return self.AccountType.ID in {
             aurweb.models.account_type.PACKAGE_MAINTAINER_ID,
             aurweb.models.account_type.DEVELOPER_ID,
@@ -188,7 +188,7 @@ class User(Base):
         In short, a user must at least have credentials and be at least
         the same account type as the target.
 
-        User < Trusted User < Developer < Trusted User & Developer
+        User < Package Maintainer < Developer < Package Maintainer & Developer
 
         :param target: Target User to be edited
         :return: Boolean indicating whether `self` can edit `target`
diff --git a/aurweb/pkgbase/actions.py b/aurweb/pkgbase/actions.py
index f3688f54..d2471d8d 100644
--- a/aurweb/pkgbase/actions.py
+++ b/aurweb/pkgbase/actions.py
@@ -94,7 +94,7 @@ def _retry_disown(request: Request, pkgbase: PackageBase):
             notifs.append(notif)
     elif request.user.has_credential(creds.PKGBASE_DISOWN):
         # Otherwise, the request user performing this disownage is a
-        # Trusted User and we treat it like a standard orphan request.
+        # Package Maintainer and we treat it like a standard orphan request.
         notifs += handle_request(request, ORPHAN_ID, pkgbase)
         with db.begin():
             pkgbase.Maintainer = None
diff --git a/aurweb/routers/package_maintainer.py b/aurweb/routers/package_maintainer.py
index 582ab16b..af40de91 100644
--- a/aurweb/routers/package_maintainer.py
+++ b/aurweb/routers/package_maintainer.py
@@ -210,7 +210,7 @@ async def package_maintainer_proposal(request: Request, proposal: int):
         .first()
     )
     if not request.user.has_credential(creds.TU_VOTE):
-        context["error"] = "Only Trusted Users are allowed to vote."
+        context["error"] = "Only Package Maintainers are allowed to vote."
     if voteinfo.User == request.user.Username:
         context["error"] = "You cannot vote in an proposal about you."
     elif vote is not None:
@@ -257,7 +257,7 @@ async def package_maintainer_proposal_post(
 
     status_code = HTTPStatus.OK
     if not request.user.has_credential(creds.TU_VOTE):
-        context["error"] = "Only Trusted Users are allowed to vote."
+        context["error"] = "Only Package Maintainers are allowed to vote."
         status_code = HTTPStatus.UNAUTHORIZED
     elif voteinfo.User == request.user.Username:
         context["error"] = "You cannot vote in an proposal about you."
diff --git a/aurweb/routers/pkgbase.py b/aurweb/routers/pkgbase.py
index 6073aed5..a91b2b48 100644
--- a/aurweb/routers/pkgbase.py
+++ b/aurweb/routers/pkgbase.py
@@ -908,7 +908,9 @@ async def pkgbase_merge_get(
     # Perhaps additionally: bad_credential_status_code(creds.PKGBASE_MERGE).
     # Don't take these examples verbatim. We should find good naming.
     if not request.user.has_credential(creds.PKGBASE_MERGE):
-        context["errors"] = ["Only Trusted Users and Developers can merge packages."]
+        context["errors"] = [
+            "Only Package Maintainers and Developers can merge packages."
+        ]
         status_code = HTTPStatus.UNAUTHORIZED
 
     return render_template(
@@ -934,7 +936,9 @@ async def pkgbase_merge_post(
 
     # TODO: Lookup errors from credential instead of hardcoding them.
     if not request.user.has_credential(creds.PKGBASE_MERGE):
-        context["errors"] = ["Only Trusted Users and Developers can merge packages."]
+        context["errors"] = [
+            "Only Package Maintainers and Developers can merge packages."
+        ]
         return render_template(
             request, "pkgbase/merge.html", context, status_code=HTTPStatus.UNAUTHORIZED
         )
diff --git a/doc/git-interface.txt b/doc/git-interface.txt
index 028ffd0d..334c3759 100644
--- a/doc/git-interface.txt
+++ b/doc/git-interface.txt
@@ -35,7 +35,7 @@ usually points to the git-serve program.
 
 If SSH has been configured to pass on the AUR_OVERWRITE environment variable
 (via SendEnv, see ssh_config(5) for details) and the user's account is a
-registered Trusted User or Developer, this will be passed on to the git-update
+registered Package Maintainer or Developer, this will be passed on to the git-update
 program in order to enable a non-fast-forward push.
 
 The INSTALL file in the top-level directory contains detailed instructions on
@@ -70,8 +70,8 @@ The Update Hook: git-update
 The Git update hook, called git-update, performs several subtasks:
 
 * Prevent from creating branches or tags other than master.
-* Deny non-fast-forwards, except for Trusted Users and Developers.
-* Deny blacklisted packages, except for Trusted Users and Developers.
+* Deny non-fast-forwards, except for Package Maintainers and Developers.
+* Deny blacklisted packages, except for Package Maintainers and Developers.
 * Verify each new commit (validate meta data, impose file size limits, ...)
 * Update package base information and package information in the database.
 * Update the named branch and the namespaced HEAD ref of the package.
diff --git a/doc/maintenance.txt b/doc/maintenance.txt
index 39642f21..f50202a5 100644
--- a/doc/maintenance.txt
+++ b/doc/maintenance.txt
@@ -12,8 +12,8 @@ package maintenance from the command-line. More details can be found in
 
 The web interface can be used to browse packages, view package details, manage
 aurweb accounts, add comments, vote for packages, flag packages, and submit
-requests. Trusted Users can update package maintainers and delete/merge
-packages. The web interface also includes an area for Trusted Users to post
+requests. Package Maintainers can update package maintainers and delete/merge
+packages. The web interface also includes an area for Package Maintainers to post
 AUR-related proposals and vote on them.
 
 The RPC interface can be used to query package information via HTTP.
@@ -113,7 +113,7 @@ usually scheduled using Cron. The current setup is:
 Advanced Administrative Features
 --------------------------------
 
-Trusted Users can set the AUR_OVERWRITE environment variable to enable
+Package Maintainers can set the AUR_OVERWRITE environment variable to enable
 non-fast-forward pushes to the Git repositories. This feature is documented in
 `doc/git-interface.txt`.
 
diff --git a/po/ar.po b/po/ar.po
index 1fed4f4f..f87d8ab7 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -308,7 +308,7 @@ msgstr "النّقاش"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "النّقاشات العاّمة حول مستودع مستخدمي آرتش (م‌م‌آ) وبنية المستخدمين الموثوقين تكون في  %saur-general%s. للنّقاشات المتعلّقة بتطوير واجهة وِبّ م‌م‌آ، استخدم قائمة %saur-dev%s البريديّة."
@@ -524,7 +524,7 @@ msgid "Delete"
 msgstr "احذف"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "يمكن فقط للمستخدمين الموثوقين والمطوّرين حذف الحزم."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -565,7 +565,7 @@ msgid "Disown"
 msgstr "تنازل"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "يمكن فقط للمستخدمين الموثوقين والمطوّرين التّنازل عن الحزم."
 
 #: html/pkgflagcomment.php
@@ -655,7 +655,7 @@ msgid "Merge"
 msgstr "دمج"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "يمكن فقط للمستخدمين الموثوقين والمطوّرين دمج الحزم."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -713,7 +713,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "مستخدم موثوق"
 
 #: html/tu.php
@@ -725,7 +725,7 @@ msgid "Voting is closed for this proposal."
 msgstr "أُغلق التّصويت على هذا الرّأي."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "فقط المستخدمين الموثوقين مسموح لهم بالتّصويت."
 
 #: html/tu.php
@@ -1221,7 +1221,7 @@ msgstr "مطوّر"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "مستخدم موثوق ومطوّر"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1324,10 +1324,6 @@ msgstr ""
 msgid "Normal user"
 msgstr "مستخدم عاديّ"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "مستخدم موثوق"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "حساب معلّق"
@@ -1827,14 +1823,14 @@ msgstr "ادمج مع"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1842,7 +1838,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2115,7 +2111,7 @@ msgid "Registered Users"
 msgstr "المستخدمون المسجّلون"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "المستخدمون الموثوقون"
 
 #: template/stats/updates_table.php
diff --git a/po/ast.po b/po/ast.po
index 2075edc1..4f4b23f8 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -309,7 +309,7 @@ msgstr ""
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -519,7 +519,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -560,7 +560,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -642,7 +642,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -700,7 +700,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr ""
 
 #: html/tu.php
@@ -712,7 +712,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1168,7 +1168,7 @@ msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1271,10 +1271,6 @@ msgstr ""
 msgid "Normal user"
 msgstr ""
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr ""
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr ""
@@ -1770,14 +1766,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1785,7 +1781,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2042,7 +2038,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/aurweb.pot b/po/aurweb.pot
index 77bca3b0..06fe5dc3 100644
--- a/po/aurweb.pot
+++ b/po/aurweb.pot
@@ -307,7 +307,7 @@ msgstr ""
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User "
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer "
 "structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -563,7 +563,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -654,7 +654,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -712,7 +712,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr ""
 
 #: html/tu.php
@@ -724,7 +724,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1220,7 +1220,7 @@ msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1322,10 +1322,6 @@ msgstr ""
 msgid "Normal user"
 msgstr ""
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr ""
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr ""
@@ -1829,14 +1825,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1844,7 +1840,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2100,7 +2096,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/az.po b/po/az.po
index df14a5b0..2433b095 100644
--- a/po/az.po
+++ b/po/az.po
@@ -306,7 +306,7 @@ msgstr ""
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -563,7 +563,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -653,7 +653,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -711,7 +711,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr ""
 
 #: html/tu.php
@@ -723,7 +723,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1219,7 +1219,7 @@ msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1322,10 +1322,6 @@ msgstr ""
 msgid "Normal user"
 msgstr ""
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr ""
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr ""
@@ -1821,14 +1817,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1836,7 +1832,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2093,7 +2089,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/az_AZ.po b/po/az_AZ.po
index 293d7b0d..51695f18 100644
--- a/po/az_AZ.po
+++ b/po/az_AZ.po
@@ -306,7 +306,7 @@ msgstr ""
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -563,7 +563,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -653,7 +653,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -711,7 +711,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr ""
 
 #: html/tu.php
@@ -723,7 +723,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1219,7 +1219,7 @@ msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1322,10 +1322,6 @@ msgstr ""
 msgid "Normal user"
 msgstr ""
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr ""
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr ""
@@ -1821,14 +1817,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1836,7 +1832,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2093,7 +2089,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/bg.po b/po/bg.po
index f373b761..428650ec 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -306,7 +306,7 @@ msgstr ""
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -563,7 +563,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -653,7 +653,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -711,7 +711,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr ""
 
 #: html/tu.php
@@ -723,7 +723,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1219,7 +1219,7 @@ msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1322,10 +1322,6 @@ msgstr ""
 msgid "Normal user"
 msgstr ""
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr ""
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr ""
@@ -1821,14 +1817,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1836,7 +1832,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2093,7 +2089,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/ca.po b/po/ca.po
index 86d77e56..186cf34b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -310,7 +310,7 @@ msgstr "Discussió"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "El debat general sobre el repositori per usuaris d'Arch (AUR) i de l'estructura dels Usuaris de Confiança es realitza a %saur-general%s. Per la discussió relacionada amb el desenvolupament de la interfície web de l'AUR, utilitzeu la llista de correu %saur-dev%s."
@@ -526,7 +526,7 @@ msgid "Delete"
 msgstr "Esborra"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Només els usuaris de confiança (TUs) i desenvolupadors poden eliminar paquets."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -567,7 +567,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -657,7 +657,7 @@ msgid "Merge"
 msgstr "Fusió"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Només el usuaris de confiança (TUs) i desenvolupadors poden fusionar paquets."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -715,7 +715,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Usuari de Confiança"
 
 #: html/tu.php
@@ -727,7 +727,7 @@ msgid "Voting is closed for this proposal."
 msgstr "La votació es va tancar per a aquesta proposta."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1223,7 +1223,7 @@ msgstr "Desenvolupador"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1326,10 +1326,6 @@ msgstr ""
 msgid "Normal user"
 msgstr "Usuari normal"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Usuari de Confiança"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "El compte s'ha suspès"
@@ -1825,14 +1821,14 @@ msgstr "Combinar amb"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1840,7 +1836,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2097,7 +2093,7 @@ msgid "Registered Users"
 msgstr "Usuaris registrats"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Usuaris de Confiança"
 
 #: template/stats/updates_table.php
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 5c05ba0c..1ae27491 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -306,7 +306,7 @@ msgstr ""
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -563,7 +563,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -653,7 +653,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -711,7 +711,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr ""
 
 #: html/tu.php
@@ -723,7 +723,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1219,7 +1219,7 @@ msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1322,10 +1322,6 @@ msgstr ""
 msgid "Normal user"
 msgstr ""
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr ""
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr ""
@@ -1821,14 +1817,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1836,7 +1832,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2093,7 +2089,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/cs.po b/po/cs.po
index 9086bd75..1916fca8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -315,7 +315,7 @@ msgstr "Diskuze"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "Obecná diskuze o struktuře repozitáře AUR a důvěryhodných uživatelích se odehrává v poštovní konferenci %saur-general%s. Diskuzi o vývoji webového rozhraní AUR pak naleznete v poštovní konferenci %saur-dev%s."
@@ -531,7 +531,7 @@ msgid "Delete"
 msgstr "Smazat"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Pouze důvěryhodní uživatelé a vývojáři mohou mazat balíčky."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -572,7 +572,7 @@ msgid "Disown"
 msgstr "Odebrat vlastnictví"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "Pouze důvěryhodní uživatelé a vývojáři mohou odebrat vlastnictví balíčku."
 
 #: html/pkgflagcomment.php
@@ -662,7 +662,7 @@ msgid "Merge"
 msgstr "Spojit"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Pouze důvěryhodní uživatelé a vývojáři mohou slučovat balíčky."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -720,7 +720,7 @@ msgid "I accept the terms and conditions above."
 msgstr "Souhlasím s výše uvedenými podmínkami."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Důvěryhodný uživatel"
 
 #: html/tu.php
@@ -732,7 +732,7 @@ msgid "Voting is closed for this proposal."
 msgstr "Toto hlasování již skončilo."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "Pouze důvěryhodní uživatelé a vývojáři mohou hlasovat."
 
 #: html/tu.php
@@ -1228,7 +1228,7 @@ msgstr "Vyvojář"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "Důvěryhodný uživatel a vývojář"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1331,10 +1331,6 @@ msgstr "Vaše uživatelské jméno je vaše přihlašovací jméno. Je veřejně
 msgid "Normal user"
 msgstr "Běžný uživatel"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Důvěryhodný uživatel"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Účet pozastaven"
@@ -1832,14 +1828,14 @@ msgstr "Sloučení"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr "Vytvořením žádosti o smazání žádáte důvěryhodného uživatele, aby smazal základní balíček. Tento typ požadavku by se měl používat pro duplicitní balíčky, software, který již v upstreamu neexistuje, nebo v případě nelegálních či nezvratně rozbitých balíčků."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1847,7 +1843,7 @@ msgstr "Vytvořením žádosti o sloučení žádáte důvěryhodného uživatel
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2112,7 +2108,7 @@ msgid "Registered Users"
 msgstr "Registrovaní uživatelé"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Důvěryhodní uživatelé"
 
 #: template/stats/updates_table.php
diff --git a/po/da.po b/po/da.po
index 89f6a635..2b653df6 100644
--- a/po/da.po
+++ b/po/da.po
@@ -309,7 +309,7 @@ msgstr "Diskussion"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -525,7 +525,7 @@ msgid "Delete"
 msgstr "Slet"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Kun betroede brugere og udviklere kan slette pakker."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -566,7 +566,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -656,7 +656,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -714,7 +714,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Betroet bruger (TU)"
 
 #: html/tu.php
@@ -726,7 +726,7 @@ msgid "Voting is closed for this proposal."
 msgstr "Afstemningen er lukket for dette forslag."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1222,7 +1222,7 @@ msgstr "Udvikler"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "Betroet bruger og udvikler"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1325,10 +1325,6 @@ msgstr ""
 msgid "Normal user"
 msgstr "Normal bruger"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Betroet bruger (TU)"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Konto suspenderet"
@@ -1824,14 +1820,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1839,7 +1835,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2096,7 +2092,7 @@ msgid "Registered Users"
 msgstr "Registerede brugere"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Betroede brugere"
 
 #: template/stats/updates_table.php
diff --git a/po/de.po b/po/de.po
index 894494c6..47300404 100644
--- a/po/de.po
+++ b/po/de.po
@@ -327,7 +327,7 @@ msgstr "Diskussion"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "Grundsätzliche Diskussionen bezüglich des Arch User Repository (AUR) und vertrauenswürdigen Benutzern finden auf %saur-general%s statt. Für Diskussionen im Bezug auf die Entwicklung des AUR Web-Interface benutze die %saur-dev%s Mailingliste."
@@ -543,7 +543,7 @@ msgid "Delete"
 msgstr "Löschen"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Nur vertrauenswürdige Benutzer und Entwickler können Pakete löschen."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -584,7 +584,7 @@ msgid "Disown"
 msgstr "Gebe Paket ab"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "Nur TUs und Developer können die Paket-Betreuung abgeben."
 
 #: html/pkgflagcomment.php
@@ -674,7 +674,7 @@ msgid "Merge"
 msgstr "Verschmelzen"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Nur vertrauenswürdige Benutzer und Entwickler können Pakete verschmelzen."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -732,7 +732,7 @@ msgid "I accept the terms and conditions above."
 msgstr "Ich akzeptiere die obigen Nutzungsbedingungen."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Vertrauenswürdiger Benutzer (TU)"
 
 #: html/tu.php
@@ -744,8 +744,8 @@ msgid "Voting is closed for this proposal."
 msgstr "Die Abstimmungsphase für diesen Vorschlag ist beendet."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
-msgstr "Nur Trusted User dürfen wählen."
+msgid "Only Package Maintainers are allowed to vote."
+msgstr "Nur Package Maintainer dürfen wählen."
 
 #: html/tu.php
 msgid "You cannot vote in an proposal about you."
@@ -1240,7 +1240,7 @@ msgstr "Entwickler"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "Vertrauenswürdiger Benutzer & Entwickler"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1343,10 +1343,6 @@ msgstr "Der Benutzername ist der Name, der für die Anmeldung benutzt wird. Er i
 msgid "Normal user"
 msgstr "Normaler Benutzer"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Vertrauenswürdiger Benutzer (TU)"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Konto gesperrt"
@@ -1842,14 +1838,14 @@ msgstr "Verschmelzen mit"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr "Durch das Absenden einer Löschanfrage wird ein vertrauenswürdiger Benutzer gefragt die Paketbasis zu löschen. Dieser Typ von Anfragen soll für doppelte Pakete, vom Upstream aufgegebene Software sowie illegale und unreparierbar kaputte Pakete verwendet werden."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1857,7 +1853,7 @@ msgstr "Durch das Absenden einer Zusammenfüranfrage wird ein vertrauenswürdige
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2114,7 +2110,7 @@ msgid "Registered Users"
 msgstr "Registrierte Benutzer"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Vertrauenswürdige Benutzer (TU)"
 
 #: template/stats/updates_table.php
diff --git a/po/el.po b/po/el.po
index 2b665c34..c5b117a5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -207,7 +207,7 @@ msgstr ""
 msgid ""
 "Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU "
 "Guidelines%s for more information."
-msgstr "Καλωσήρθατε στο AUR! Διαβάστε παρακαλώ τον %sOδηγό Χρηστών του AUR%s και τον %sΟδηγό των Trusted Users%s για περισσότερες πληροφορίες. "
+msgstr "Καλωσήρθατε στο AUR! Διαβάστε παρακαλώ τον %sOδηγό Χρηστών του AUR%s και τον %sΟδηγό των Package Maintainers%s για περισσότερες πληροφορίες. "
 
 #: html/home.php
 #, php-format
@@ -314,7 +314,7 @@ msgstr "Συζήτηση"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -530,8 +530,8 @@ msgid "Delete"
 msgstr "Διαγράψτε"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
-msgstr "Μόνο οι Trusted Users και οι Developers μπορούν να διαγράψουν πακέτα."
+msgid "Only Package Maintainers and Developers can delete packages."
+msgstr "Μόνο οι Package Maintainers και οι Developers μπορούν να διαγράψουν πακέτα."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
 msgid "Disown Package"
@@ -571,7 +571,7 @@ msgid "Disown"
 msgstr "Αποδέσμευση"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -661,8 +661,8 @@ msgid "Merge"
 msgstr "Συγχώνευση"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
-msgstr "Μόνο οι Trusted Users και οι Developers μπορούν να συγχωνεύσουν πακέτα."
+msgid "Only Package Maintainers and Developers can merge packages."
+msgstr "Μόνο οι Package Maintainers και οι Developers μπορούν να συγχωνεύσουν πακέτα."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
 msgid "Submit Request"
@@ -719,8 +719,8 @@ msgid "I accept the terms and conditions above."
 msgstr "Αποδέχομαι τους παραπάνω όρους χρήσης."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
-msgstr "Trusted User"
+msgid "Package Maintainer"
+msgstr "Package Maintainer"
 
 #: html/tu.php
 msgid "Could not retrieve proposal details."
@@ -731,8 +731,8 @@ msgid "Voting is closed for this proposal."
 msgstr "Η ψηφοφορία έχει κλείσει για αυτή την πρόταση."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
-msgstr "Μόνο οι Trusted Users έχουν δικαίωμα ψήφου."
+msgid "Only Package Maintainers are allowed to vote."
+msgstr "Μόνο οι Package Maintainers έχουν δικαίωμα ψήφου."
 
 #: html/tu.php
 msgid "You cannot vote in an proposal about you."
@@ -1227,7 +1227,7 @@ msgstr "Developer"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1330,10 +1330,6 @@ msgstr ""
 msgid "Normal user"
 msgstr "Απλός χρήστης"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Αξιόπιστος χρήστης"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Ο Λογαριασμός έχει Ανασταλεί."
@@ -1829,14 +1825,14 @@ msgstr "Συγχώνευση σε"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1844,7 +1840,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2101,8 +2097,8 @@ msgid "Registered Users"
 msgstr "Εγγεγραμμένοι Χρήστες"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
-msgstr "Trusted Users"
+msgid "Package Maintainers"
+msgstr "Package Maintainers"
 
 #: template/stats/updates_table.php
 msgid "Recent Updates"
diff --git a/po/es.po b/po/es.po
index b6035d5b..d8f1f84d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -318,7 +318,7 @@ msgstr "Debate"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "La discusión general sobre el repositorio de usuarios de Arch (AUR) y la estructura de usuarios de confianza se realiza en la lista de correos %saur-general%s. Para la discusión en relación con el desarrollo de la interfaz web del AUR, utiliza la lista de correo %saur-dev%s."
@@ -534,7 +534,7 @@ msgid "Delete"
 msgstr "Eliminar"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Solamente usuarios de confianza y desarrolladores pueden eliminar paquetes."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -575,7 +575,7 @@ msgid "Disown"
 msgstr "Abandonar"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "Solamente usuarios de confianza y desarrolladores puede forzar el abandono de paquetes."
 
 #: html/pkgflagcomment.php
@@ -665,7 +665,7 @@ msgid "Merge"
 msgstr "Unión"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Solamente usuarios de confianza y desarrolladores pueden unir paquetes."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -723,7 +723,7 @@ msgid "I accept the terms and conditions above."
 msgstr "Acepto los términos y condiciones anteriores."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Usuario de confianza"
 
 #: html/tu.php
@@ -735,7 +735,7 @@ msgid "Voting is closed for this proposal."
 msgstr "Las votaciones para esta propuesta están cerradas."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "Solamente usuarios de confianza pueden votar."
 
 #: html/tu.php
@@ -1231,7 +1231,7 @@ msgstr "Desarrollador"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "Usuarios de confianza y desarrolladores"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1334,10 +1334,6 @@ msgstr "Tu nombre de usuario es el nombre que usarás para iniciar sesión. Es v
 msgid "Normal user"
 msgstr "Usuario normal"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Usuario de confianza"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Cuenta suspendida"
@@ -1834,14 +1830,14 @@ msgstr "Unir en"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr "Al enviar una solicitud de eliminación, le preguntas a un usuario de confianza que elimine el paquete base. Este tipo de solicitud debe ser utilizado para los duplicados, programas abandonados por el desarrollador principal o encargado, así como programas ilegales e irreparablemente rotos."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1849,7 +1845,7 @@ msgstr "Al enviar una solicitud de unión, le preguntas a un usuario de confianz
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2110,7 +2106,7 @@ msgid "Registered Users"
 msgstr "Usuarios registrados"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Usuarios de confianza"
 
 #: template/stats/updates_table.php
diff --git a/po/es_419.po b/po/es_419.po
index e2b96ae6..ae6a2e30 100644
--- a/po/es_419.po
+++ b/po/es_419.po
@@ -316,7 +316,7 @@ msgstr "Debate"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "La discusión general acerca del Repositorio de Usuarios de Arch (AUR) y la estructura de Usuarios de Confianza se realiza en la lista de correos %saur-general%s. Para discusiones relacionadas con el desarrollo de la interfaz web del AUR, utilice la lista de correo %saur-dev%s."
@@ -526,7 +526,7 @@ msgid "Delete"
 msgstr "Borrar"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Solo Usuarios de Confianza y Desarrolladores pueden borrar paquetes."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -567,7 +567,7 @@ msgid "Disown"
 msgstr "Abandonar"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "Solo Usuarios de Confianza y Desarrolladores pueden forzar el abandono de paquetes."
 
 #: html/pkgflagcomment.php
@@ -649,7 +649,7 @@ msgid "Merge"
 msgstr "Fusión"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Solo Usuarios de Confianza y Desarrolladores pueden fusionar paquetes."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -707,7 +707,7 @@ msgid "I accept the terms and conditions above."
 msgstr "Acepto las Terminos y condiciones anteriores."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Usuario de Confianza"
 
 #: html/tu.php
@@ -719,7 +719,7 @@ msgid "Voting is closed for this proposal."
 msgstr "Las votaciones para esta propuesta están cerradas."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "Solo Usuarios de Confianza pueden votar."
 
 #: html/tu.php
@@ -1175,7 +1175,7 @@ msgstr "Desarrollador"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "Usuarios de Confianza y desarrolladores"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1278,10 +1278,6 @@ msgstr "Su nombre de usuario es el nombre que usará para iniciar sesión. Es vi
 msgid "Normal user"
 msgstr "Usuario normal"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Usuario de Confianza"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Cuenta suspendida"
@@ -1777,14 +1773,14 @@ msgstr "Fusionar en"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr "Al enviar una Petición de Borrado, le preguntará a un Usuario de Confianza que elimine dicho paquete base. Este tipo de peticiones debe ser utilizada para duplicados, programas abandonados por el desarrollador principal o encargado, así como programas ilegales e irreparablemente rotos."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1792,7 +1788,7 @@ msgstr "Al enviar una Petición de Fusión, le preguntará a un Usuario de Confi
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2049,7 +2045,7 @@ msgid "Registered Users"
 msgstr "Usuarios registrados"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Usuarios de Confianza"
 
 #: template/stats/updates_table.php
diff --git a/po/et.po b/po/et.po
index 4092823b..2872c7b3 100644
--- a/po/et.po
+++ b/po/et.po
@@ -306,7 +306,7 @@ msgstr ""
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -563,7 +563,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -653,7 +653,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -711,7 +711,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr ""
 
 #: html/tu.php
@@ -723,7 +723,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1219,7 +1219,7 @@ msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1322,10 +1322,6 @@ msgstr ""
 msgid "Normal user"
 msgstr ""
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr ""
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr ""
@@ -1821,14 +1817,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1836,7 +1832,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2093,7 +2089,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/fi.po b/po/fi.po
index 98b3a03b..fc63945d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -310,7 +310,7 @@ msgstr "Keskustelu"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "Yleinen keskustelu AUR:iin ja Luotettuihin käyttäjiin liittyen käydään postitusluettelossa %saur-general%s. AUR-verkkokäyttöliittymän kehittämiseen liittyvä keskustelu käydään postitusluettelossa %saur-dev%s."
@@ -526,7 +526,7 @@ msgid "Delete"
 msgstr "Poista"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Vain Luotetut käyttäjät, sekä kehittäjät voivat poistaa paketteja."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -567,7 +567,7 @@ msgid "Disown"
 msgstr "Hylkää"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "Vain Luotetut käyttäjät, sekä kehittäjät voivat hylätä paketteja."
 
 #: html/pkgflagcomment.php
@@ -657,7 +657,7 @@ msgid "Merge"
 msgstr "Liitä"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Vain Luotetut käyttäjät, sekä kehittäjät voivat yhdistää paketteja."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -715,7 +715,7 @@ msgid "I accept the terms and conditions above."
 msgstr "Hyväksyn ylläolevat ehdot."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Luotettu käyttäjä (TU)"
 
 #: html/tu.php
@@ -727,7 +727,7 @@ msgid "Voting is closed for this proposal."
 msgstr "Tämän ehdoksen äänestys on päättynyt."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "Vain Luotetut käyttäjät voivat äänestää."
 
 #: html/tu.php
@@ -1223,7 +1223,7 @@ msgstr "Kehittäjä"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "Luotettu käyttäjä & kehittäjä"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1326,10 +1326,6 @@ msgstr ""
 msgid "Normal user"
 msgstr "Tavallinen käyttäjä"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Luotettu käyttäjä (TU)"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Käyttäjätili hyllytetty"
@@ -1825,14 +1821,14 @@ msgstr "Yhdistä pakettiin"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr "Lähettämällä poistopyynnön pyydät Luotettua käyttäjää poistamaan pakettikannan. Tämän tyyppisiä pyyntöjä tulisi käyttää ainoastaan kaksoiskappaleisiin, laittomiin tai korjaamattoman rikkonaisiin paketteihin sekä ohjelmistoihin, jotka kehittäjä on hylännyt."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1840,7 +1836,7 @@ msgstr "Ennen yhdistämispyynnön lähettämistä, pyydä Luotettua käyttäjä
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2097,7 +2093,7 @@ msgid "Registered Users"
 msgstr "Rekisteröityjä käyttäjiä"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Luotettuja käyttäjiä"
 
 #: template/stats/updates_table.php
diff --git a/po/fi_FI.po b/po/fi_FI.po
index cd516edc..e8cf93e4 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -306,7 +306,7 @@ msgstr ""
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -563,7 +563,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -653,7 +653,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -711,7 +711,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr ""
 
 #: html/tu.php
@@ -723,7 +723,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1219,7 +1219,7 @@ msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1322,10 +1322,6 @@ msgstr ""
 msgid "Normal user"
 msgstr ""
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr ""
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr ""
@@ -1821,14 +1817,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1836,7 +1832,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2093,7 +2089,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/fr.po b/po/fr.po
index 2b0c5bab..7a37ca31 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -318,10 +318,10 @@ msgstr "Discussion"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
-msgstr "Les discussions générales en rapport avec AUR (Arch User Repository, dépôt des utilisateurs d’Arch Linux) et les TU (Trusted User, utilisateurs de confiance) ont lieu sur %saur-general%s. Pour les discussions en rapport avec le développement de l'interface web d'AUR, utilisez la mailing-list %saur-dev.%s"
+msgstr "Les discussions générales en rapport avec AUR (Arch User Repository, dépôt des utilisateurs d’Arch Linux) et les TU (Package Maintainer, utilisateurs de confiance) ont lieu sur %saur-general%s. Pour les discussions en rapport avec le développement de l'interface web d'AUR, utilisez la mailing-list %saur-dev.%s"
 
 #: html/home.php
 msgid "Bug Reporting"
@@ -534,7 +534,7 @@ msgid "Delete"
 msgstr "Supprimer"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Seuls les Utilisateur de Confiance et les Développeurs peuvent effacer des paquets."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -575,7 +575,7 @@ msgid "Disown"
 msgstr "Destituer"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "Seuls les Utilisateur de Confiance et les Développeurs peuvent destituer des paquets."
 
 #: html/pkgflagcomment.php
@@ -665,7 +665,7 @@ msgid "Merge"
 msgstr "Fusionner"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Seuls les Utilisateur de Confiance et les Développeurs peuvent fusionner des paquets."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -723,7 +723,7 @@ msgid "I accept the terms and conditions above."
 msgstr "J'accepte les modalités ci-avant."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Utilisateur de confiance (TU)"
 
 #: html/tu.php
@@ -735,7 +735,7 @@ msgid "Voting is closed for this proposal."
 msgstr "Le vote est clos pour cette proposition."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "Seuls les Utilisateurs de Confiance sont autorisés à voter."
 
 #: html/tu.php
@@ -1231,7 +1231,7 @@ msgstr "Développeur"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "Utilisateur de confiance (TU) et Développeur"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1334,10 +1334,6 @@ msgstr "Votre nom d'utilisateur est le nom que vous utilisez pour vous connecter
 msgid "Normal user"
 msgstr "Utilisateur normal"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Utilisateur de confiance (TU)"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Compte suspendu"
@@ -1834,14 +1830,14 @@ msgstr "Fusionner dans"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr "En soumettant une requète de suppression, vous demandez à un utilisateur de confiance de supprimer le paquet de base. Ce type de requète doit être utilisé pour les doublons, les logiciels abandonnés par l'upstream ainsi que pour les paquets illégaux ou irréparables."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1849,7 +1845,7 @@ msgstr "En soumettant une requète de fusion, vous demandez à un utilisateur de
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2110,7 +2106,7 @@ msgid "Registered Users"
 msgstr "Utilisateurs enregistrés"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Utilisateurs de confiance (TU)"
 
 #: template/stats/updates_table.php
diff --git a/po/he.po b/po/he.po
index 88f2fddd..e0c3ca32 100644
--- a/po/he.po
+++ b/po/he.po
@@ -309,7 +309,7 @@ msgstr "דיון"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "הדיון הכללי על מאגר המשתמשים של ארץ׳ (AUR) ומבנה המשתמשים המהימנים מתנהל ברשימה %saur-general%s. לדיון בנוגע לפיתוח של המנשק של AUR, יש להשתמש ברשימה %saur-dev%s."
@@ -525,7 +525,7 @@ msgid "Delete"
 msgstr "מחיקה"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "רק משתמשים מהימנים ומפתחים יכולים למחוק חבילות."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -566,7 +566,7 @@ msgid "Disown"
 msgstr "ניתוק בעלות"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "רק משתמשים מהימנים ומפתחים יכולים לנתק בעלות של חבילות."
 
 #: html/pkgflagcomment.php
@@ -656,7 +656,7 @@ msgid "Merge"
 msgstr "מיזוג"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "רק משתמשים מהימנים ומפתחים יכולים למזג חבילות."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -714,7 +714,7 @@ msgid "I accept the terms and conditions above."
 msgstr "התנאים שלעיל מקובלים עלי."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "משתמש מהימן"
 
 #: html/tu.php
@@ -726,7 +726,7 @@ msgid "Voting is closed for this proposal."
 msgstr "ההצבעה סגורה עבור הצעה זו."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "רק משתמשים מהימנים מורשים להצביע."
 
 #: html/tu.php
@@ -1222,7 +1222,7 @@ msgstr "מפתח"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "משתמש מהימן ומפתח"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1325,10 +1325,6 @@ msgstr "שם המשתמש שלך הוא השם שישמש אותך לכניסה
 msgid "Normal user"
 msgstr "משתמש רגיל"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "משתמשים אמינים"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "חשבון מושעה"
@@ -1826,14 +1822,14 @@ msgstr "מיזוג לתוך"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr "בהגשת בקשה למחיקה, משתמש מהימן ישקול אם למחוק בסיס חבילה. סוג כזה של בקשה יכול לשמש במקרים של כפילויות, תכנית שנזנחה במקור לצד חבילה בלתי חוקית או שבורה באופן שלא ניתן לשקם."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1841,7 +1837,7 @@ msgstr "הגשת בקשת מיזוג מופנית למשתמש מהימן לטו
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2106,7 +2102,7 @@ msgid "Registered Users"
 msgstr "משתמשים רשומים"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "משתמשים מהימנים"
 
 #: template/stats/updates_table.php
diff --git a/po/hi_IN.po b/po/hi_IN.po
index 1ba83dae..7a03a923 100644
--- a/po/hi_IN.po
+++ b/po/hi_IN.po
@@ -307,7 +307,7 @@ msgstr "चर्चा"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "आर्च उपयोक्ता पैकेज-संग्रह (AUR) व विश्वसनीय उपयोक्ता संरचना संबंधी सामान्य चर्चा %saur-general%s पर होती है। AUR वेब अंतरफलक के विकास संबंधी चर्चा हेतु %saur-dev%s ईमेल-सूची उपयोग करें।"
@@ -523,7 +523,7 @@ msgid "Delete"
 msgstr "हटाएँ"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "केवल विश्वसनीय उपयोक्ता व व सॉफ्टवेयर विकासकर्ता ही पैकेज हटा सकते हैं।"
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -564,7 +564,7 @@ msgid "Disown"
 msgstr "स्वामित्व निरस्त करें"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "केवल विश्वसनीय उपयोक्ता व व सॉफ्टवेयर विकासकर्ता ही पैकेज स्वामित्व निरस्त कर सकते हैं।"
 
 #: html/pkgflagcomment.php
@@ -654,7 +654,7 @@ msgid "Merge"
 msgstr "विलय करें"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "केवल विश्वसनीय उपयोक्ता व व सॉफ्टवेयर विकासकर्ता ही पैकेज विलय कर सकते हैं।"
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -712,7 +712,7 @@ msgid "I accept the terms and conditions above."
 msgstr "मैं ऊपर दिए गए नियम व शर्तों को स्वीकारता हूँ।"
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "विश्वसनीय उपयोक्ता"
 
 #: html/tu.php
@@ -724,7 +724,7 @@ msgid "Voting is closed for this proposal."
 msgstr "इस प्रस्ताव हेतु वोट प्रक्रिया बंद है।"
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "केवल विश्वसनीय उपयोक्ता ही मतदान कर सकते हैं।"
 
 #: html/tu.php
@@ -1220,7 +1220,7 @@ msgstr "सॉफ्टवेयर विकासकर्ता"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "विश्वसनीय उपयोक्ता व सॉफ्टवेयर विकासकर्ता"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1323,10 +1323,6 @@ msgstr "लॉगिन हेतु प्रयुक्त नाम ही 
 msgid "Normal user"
 msgstr "सामान्य उपयोक्ता"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "विश्वसनीय उपयोक्ता"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "निलंबित अकाउंट"
@@ -1822,14 +1818,14 @@ msgstr "इसमें विलय करें"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr "हटाने हेतु अनुरोध से अभिप्राय है विश्वसनीय उपयोक्ता को पैकेज बेस हटाने हेतु निवेदन। यह प्रतिरूपित प्रोग्राम, स्रोत द्वारा त्यागे गए सॉफ्टवेयर के साथ ही अवैध व समाधान विहीन समस्यात्मक पैकेज हेतु उचित होता है।"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1837,7 +1833,7 @@ msgstr "विलय अनुरोध से अभिप्राय है 
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2094,7 +2090,7 @@ msgid "Registered Users"
 msgstr "पंजीकृत उपयोक्ता"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "विश्वसनीय उपयोक्ता"
 
 #: template/stats/updates_table.php
diff --git a/po/hr.po b/po/hr.po
index a0474e23..dcfa6449 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -307,7 +307,7 @@ msgstr "Rasprava"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -523,7 +523,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -564,7 +564,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -654,7 +654,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -712,7 +712,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Pouzdan korisnik"
 
 #: html/tu.php
@@ -724,7 +724,7 @@ msgid "Voting is closed for this proposal."
 msgstr "Glasanje je zaključeno za ovaj prijedlog"
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1220,7 +1220,7 @@ msgstr "Developer"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1323,10 +1323,6 @@ msgstr ""
 msgid "Normal user"
 msgstr "Običan korisnik"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Pouzdan korisnik"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Račun je suspendiran"
@@ -1823,14 +1819,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1838,7 +1834,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2099,7 +2095,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/hu.po b/po/hu.po
index 7459a716..a032255d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -311,10 +311,10 @@ msgstr "Megbeszélés"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
-msgstr "Az Arch User Repositoryval (AUR) és a Trusted User struktúrával kapcsolatos általános tanácskozás helye az %saur-general%s. Az AUR webes felületének fejlesztésével kapcsolatos tanácskozáshoz az %saur-dev%s levelezőlista használandó."
+msgstr "Az Arch User Repositoryval (AUR) és a Package Maintainer struktúrával kapcsolatos általános tanácskozás helye az %saur-general%s. Az AUR webes felületének fejlesztésével kapcsolatos tanácskozáshoz az %saur-dev%s levelezőlista használandó."
 
 #: html/home.php
 msgid "Bug Reporting"
@@ -527,7 +527,7 @@ msgid "Delete"
 msgstr "Törlés"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Csak megbízható felhasználók és fejlesztők tudnak csomagokat törölni."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -568,7 +568,7 @@ msgid "Disown"
 msgstr "Megtagadás"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "Csak megbízható felhasználók és fejlesztők tudnak megtagadni csomagokat."
 
 #: html/pkgflagcomment.php
@@ -658,7 +658,7 @@ msgid "Merge"
 msgstr "Beolvasztás"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Csak megbízható felhasználók és fejlesztők tudnak csomagokat beolvasztani."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -716,7 +716,7 @@ msgid "I accept the terms and conditions above."
 msgstr "Elfogadom a feljebb megadott feltételeket."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Megbízható felhasználó"
 
 #: html/tu.php
@@ -728,7 +728,7 @@ msgid "Voting is closed for this proposal."
 msgstr "A szavazás lezárult erre az indítványra."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "A szavazás csak megbízható felhasználóknak engedélyezett."
 
 #: html/tu.php
@@ -1224,7 +1224,7 @@ msgstr "Fejlesztő"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "Megbízható felhasználó és fejlesztő"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1327,10 +1327,6 @@ msgstr "A felhasználóneved a bejelentkezéshez használt név lesz. Látható
 msgid "Normal user"
 msgstr "Normál felhasználó"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Megbízható felhasználó"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Felhasználói fiók felfüggesztve"
@@ -1826,14 +1822,14 @@ msgstr "Beolvasztás ebbe:"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr "Törlési kérelem beküldésével megkérsz egy megbízható felhasználót, hogy törölje az alapcsomagot. Ez a típusú kérelem duplikátumok, főági fejlesztők által felhagyott szoftverek, valamint illegális és helyrehozhatatlanul elromlott csomagok esetén használható."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1841,7 +1837,7 @@ msgstr "Beolvasztási kérelem beküldésével megkérsz egy megbízható felhas
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2098,7 +2094,7 @@ msgid "Registered Users"
 msgstr "Regisztrált felhasználók"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Megbízható felhasználók"
 
 #: template/stats/updates_table.php
diff --git a/po/id.po b/po/id.po
index 96059ac9..65e272e8 100644
--- a/po/id.po
+++ b/po/id.po
@@ -308,7 +308,7 @@ msgstr ""
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -524,7 +524,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -565,7 +565,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -655,7 +655,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -713,7 +713,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr ""
 
 #: html/tu.php
@@ -725,7 +725,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1221,7 +1221,7 @@ msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1324,10 +1324,6 @@ msgstr ""
 msgid "Normal user"
 msgstr ""
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr ""
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr ""
@@ -1822,14 +1818,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1837,7 +1833,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2090,7 +2086,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/id_ID.po b/po/id_ID.po
index f0612399..c503f4de 100644
--- a/po/id_ID.po
+++ b/po/id_ID.po
@@ -306,7 +306,7 @@ msgstr ""
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -563,7 +563,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -653,7 +653,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -711,7 +711,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr ""
 
 #: html/tu.php
@@ -723,7 +723,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1219,7 +1219,7 @@ msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1322,10 +1322,6 @@ msgstr ""
 msgid "Normal user"
 msgstr ""
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr ""
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr ""
@@ -1820,14 +1816,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1835,7 +1831,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2088,7 +2084,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/is.po b/po/is.po
index 0f3a3fcb..fb4b8aad 100644
--- a/po/is.po
+++ b/po/is.po
@@ -306,7 +306,7 @@ msgstr ""
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -563,7 +563,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -653,7 +653,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -711,7 +711,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr ""
 
 #: html/tu.php
@@ -723,7 +723,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1219,7 +1219,7 @@ msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1322,10 +1322,6 @@ msgstr ""
 msgid "Normal user"
 msgstr ""
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr ""
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr ""
@@ -1821,14 +1817,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1836,7 +1832,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2093,7 +2089,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/it.po b/po/it.po
index 466d486a..b8a107de 100644
--- a/po/it.po
+++ b/po/it.po
@@ -312,7 +312,7 @@ msgstr "Discussione"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "La discussione generale sull'Arch User Repository (AUR) e sulla struttura dei TU avviene in %saur-general%s. Per la discussione relativa allo sviluppo dell'interfaccia web di AUR, utilizza la lista di discussione %saur-dev%s."
@@ -528,7 +528,7 @@ msgid "Delete"
 msgstr "Elimina"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Solo i TU e gli sviluppatori possono eliminare i pacchetti."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -569,7 +569,7 @@ msgid "Disown"
 msgstr "Abbandona"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "Solo i TU e gli sviluppatori possono abbandonare i pacchetti."
 
 #: html/pkgflagcomment.php
@@ -659,7 +659,7 @@ msgid "Merge"
 msgstr "Unisci"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Solo i TU e gli sviluppatori possono unire i pacchetti."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -717,7 +717,7 @@ msgid "I accept the terms and conditions above."
 msgstr "Io accetto i termini e le condizioni di cui sopra."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "TU"
 
 #: html/tu.php
@@ -729,7 +729,7 @@ msgid "Voting is closed for this proposal."
 msgstr "Non puoi più votare per questa proposta."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "Solo i TU possono votare."
 
 #: html/tu.php
@@ -1225,7 +1225,7 @@ msgstr "Sviluppatore"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "TU e sviluppatore"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1328,10 +1328,6 @@ msgstr "Il tuo nome utente è il nome che userai per l'accesso. È visibile al p
 msgid "Normal user"
 msgstr "Utente normale"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "TU"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Account sospeso"
@@ -1828,26 +1824,26 @@ msgstr "Unisci con"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
-msgstr "Inserendo una richiesta di cancellazione, stai chiedendo ad un Trusted User di cancellare il pacchetto base. Questo tipo di richiesta dovrebbe essere usata per i duplicati, per software abbandonati dall'autore, per sotware illegalmente distribuiti oppure per pacchetti irreparabili."
+msgstr "Inserendo una richiesta di cancellazione, stai chiedendo ad un Package Maintainer di cancellare il pacchetto base. Questo tipo di richiesta dovrebbe essere usata per i duplicati, per software abbandonati dall'autore, per sotware illegalmente distribuiti oppure per pacchetti irreparabili."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
-msgstr "Inserendo una richiesta di unione, stai chiedendo ad un Trusted User di cancellare il pacchetto base e trasferire i suoi voti e commenti su un altro pacchetto base. Unire due pacchetti non ha effetto sul corrispondente repository Git. Assicurati di aggiornare lo storico Git del pacchetto di destinazione."
+msgstr "Inserendo una richiesta di unione, stai chiedendo ad un Package Maintainer di cancellare il pacchetto base e trasferire i suoi voti e commenti su un altro pacchetto base. Unire due pacchetti non ha effetto sul corrispondente repository Git. Assicurati di aggiornare lo storico Git del pacchetto di destinazione."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
-msgstr "Inserendo una richiesta di abbandono, stai chiedendo ad un Trusted User di rimuovere la proprietà del pacchetto base. Procedi soltanto se il pacchetto necessita di manutenzione, se il manutentore attuale non risponde e se hai già provato a contattarlo precedentemente."
+msgstr "Inserendo una richiesta di abbandono, stai chiedendo ad un Package Maintainer di rimuovere la proprietà del pacchetto base. Procedi soltanto se il pacchetto necessita di manutenzione, se il manutentore attuale non risponde e se hai già provato a contattarlo precedentemente."
 
 #: template/pkgreq_results.php
 msgid "No requests matched your search criteria."
@@ -2104,7 +2100,7 @@ msgid "Registered Users"
 msgstr "Utenti registrati"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "TU"
 
 #: template/stats/updates_table.php
diff --git a/po/ja.po b/po/ja.po
index 40349f28..849d5d65 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -310,10 +310,10 @@ msgstr "議論"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
-msgstr "Arch User Repository (AUR) や Trusted User に関する一般的な議論は %saur-general%s で行って下さい。AUR ウェブインターフェイスの開発に関しては、%saur-dev%s メーリングリストを使用します。"
+msgstr "Arch User Repository (AUR) や Package Maintainer に関する一般的な議論は %saur-general%s で行って下さい。AUR ウェブインターフェイスの開発に関しては、%saur-dev%s メーリングリストを使用します。"
 
 #: html/home.php
 msgid "Bug Reporting"
@@ -526,8 +526,8 @@ msgid "Delete"
 msgstr "削除"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
-msgstr "Trusted User と開発者だけがパッケージを削除できます。"
+msgid "Only Package Maintainers and Developers can delete packages."
+msgstr "Package Maintainer と開発者だけがパッケージを削除できます。"
 
 #: html/pkgdisown.php template/pkgbase_actions.php
 msgid "Disown Package"
@@ -567,8 +567,8 @@ msgid "Disown"
 msgstr "放棄"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
-msgstr "Trusted User と開発者だけがパッケージを孤児にできます。"
+msgid "Only Package Maintainers and Developers can disown packages."
+msgstr "Package Maintainer と開発者だけがパッケージを孤児にできます。"
 
 #: html/pkgflagcomment.php
 msgid "Flag Comment"
@@ -657,8 +657,8 @@ msgid "Merge"
 msgstr "マージ"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
-msgstr "Trusted User と開発者だけがパッケージをマージできます。"
+msgid "Only Package Maintainers and Developers can merge packages."
+msgstr "Package Maintainer と開発者だけがパッケージをマージできます。"
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
 msgid "Submit Request"
@@ -715,8 +715,8 @@ msgid "I accept the terms and conditions above."
 msgstr "私は上記の利用規約を承認します。"
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
-msgstr "Trusted User"
+msgid "Package Maintainer"
+msgstr "Package Maintainer"
 
 #: html/tu.php
 msgid "Could not retrieve proposal details."
@@ -727,8 +727,8 @@ msgid "Voting is closed for this proposal."
 msgstr "この提案への投票は締め切られています。"
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
-msgstr "Trusted User だけが投票できます。"
+msgid "Only Package Maintainers are allowed to vote."
+msgstr "Package Maintainer だけが投票できます。"
 
 #: html/tu.php
 msgid "You cannot vote in an proposal about you."
@@ -1223,8 +1223,8 @@ msgstr "開発者"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
-msgstr "Trusted User & 開発者"
+msgid "Package Maintainer & Developer"
+msgstr "Package Maintainer & 開発者"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
@@ -1326,10 +1326,6 @@ msgstr "ユーザー名はログインするときに使用する名前です。
 msgid "Normal user"
 msgstr "ノーマルユーザー"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Trusted user"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "休眠アカウント"
@@ -1824,26 +1820,26 @@ msgstr "マージ"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
-msgstr "削除リクエストを送信することで、Trusted User にパッケージベースの削除を要求できます。削除リクエストを使用するケース: パッケージの重複や、上流によってソフトウェアの開発が放棄された場合、違法なパッケージ、あるいはパッケージがどうしようもなく壊れてしまっている場合など。"
+msgstr "削除リクエストを送信することで、Package Maintainer にパッケージベースの削除を要求できます。削除リクエストを使用するケース: パッケージの重複や、上流によってソフトウェアの開発が放棄された場合、違法なパッケージ、あるいはパッケージがどうしようもなく壊れてしまっている場合など。"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
-msgstr "マージリクエストを送信することで、パッケージベースを削除して\n投票数とコメントを他のパッケージベースに移動することを Trusted User に要求できます。パッケージのマージは Git リポジトリに影響を与えません。マージ先のパッケージの Git 履歴は自分で更新してください。"
+msgstr "マージリクエストを送信することで、パッケージベースを削除して\n投票数とコメントを他のパッケージベースに移動することを Package Maintainer に要求できます。パッケージのマージは Git リポジトリに影響を与えません。マージ先のパッケージの Git 履歴は自分で更新してください。"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
-msgstr "孤児リクエストを送信することで、パッケージベースの所有権が放棄されるように Trusted User に要求できます。パッケージにメンテナが何らかの手を加える必要があり、現在のメンテナが行方不明で、メンテナに連絡を取ろうとしても返答がない場合にのみ、リクエストを送信してください。"
+msgstr "孤児リクエストを送信することで、パッケージベースの所有権が放棄されるように Package Maintainer に要求できます。パッケージにメンテナが何らかの手を加える必要があり、現在のメンテナが行方不明で、メンテナに連絡を取ろうとしても返答がない場合にのみ、リクエストを送信してください。"
 
 #: template/pkgreq_results.php
 msgid "No requests matched your search criteria."
@@ -2092,8 +2088,8 @@ msgid "Registered Users"
 msgstr "登録ユーザー"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
-msgstr "Trusted User"
+msgid "Package Maintainers"
+msgstr "Package Maintainer"
 
 #: template/stats/updates_table.php
 msgid "Recent Updates"
diff --git a/po/ko.po b/po/ko.po
index a4c694c9..3db275fd 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -306,7 +306,7 @@ msgstr ""
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -563,7 +563,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -653,7 +653,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -711,7 +711,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr ""
 
 #: html/tu.php
@@ -723,7 +723,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1219,7 +1219,7 @@ msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1322,10 +1322,6 @@ msgstr ""
 msgid "Normal user"
 msgstr ""
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr ""
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr ""
@@ -1820,14 +1816,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1835,7 +1831,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2088,7 +2084,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/lt.po b/po/lt.po
index 627fefd0..8511aaca 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -306,7 +306,7 @@ msgstr ""
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -563,7 +563,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -653,7 +653,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -711,7 +711,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr ""
 
 #: html/tu.php
@@ -723,7 +723,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1219,7 +1219,7 @@ msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1322,10 +1322,6 @@ msgstr ""
 msgid "Normal user"
 msgstr ""
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr ""
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr ""
@@ -1823,14 +1819,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1838,7 +1834,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2103,7 +2099,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/nb.po b/po/nb.po
index b503de85..5638bba8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -312,7 +312,7 @@ msgstr "Diskusjon"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "Generell diskusjon rundt Arch sitt brukerstyrte pakkebibliotek (AUR) og strukturen rundt betrodde brukere, foregår på %saur-general%s. For diskusjoner relatert til utviklingen av AUR web-grensesnittet, bruk %saur-dev%s e-postlisten."
@@ -528,7 +528,7 @@ msgid "Delete"
 msgstr "Slett"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Bare betrodde brukere og utviklere kan slette pakker."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -569,7 +569,7 @@ msgid "Disown"
 msgstr "Gjør eierløs"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "Bare betrodde brukere og Arch utviklere kan gjøre pakker eierløse."
 
 #: html/pkgflagcomment.php
@@ -659,7 +659,7 @@ msgid "Merge"
 msgstr "Slå sammen"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Bare betrodde brukere og utviklere kan slå sammen pakker."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -717,7 +717,7 @@ msgid "I accept the terms and conditions above."
 msgstr "Jeg godtar betingelsene ovenfor."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Betrodd bruker"
 
 #: html/tu.php
@@ -729,7 +729,7 @@ msgid "Voting is closed for this proposal."
 msgstr "Avstemningen er ferdig for dette forslaget."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "Bare betrodde brukere har stemmerett."
 
 #: html/tu.php
@@ -1225,7 +1225,7 @@ msgstr "Utvikler"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "Betrodd bruker & Utvikler"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1328,10 +1328,6 @@ msgstr "Brukernavnet er navnet du vil bruke for å logge inn med. Det er synlig
 msgid "Normal user"
 msgstr "Vanlig bruker"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Betrodd bruker"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Konto suspendert"
@@ -1827,14 +1823,14 @@ msgstr "Flett med"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr "Ved å sende inn en forespørsel om sletting spør du en betrodd bruker om å slette pakken. Slike forespørsler bør brukes om duplikater, forlatt programvare samt ulovlige eller pakker som er så ødelagte at de ikke lenger kan fikses."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1842,7 +1838,7 @@ msgstr "Ved å sende inn en forespørsel om sammenslåing spør du en betrodd br
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2099,7 +2095,7 @@ msgid "Registered Users"
 msgstr "Registrerte brukere"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Betrodde brukere"
 
 #: template/stats/updates_table.php
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 49d2eccf..06eaca3a 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -308,7 +308,7 @@ msgstr "Diskusjon"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -524,7 +524,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -565,7 +565,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -655,7 +655,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -713,7 +713,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Betrodd bruker"
 
 #: html/tu.php
@@ -725,7 +725,7 @@ msgid "Voting is closed for this proposal."
 msgstr "Stemming er avsluttet for dette forslaget."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1221,7 +1221,7 @@ msgstr "Utvikler"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1324,10 +1324,6 @@ msgstr ""
 msgid "Normal user"
 msgstr "Vanlig bruker"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Betrodd bruker"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Konto suspendert"
@@ -1823,14 +1819,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1838,7 +1834,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2095,7 +2091,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/nl.po b/po/nl.po
index d23fe04a..5dcb51ce 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -313,10 +313,10 @@ msgstr "Discussiëren"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
-msgstr "Algemene discussies met betrekking tot de Arch User Repository (AUR) en de opzet van Trusted Users vinden plaats op %saur-general%s. Discussies met betrekking tot de ontwikkeling van de AUR-webapp vinden plaats op de %saur-dev%s-mailinglijst."
+msgstr "Algemene discussies met betrekking tot de Arch User Repository (AUR) en de opzet van Package Maintainers vinden plaats op %saur-general%s. Discussies met betrekking tot de ontwikkeling van de AUR-webapp vinden plaats op de %saur-dev%s-mailinglijst."
 
 #: html/home.php
 msgid "Bug Reporting"
@@ -529,8 +529,8 @@ msgid "Delete"
 msgstr "Verwijderen"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
-msgstr "Alleen Trusted Users en Developers kunnen pakketten verwijderen."
+msgid "Only Package Maintainers and Developers can delete packages."
+msgstr "Alleen Package Maintainers en Developers kunnen pakketten verwijderen."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
 msgid "Disown Package"
@@ -570,8 +570,8 @@ msgid "Disown"
 msgstr "Onteigenen"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
-msgstr "Alleen Trusted Users en Developers kunnen pakketten onteigenen."
+msgid "Only Package Maintainers and Developers can disown packages."
+msgstr "Alleen Package Maintainers en Developers kunnen pakketten onteigenen."
 
 #: html/pkgflagcomment.php
 msgid "Flag Comment"
@@ -660,8 +660,8 @@ msgid "Merge"
 msgstr "Samenvoegen"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
-msgstr "Alleen Trusted Users en Developers kunnen pakketten samenvoegen."
+msgid "Only Package Maintainers and Developers can merge packages."
+msgstr "Alleen Package Maintainers en Developers kunnen pakketten samenvoegen."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
 msgid "Submit Request"
@@ -718,8 +718,8 @@ msgid "I accept the terms and conditions above."
 msgstr "Ik ga akkoord met de algemene voorwaarden."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
-msgstr "Trusted User"
+msgid "Package Maintainer"
+msgstr "Package Maintainer"
 
 #: html/tu.php
 msgid "Could not retrieve proposal details."
@@ -730,8 +730,8 @@ msgid "Voting is closed for this proposal."
 msgstr "U kunt niet meer stemmen op dit voorstel."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
-msgstr "Alleen Trusted Users zijn bevoegd om te stemmen."
+msgid "Only Package Maintainers are allowed to vote."
+msgstr "Alleen Package Maintainers zijn bevoegd om te stemmen."
 
 #: html/tu.php
 msgid "You cannot vote in an proposal about you."
@@ -1226,8 +1226,8 @@ msgstr "Ontwikkelaar"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
-msgstr "Trusted User en ontwikkelaar"
+msgid "Package Maintainer & Developer"
+msgstr "Package Maintainer en ontwikkelaar"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
@@ -1329,10 +1329,6 @@ msgstr "Uw gebruikersnaam gebruikt u om in te loggen. Deze naam is openbaar, zel
 msgid "Normal user"
 msgstr "Normale gebruiker"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Trusted User"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Account geschorst"
@@ -1828,26 +1824,26 @@ msgstr "Samenvoegen met"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
-msgstr "Als u een verwijderingsverzoek doet, vraagt u aan een zogeheten ‘Trusted User’ om het basispakket te verwijderen. Dit verzoek is bedoeld om duplicaten, niet-onderhouden (door upstream), illegale en onherstelbare pakketten te verwijderen."
+msgstr "Als u een verwijderingsverzoek doet, vraagt u aan een zogeheten ‘Package Maintainer’ om het basispakket te verwijderen. Dit verzoek is bedoeld om duplicaten, niet-onderhouden (door upstream), illegale en onherstelbare pakketten te verwijderen."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
-msgstr "Als u een samenvoegingsverzoek doet, vraagt u aan een zogeheten ‘Trusted User’ om het basispakket te verwijderen en de bijbehorende opmerkingen en stemmen over te zetten naar een ander basispakket. Dit heeft geen invloed op de bijbehorende git-repo's, maar u dient wél zelf de git-geschiedenis van het doelpakket bij te werken."
+msgstr "Als u een samenvoegingsverzoek doet, vraagt u aan een zogeheten ‘Package Maintainer’ om het basispakket te verwijderen en de bijbehorende opmerkingen en stemmen over te zetten naar een ander basispakket. Dit heeft geen invloed op de bijbehorende git-repo's, maar u dient wél zelf de git-geschiedenis van het doelpakket bij te werken."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
-msgstr "Als u een onteigeningsverzoek doet, vraagt u aan een zogeheten ‘Trusted User’ om het basispakket te onteigenen. Doe dit alleen als een pakket dringend onderhoud nodig heeft, maar de eigenaar niet thuis geeft, ook niet na een persoonlijk verzoek."
+msgstr "Als u een onteigeningsverzoek doet, vraagt u aan een zogeheten ‘Package Maintainer’ om het basispakket te onteigenen. Doe dit alleen als een pakket dringend onderhoud nodig heeft, maar de eigenaar niet thuis geeft, ook niet na een persoonlijk verzoek."
 
 #: template/pkgreq_results.php
 msgid "No requests matched your search criteria."
@@ -2100,8 +2096,8 @@ msgid "Registered Users"
 msgstr "Geregistreerde gebruikers"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
-msgstr "Trusted Users"
+msgid "Package Maintainers"
+msgstr "Package Maintainers"
 
 #: template/stats/updates_table.php
 msgid "Recent Updates"
diff --git a/po/pl.po b/po/pl.po
index 97c7d730..1e055f94 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -319,7 +319,7 @@ msgstr "Dyskusja"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "Ogólna dyskusja dotycząca Repozytorium Użytkowników Arch (AUR) i struktury Zaufanych Użytkowników odbywa się na %saur-general%s. Dyskusja dotycząca rozwoju interfejsu webowego AUR odbywa się zaś na liście dyskusyjnej %saur-dev%s."
@@ -535,7 +535,7 @@ msgid "Delete"
 msgstr "Usuń"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Tylko Zaufani Użytkownicy i Deweloperzy mogą usuwać pakiety."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -576,7 +576,7 @@ msgid "Disown"
 msgstr "Porzuć"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "Tylko Zaufani Użytkownicy i Programiści mogą porzucać pakiety."
 
 #: html/pkgflagcomment.php
@@ -666,7 +666,7 @@ msgid "Merge"
 msgstr "Scal"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Tylko Zaufani Użytkownicy i Deweloperzy mogą scalać pakiety."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -724,7 +724,7 @@ msgid "I accept the terms and conditions above."
 msgstr "Akceptuję powyższe warunki i zasady."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Zaufany Użytkownik"
 
 #: html/tu.php
@@ -736,7 +736,7 @@ msgid "Voting is closed for this proposal."
 msgstr "Głosowanie na tą propozycję jest zamknięte."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "Tylko Zaufani Użytkownicy mogą głosować."
 
 #: html/tu.php
@@ -1232,7 +1232,7 @@ msgstr "Deweloper"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "Zaufany Użytkownik i Developer"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1335,10 +1335,6 @@ msgstr ""
 msgid "Normal user"
 msgstr "Zwykły użytkownik"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Zaufany Użytkownik"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Konto zablokowane"
@@ -1836,14 +1832,14 @@ msgstr "Scal z"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1851,7 +1847,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2116,7 +2112,7 @@ msgid "Registered Users"
 msgstr "Zarejestrowani użytkownicy"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Zaufani użytkownicy"
 
 #: template/stats/updates_table.php
diff --git a/po/pt.po b/po/pt.po
index 05778859..0a0a0ecc 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -307,7 +307,7 @@ msgstr "Discussão"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -523,7 +523,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -564,7 +564,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -654,7 +654,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -712,7 +712,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Usuário Confiável"
 
 #: html/tu.php
@@ -724,7 +724,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1220,7 +1220,7 @@ msgstr "Desenvolvedor"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1323,10 +1323,6 @@ msgstr ""
 msgid "Normal user"
 msgstr "Usuário Normal"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Usuário Confiável"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Conta Suspensa"
@@ -1823,14 +1819,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1838,7 +1834,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2099,7 +2095,7 @@ msgid "Registered Users"
 msgstr "Usuários Registrados"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Usuários Confiáveis"
 
 #: template/stats/updates_table.php
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6bc6a596..ea59440f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -313,10 +313,10 @@ msgstr "Discussão"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
-msgstr "Discussões gerais no que se refere à estrutura do Arch User Repository (AUR) e de Trusted Users acontecem no %saur-general%s. Para discussão relacionada ao desenvolvimento da interface web do AUR, use a lista de discussão do %saur-dev%s"
+msgstr "Discussões gerais no que se refere à estrutura do Arch User Repository (AUR) e de Package Maintainers acontecem no %saur-general%s. Para discussão relacionada ao desenvolvimento da interface web do AUR, use a lista de discussão do %saur-dev%s"
 
 #: html/home.php
 msgid "Bug Reporting"
@@ -529,8 +529,8 @@ msgid "Delete"
 msgstr "Excluir"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
-msgstr "Somente Trusted Users e Desenvolvedores podem excluir pacotes."
+msgid "Only Package Maintainers and Developers can delete packages."
+msgstr "Somente Package Maintainers e Desenvolvedores podem excluir pacotes."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
 msgid "Disown Package"
@@ -570,8 +570,8 @@ msgid "Disown"
 msgstr "Abandonar"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
-msgstr "Apenas Trusted Users e Desenvolvedores podem abandonar pacotes."
+msgid "Only Package Maintainers and Developers can disown packages."
+msgstr "Apenas Package Maintainers e Desenvolvedores podem abandonar pacotes."
 
 #: html/pkgflagcomment.php
 msgid "Flag Comment"
@@ -660,8 +660,8 @@ msgid "Merge"
 msgstr "Mesclar"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
-msgstr "Somente Trusted Users e Desenvolvedores podem mesclar pacotes."
+msgid "Only Package Maintainers and Developers can merge packages."
+msgstr "Somente Package Maintainers e Desenvolvedores podem mesclar pacotes."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
 msgid "Submit Request"
@@ -718,8 +718,8 @@ msgid "I accept the terms and conditions above."
 msgstr "Eu aceito os termos e condições acima."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
-msgstr "Trusted User"
+msgid "Package Maintainer"
+msgstr "Package Maintainer"
 
 #: html/tu.php
 msgid "Could not retrieve proposal details."
@@ -730,8 +730,8 @@ msgid "Voting is closed for this proposal."
 msgstr "A votação está encerrada para esta proposta."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
-msgstr "Apenas Trusted Users têm permissão para votar."
+msgid "Only Package Maintainers are allowed to vote."
+msgstr "Apenas Package Maintainers têm permissão para votar."
 
 #: html/tu.php
 msgid "You cannot vote in an proposal about you."
@@ -1226,8 +1226,8 @@ msgstr "Desenvolvedor"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
-msgstr "Trusted User & Desenvolvedor"
+msgid "Package Maintainer & Developer"
+msgstr "Package Maintainer & Desenvolvedor"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
@@ -1329,10 +1329,6 @@ msgstr "Seu nome de usuário é o nome que você vai usar para se autenticar. É
 msgid "Normal user"
 msgstr "Usuário normal"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Trusted user"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Conta suspensa"
@@ -1829,26 +1825,26 @@ msgstr "Mesclar em"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
-msgstr "Ao enviar uma requisição de exclusão, você solicita que um Trusted User exclua o pacote base. Esse tipo de requisição deveria ser usada em caso de duplicidade, softwares abandonados pelo upstream, assim como pacotes ilegais ou irreparavelmente quebrados."
+msgstr "Ao enviar uma requisição de exclusão, você solicita que um Package Maintainer exclua o pacote base. Esse tipo de requisição deveria ser usada em caso de duplicidade, softwares abandonados pelo upstream, assim como pacotes ilegais ou irreparavelmente quebrados."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
-msgstr "Ao enviar uma requisição de mesclagem, você solicita que um Trusted User exclua o pacote base e transfira seus votos e comentários para um outro pacote base. Mesclar um pacote não afeta os repositórios Git correspondentes. Certifique-se de você mesmo atualizar o histórico Git do pacote alvo."
+msgstr "Ao enviar uma requisição de mesclagem, você solicita que um Package Maintainer exclua o pacote base e transfira seus votos e comentários para um outro pacote base. Mesclar um pacote não afeta os repositórios Git correspondentes. Certifique-se de você mesmo atualizar o histórico Git do pacote alvo."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
-msgstr "Ao enviar uma requisição de tornar órfão, você pede que um Trusted User abandona o pacote base. Por favor, apenas faça isto se o pacote precise de ação do mantenedor, estando este ausente por muito tempo, e você já tentou – e não conseguiu – contatá-lo anteriormente."
+msgstr "Ao enviar uma requisição de tornar órfão, você pede que um Package Maintainer abandona o pacote base. Por favor, apenas faça isto se o pacote precise de ação do mantenedor, estando este ausente por muito tempo, e você já tentou – e não conseguiu – contatá-lo anteriormente."
 
 #: template/pkgreq_results.php
 msgid "No requests matched your search criteria."
@@ -2105,8 +2101,8 @@ msgid "Registered Users"
 msgstr "Usuários registrados"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
-msgstr "Trusted Users"
+msgid "Package Maintainers"
+msgstr "Package Maintainers"
 
 #: template/stats/updates_table.php
 msgid "Recent Updates"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 5d2ff7de..9bf92e05 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -312,7 +312,7 @@ msgstr "Discussão"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "A discussão geral sobre o Repositório do Usuário do Arco (AUR) e a estrutura do Usuário Confiável ocorre em %s aur-general %s. Para discussão relacionada ao desenvolvimento da interface da web AUR, use a lista de emails %s aur-dev %s"
@@ -528,7 +528,7 @@ msgid "Delete"
 msgstr "Eliminar"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Apenas Utilizadores de Confiança e Programadores podem eliminar pacotes."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -569,7 +569,7 @@ msgid "Disown"
 msgstr "Renunciar"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "Somente Usuários Verificados e Desenvolvedores podem desaprovar pacotes."
 
 #: html/pkgflagcomment.php
@@ -659,7 +659,7 @@ msgid "Merge"
 msgstr "Fundir"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Apenas Utilizadores de Confiança e Programadores podem fundir pacotes."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -717,7 +717,7 @@ msgid "I accept the terms and conditions above."
 msgstr "Eu aceito os termos e condições acima mencionados."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Utilizador de Confiança"
 
 #: html/tu.php
@@ -729,7 +729,7 @@ msgid "Voting is closed for this proposal."
 msgstr "A votação está fechada para esta proposta."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "Apenas Utilizadores de Confiança podem votar."
 
 #: html/tu.php
@@ -1225,7 +1225,7 @@ msgstr "Desenvolvedor"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1328,10 +1328,6 @@ msgstr ""
 msgid "Normal user"
 msgstr "Utilizador normal"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Utilizador de confiança"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Conta Suspensa"
@@ -1828,14 +1824,14 @@ msgstr "Juntar em"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1843,7 +1839,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2104,7 +2100,7 @@ msgid "Registered Users"
 msgstr "Utilizadores Registados"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Utilizadores de Confiança"
 
 #: template/stats/updates_table.php
diff --git a/po/ro.po b/po/ro.po
index ecee97fd..ec5eb5b9 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -309,7 +309,7 @@ msgstr "Discuție"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -525,8 +525,8 @@ msgid "Delete"
 msgstr "Șterge"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
-msgstr "Numai Dezvoltatorii și Trusted Users pot șterge pachete."
+msgid "Only Package Maintainers and Developers can delete packages."
+msgstr "Numai Dezvoltatorii și Package Maintainers pot șterge pachete."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
 msgid "Disown Package"
@@ -566,7 +566,7 @@ msgid "Disown"
 msgstr "Abandonează"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -656,8 +656,8 @@ msgid "Merge"
 msgstr "Fuzionare"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
-msgstr "Numai Dezvoltatorii și Trusted Users pot fuziona pachete."
+msgid "Only Package Maintainers and Developers can merge packages."
+msgstr "Numai Dezvoltatorii și Package Maintainers pot fuziona pachete."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
 msgid "Submit Request"
@@ -714,8 +714,8 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
-msgstr "Trusted User"
+msgid "Package Maintainer"
+msgstr "Package Maintainer"
 
 #: html/tu.php
 msgid "Could not retrieve proposal details."
@@ -726,8 +726,8 @@ msgid "Voting is closed for this proposal."
 msgstr "Votarea este închisă pentru această propunere."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
-msgstr "Doar Trusted Users au permisiunea să voteze."
+msgid "Only Package Maintainers are allowed to vote."
+msgstr "Doar Package Maintainers au permisiunea să voteze."
 
 #: html/tu.php
 msgid "You cannot vote in an proposal about you."
@@ -1222,7 +1222,7 @@ msgstr "Dezvoltator"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "Utilizator de încredere (TU) & Dezvoltator"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1325,10 +1325,6 @@ msgstr ""
 msgid "Normal user"
 msgstr "Utilizator obișnuit"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Trusted user"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Cont suspendat"
@@ -1825,14 +1821,14 @@ msgstr "Fuzionează"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1840,7 +1836,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2100,10 +2096,6 @@ msgstr "Pachete niciodată actualizate"
 msgid "Registered Users"
 msgstr "Utilizatori înregistrați"
 
-#: template/stats/general_stats_table.php
-msgid "Trusted Users"
-msgstr "Trusted users"
-
 #: template/stats/updates_table.php
 msgid "Recent Updates"
 msgstr "Actualizări recente"
diff --git a/po/ru.po b/po/ru.po
index 4a8a18f7..a56e7e9f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -318,7 +318,7 @@ msgstr "Обсуждение"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "Общее обсуждение Пользовательского Репозитория ArchLinux (AUR) и структуры Доверенных Пользователей ведется в %saur-general%s. Для обсуждение разработки веб-интерфейса AUR используйте %saur-dev%s."
@@ -534,7 +534,7 @@ msgid "Delete"
 msgstr "Удалить"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Только Доверенные Пользователи и Разработчики могут удалять пакеты."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -575,7 +575,7 @@ msgid "Disown"
 msgstr "Бросить"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "Только Доверенные Пользователи или разработчики могут бросить пакеты."
 
 #: html/pkgflagcomment.php
@@ -665,7 +665,7 @@ msgid "Merge"
 msgstr "Объединить"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Только Доверенные Пользователи и Разработчики могут объединять пакеты."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -723,7 +723,7 @@ msgid "I accept the terms and conditions above."
 msgstr "Я принимаю приведённые выше положения и условия."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Доверенный пользователь"
 
 #: html/tu.php
@@ -735,7 +735,7 @@ msgid "Voting is closed for this proposal."
 msgstr "Голосование закрыто."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "Только Доверенные Пользователи имеют право голоса."
 
 #: html/tu.php
@@ -1231,7 +1231,7 @@ msgstr "Разработчик"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "Доверенные пользователи и Разработчики"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1334,10 +1334,6 @@ msgstr "Имя пользователя  имя, которое будет ис
 msgid "Normal user"
 msgstr "Обычный пользователь"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Доверенный пользователь"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Действие учетной записи приостановлено"
@@ -1835,14 +1831,14 @@ msgstr "Объединить с"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr "Отправляя запрос удаления, Вы просите Доверенного Пользователя удалить основной пакет. Этот тип запроса должен использоваться для дубликатов, заброшенных, а также незаконных и безнадёжно сломанных пакетов."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1850,7 +1846,7 @@ msgstr "Отправляя запрос на слияние, Вы просите
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2115,7 +2111,7 @@ msgid "Registered Users"
 msgstr "Зарегистрированных пользователей"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Доверенных пользователей"
 
 #: template/stats/updates_table.php
diff --git a/po/sk.po b/po/sk.po
index ca124981..774f0cee 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -309,7 +309,7 @@ msgstr "Diskusia"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "Všeobecná diskusia týkajúca sa Arch Užívateľského Repozitára (AUR) a štruktúry dôverovaných užívateľov (TU)  je na %saur-general%s.  Na diskusiu týkajúcu sa vývoja AUR webu použite %saur-dev%s mailing list."
@@ -525,7 +525,7 @@ msgid "Delete"
 msgstr "Vymazať"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Len dôverovaní užívatelia a vývojári môžu vymazať balíčky."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -566,7 +566,7 @@ msgid "Disown"
 msgstr "Vyvlastniť"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "Len dôverovaní užívatelia a vývojári môžu vyvlastňovať balíčky."
 
 #: html/pkgflagcomment.php
@@ -656,7 +656,7 @@ msgid "Merge"
 msgstr "Zlúčiť"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Len dôverovaní užívatelia a vývojári môžu zlúčiť balíčky."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -714,7 +714,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Dôverovaný užívateľ (TU)"
 
 #: html/tu.php
@@ -726,7 +726,7 @@ msgid "Voting is closed for this proposal."
 msgstr "Hlasovanie o tomto návrhu bolo ukončené."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "Práve hlasovať majú len dôverovaní užívatelia"
 
 #: html/tu.php
@@ -1222,7 +1222,7 @@ msgstr "Vývojár"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "Dôverovaný užívateľ & Vývojár"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1325,10 +1325,6 @@ msgstr ""
 msgid "Normal user"
 msgstr "Normálny užívateľ"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Dôverovaný užívateľ (TU)"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Účet bol pozastavený"
@@ -1826,26 +1822,26 @@ msgstr "Zlúčiť do"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
-msgstr "Odoslaním žiadosti na vymazanie balíčka žiadate dôverovaného užívateľa t.j. Trusted User, aby vymazal balíček aj s jeho základňou. Tento typ požiadavky by mal použitý pre duplikáty, softvér ku ktorému už nie sú zdroje ako aj nelegálne a neopraviteľné balíčky."
+msgstr "Odoslaním žiadosti na vymazanie balíčka žiadate dôverovaného užívateľa t.j. Package Maintainer, aby vymazal balíček aj s jeho základňou. Tento typ požiadavky by mal použitý pre duplikáty, softvér ku ktorému už nie sú zdroje ako aj nelegálne a neopraviteľné balíčky."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
-msgstr "Odoslaním žiadosti na zlúčenie balíčka žiadate dôverovaného užívateľa t.j. Trusted User, aby vymazal balíček aj s jeho základňou a preniesol hlasy a komentáre na inú základňu balíčka. Zlúčenie balíčka nezasiahne prináležiace Git repozitáre, preto sa uistite, že Git história cieľového balíčka je aktuálna."
+msgstr "Odoslaním žiadosti na zlúčenie balíčka žiadate dôverovaného užívateľa t.j. Package Maintainer, aby vymazal balíček aj s jeho základňou a preniesol hlasy a komentáre na inú základňu balíčka. Zlúčenie balíčka nezasiahne prináležiace Git repozitáre, preto sa uistite, že Git história cieľového balíčka je aktuálna."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
-msgstr "Odoslaním žiadosti na osirotenie balíčka žiadate dôverovaného užívateľa t.j. Trusted User, aby vyvlastnil balíček aj s jeho základňou. Toto urobte len vtedy, ak balíček vyžaduje zásah od vlastníka, vlastník nie je zastihnuteľný a už ste sa niekoľkokrát pokúšali vlastníka kontaktovať."
+msgstr "Odoslaním žiadosti na osirotenie balíčka žiadate dôverovaného užívateľa t.j. Package Maintainer, aby vyvlastnil balíček aj s jeho základňou. Toto urobte len vtedy, ak balíček vyžaduje zásah od vlastníka, vlastník nie je zastihnuteľný a už ste sa niekoľkokrát pokúšali vlastníka kontaktovať."
 
 #: template/pkgreq_results.php
 msgid "No requests matched your search criteria."
@@ -2106,7 +2102,7 @@ msgid "Registered Users"
 msgstr "Registrovaní užívatelia"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Dôverovaní užívatelia (TU)"
 
 #: template/stats/updates_table.php
diff --git a/po/sr.po b/po/sr.po
index 4054d7df..5da29192 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -309,7 +309,7 @@ msgstr "Diskusija"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "Opšta diskusija vezana za Arčovu Korisničku Riznicu (AUR) i strukturu Poverljivih korisnika se vodi na dopisnoj listi %saur-general%s.Za diskusiju o razvoju samog web sučelja AUR-a, pogedajte dopisnu listu %saur-dev%s."
@@ -525,7 +525,7 @@ msgid "Delete"
 msgstr "Obriši"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Samo Poverljivi korisnici i Programeri mogu brisati pakete."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -566,7 +566,7 @@ msgid "Disown"
 msgstr "Odrekni se"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "Samo Poverljivi korisnici i Programeri mogu vršiti odricanje paketa."
 
 #: html/pkgflagcomment.php
@@ -656,7 +656,7 @@ msgid "Merge"
 msgstr "Spoji"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Samo Poverljivi korisnici i Programeri mogu da spajaju pakete."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -714,7 +714,7 @@ msgid "I accept the terms and conditions above."
 msgstr "Prihvatam gore navedene uslove."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Poverljivi korisnik"
 
 #: html/tu.php
@@ -726,7 +726,7 @@ msgid "Voting is closed for this proposal."
 msgstr "Glasanje o ovom predlogu je završeno."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "Samo poverljivi korisnici mogu da glasaju."
 
 #: html/tu.php
@@ -1222,7 +1222,7 @@ msgstr "Programer"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "Poverljivi korisnik i programer"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1325,10 +1325,6 @@ msgstr "Vaše korisničko ime kojim se prijavljujete. Vidljivo je u javnosti, č
 msgid "Normal user"
 msgstr "Običan korisnik"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Poverljivi korisnik"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Nalog je suspendovan"
@@ -1825,14 +1821,14 @@ msgstr "Stopi sa"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr "Podnošenjem zahteva za brisanje tražili ste of poverljivog korisnika da obriše bazu paketa. Ovaj tip zahteva treba koristiti za duplikate, uzvodno napušten softver, kao i nelegalne ili nepopravljivo pokvarene pakete."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1840,7 +1836,7 @@ msgstr "Podnošenjem zahteva za spajanje tražili ste of poverljivog korisnika d
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2101,7 +2097,7 @@ msgid "Registered Users"
 msgstr "Registrovanih korisnika"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Poverljivih korisnika"
 
 #: template/stats/updates_table.php
diff --git a/po/sr_RS.po b/po/sr_RS.po
index a924dc4c..b15faa68 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -307,7 +307,7 @@ msgstr ""
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -523,7 +523,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -564,7 +564,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -654,7 +654,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -712,7 +712,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr ""
 
 #: html/tu.php
@@ -724,7 +724,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1220,7 +1220,7 @@ msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1323,10 +1323,6 @@ msgstr ""
 msgid "Normal user"
 msgstr ""
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr ""
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr ""
@@ -1823,14 +1819,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1838,7 +1834,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2099,7 +2095,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 6abb8452..45dbfcd5 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -312,10 +312,10 @@ msgstr "Diskussion"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
-msgstr "Generella diskussioner om Arch User Repository (AUR) och Trusted User strukturen tar plats på %saur-general%s. För diskussioner om utvecklingen av AUR web interfacet, använd %saur-dev%s maillistan."
+msgstr "Generella diskussioner om Arch User Repository (AUR) och Package Maintainer strukturen tar plats på %saur-general%s. För diskussioner om utvecklingen av AUR web interfacet, använd %saur-dev%s maillistan."
 
 #: html/home.php
 msgid "Bug Reporting"
@@ -528,8 +528,8 @@ msgid "Delete"
 msgstr "Radera"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
-msgstr "Bara Trusted Users och Developers kan radera paket."
+msgid "Only Package Maintainers and Developers can delete packages."
+msgstr "Bara Package Maintainers och Developers kan radera paket."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
 msgid "Disown Package"
@@ -569,8 +569,8 @@ msgid "Disown"
 msgstr "Gör herrelös"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
-msgstr "Bara Trusted Users och Developers kan göra paket herrelösa."
+msgid "Only Package Maintainers and Developers can disown packages."
+msgstr "Bara Package Maintainers och Developers kan göra paket herrelösa."
 
 #: html/pkgflagcomment.php
 msgid "Flag Comment"
@@ -659,8 +659,8 @@ msgid "Merge"
 msgstr "Slå ihop"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
-msgstr "Bara Trusted Users och Developers kan slå ihop paket."
+msgid "Only Package Maintainers and Developers can merge packages."
+msgstr "Bara Package Maintainers och Developers kan slå ihop paket."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
 msgid "Submit Request"
@@ -717,8 +717,8 @@ msgid "I accept the terms and conditions above."
 msgstr "Jag accepterar villkoren ovan."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
-msgstr "Trusted User"
+msgid "Package Maintainer"
+msgstr "Package Maintainer"
 
 #: html/tu.php
 msgid "Could not retrieve proposal details."
@@ -729,8 +729,8 @@ msgid "Voting is closed for this proposal."
 msgstr "Röstning för detta förslag är stängt."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
-msgstr "Bara Trusted Users är tillåtna att rösta."
+msgid "Only Package Maintainers are allowed to vote."
+msgstr "Bara Package Maintainers är tillåtna att rösta."
 
 #: html/tu.php
 msgid "You cannot vote in an proposal about you."
@@ -1225,8 +1225,8 @@ msgstr "Developer"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
-msgstr "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
+msgstr "Package Maintainer & Developer"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
@@ -1328,10 +1328,6 @@ msgstr "Ditt användarnamn är det namn du kommer att använda för att logga in
 msgid "Normal user"
 msgstr "Normal användare"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Trusted user"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Konto avstängt"
@@ -1827,26 +1823,26 @@ msgstr "Slå ihop i"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
-msgstr "Genom att skicka en begäran om borttagning ber du en Trusted User att ta bort paketbasen. Denna typ av begäran bör användas för dubbletter, programvara som övergetts av uppström, såväl som olagliga och irreparabelt trasiga paket."
+msgstr "Genom att skicka en begäran om borttagning ber du en Package Maintainer att ta bort paketbasen. Denna typ av begäran bör användas för dubbletter, programvara som övergetts av uppström, såväl som olagliga och irreparabelt trasiga paket."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
-msgstr "Genom att skicka en sammanslagningsförfrågan ber du en Trusted User att ta bort paketbasen och överföra dess röster och kommentarer till en annan paketbas. Att slå samman ett paket påverkar inte motsvarande Git-förråd. Se till att du själv uppdaterar Git-historiken för målpaketet."
+msgstr "Genom att skicka en sammanslagningsförfrågan ber du en Package Maintainer att ta bort paketbasen och överföra dess röster och kommentarer till en annan paketbas. Att slå samman ett paket påverkar inte motsvarande Git-förråd. Se till att du själv uppdaterar Git-historiken för målpaketet."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
-msgstr "Genom att skicka in en föräldralös begäran ber du en Trusted User att avfärda paketbasen. Vänligen gör endast detta om paketet behöver underhållsåtgärder, underhållaren är MIA och du redan försökt kontakta underhållaren tidigare."
+msgstr "Genom att skicka in en föräldralös begäran ber du en Package Maintainer att avfärda paketbasen. Vänligen gör endast detta om paketet behöver underhållsåtgärder, underhållaren är MIA och du redan försökt kontakta underhållaren tidigare."
 
 #: template/pkgreq_results.php
 msgid "No requests matched your search criteria."
@@ -2099,8 +2095,8 @@ msgid "Registered Users"
 msgstr "Registrerade användare"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
-msgstr "Trusted Users"
+msgid "Package Maintainers"
+msgstr "Package Maintainers"
 
 #: template/stats/updates_table.php
 msgid "Recent Updates"
diff --git a/po/tr.po b/po/tr.po
index b36c04f4..d6f35728 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -315,7 +315,7 @@ msgstr "Tartışma"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "Arch Kullanıcı Deposu (AUR) ve Güvenilir Kullanıcı yapısı ile ilgili genel tartışmalar %saur-general%s üzerinde yapılır. AUR web arayüzü geliştirme süreci ilgili tartışmalar %saur-dev%s listesinde yapılmaktadır."
@@ -531,7 +531,7 @@ msgid "Delete"
 msgstr "Sil"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Sadece geliştiriciler ve güvenilir kullanıcılar paket silebilir."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -572,7 +572,7 @@ msgid "Disown"
 msgstr "Sorumluluğunu bırak"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "Sadece geliştiriciler ve güvenilir kullanıcılar paketleri sahipsiz bırakabilir."
 
 #: html/pkgflagcomment.php
@@ -662,7 +662,7 @@ msgid "Merge"
 msgstr "Birleştir"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Sadece geliştiriciler ve güvenilir kullanıcılar paket birleştirebilir."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -720,7 +720,7 @@ msgid "I accept the terms and conditions above."
 msgstr "Yukarıdaki şartlar ve koşulları kabul ediyorum."
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Güvenilen Kullanıcı"
 
 #: html/tu.php
@@ -732,7 +732,7 @@ msgid "Voting is closed for this proposal."
 msgstr "Bu öneri için oylama kapanmıştır."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "Sadece Güvenilir Kullanıcılar oy kullanabilir."
 
 #: html/tu.php
@@ -1228,7 +1228,7 @@ msgstr "Geliştirici"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "Güvenilir Kullanıcı & Geliştirici"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1331,10 +1331,6 @@ msgstr "Kullanıcı adınız, oturum açmak için kullanacağınız addır. Hesa
 msgid "Normal user"
 msgstr "Normal kullanıcı"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Güvenilen kullanıcı"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Hesap Donduruldu"
@@ -1830,14 +1826,14 @@ msgstr "Şununla ilişkilendir:"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr "Silme talebi göndererek, Güvenilir Kullanıcıdan paketi silmesini istiyorsunuz. Bu tür bir istek birden fazla olan paketlerde, geliştirilmesi durdurulmuş yazılımlarda, ve aynı zamanda yasadışı ve onarılamaz bozuklukta olan paketler için kullanılmalıdır."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1845,7 +1841,7 @@ msgstr "Birleştirme talebi göndererek, Güvenilir Kullanıcıdan paketi silmes
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2102,7 +2098,7 @@ msgid "Registered Users"
 msgstr "Kayıtlı Kullanıcılar"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Güvenilen Kullanıcılar"
 
 #: template/stats/updates_table.php
diff --git a/po/uk.po b/po/uk.po
index 13f3ab90..6380034e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -312,7 +312,7 @@ msgstr "Обговорення"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "Загальне обговорення сховища користувацьких пакунків (AUR) та структури довірених користувачів відбувається в %saur-general%s. Для дискусій про розробку AUR використовуйте список розсилання %saur-dev%s."
@@ -528,7 +528,7 @@ msgid "Delete"
 msgstr "Вилучити"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "Тільки Довірені Користувачі та Розробники можуть вилучати пакунки."
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -569,7 +569,7 @@ msgid "Disown"
 msgstr "Відректися"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "Тільки Довірені Користувачі та Розробники можуть забирати права власності на пакунок."
 
 #: html/pkgflagcomment.php
@@ -659,7 +659,7 @@ msgid "Merge"
 msgstr "Об’єднати"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "Тільки Довірені Користувачі та Розробники можуть об’єднувати пакунки."
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -717,7 +717,7 @@ msgid "I accept the terms and conditions above."
 msgstr "Я приймаю подані вище терміни і умови.  "
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "Довірений користувач"
 
 #: html/tu.php
@@ -729,7 +729,7 @@ msgid "Voting is closed for this proposal."
 msgstr "Голосування на цю пропозицію закрито."
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "Тільки Довірені Користувачі мають право голосу."
 
 #: html/tu.php
@@ -1225,7 +1225,7 @@ msgstr "Розробник"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "Довірений користувач & Розробник"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1328,10 +1328,6 @@ msgstr "Ваша назва користувача є назвою, що буд
 msgid "Normal user"
 msgstr "Звичайний користувач"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "Довіренний користувач"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "Обліковий запис призупинено"
@@ -1829,14 +1825,14 @@ msgstr "Об'єднати в"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr "Надсилаючи запит на вилучення, Ви просите Довіреного Користувача вилучити пакунок з бази пакунків. Цей тип запиту повинен використовуватися для дублікатів, неоновлюваних програм, а також нелегальних і невиправно пошкоджених пакунків."
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1844,7 +1840,7 @@ msgstr "Надсилаючи запит на об'єднання, Ви прос
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2109,7 +2105,7 @@ msgid "Registered Users"
 msgstr "Зареєстровані користувачі"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "Довірені користувачі"
 
 #: template/stats/updates_table.php
diff --git a/po/vi.po b/po/vi.po
index a71c9ed5..f8d4a59b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -306,7 +306,7 @@ msgstr ""
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -563,7 +563,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -653,7 +653,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -711,7 +711,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr ""
 
 #: html/tu.php
@@ -723,7 +723,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1219,7 +1219,7 @@ msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1322,10 +1322,6 @@ msgstr ""
 msgid "Normal user"
 msgstr ""
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr ""
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr ""
@@ -1820,14 +1816,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1835,7 +1831,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2088,7 +2084,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/zh.po b/po/zh.po
index 77f31fe4..1e226b91 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -306,7 +306,7 @@ msgstr ""
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr ""
@@ -522,7 +522,7 @@ msgid "Delete"
 msgstr ""
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr ""
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -563,7 +563,7 @@ msgid "Disown"
 msgstr ""
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr ""
 
 #: html/pkgflagcomment.php
@@ -653,7 +653,7 @@ msgid "Merge"
 msgstr ""
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr ""
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -711,7 +711,7 @@ msgid "I accept the terms and conditions above."
 msgstr ""
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr ""
 
 #: html/tu.php
@@ -723,7 +723,7 @@ msgid "Voting is closed for this proposal."
 msgstr ""
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr ""
 
 #: html/tu.php
@@ -1219,7 +1219,7 @@ msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr ""
 
 #: template/account_details.php template/account_edit_form.php
@@ -1322,10 +1322,6 @@ msgstr ""
 msgid "Normal user"
 msgstr ""
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr ""
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr ""
@@ -1820,14 +1816,14 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1835,7 +1831,7 @@ msgstr ""
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2088,7 +2084,7 @@ msgid "Registered Users"
 msgstr ""
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr ""
 
 #: template/stats/updates_table.php
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a61781fb..4df0e960 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -318,7 +318,7 @@ msgstr "邮件列表"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "与 Arch 用户仓库（AUR）或者受信用户结构相关的一般讨论在 %saur-general%s 邮件列表。若是与 AUR web 页面开发相关的讨论，请使用 %saur-dev%s 邮件列表。"
@@ -534,7 +534,7 @@ msgid "Delete"
 msgstr "删除"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "只有受信用户和开发人员能删除软件包。"
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -575,7 +575,7 @@ msgid "Disown"
 msgstr "弃置"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "只有受信用户和开发人员能弃置软件包。"
 
 #: html/pkgflagcomment.php
@@ -665,7 +665,7 @@ msgid "Merge"
 msgstr "合并"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "只有受信用户和开发人员才能删除软件包。"
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -723,7 +723,7 @@ msgid "I accept the terms and conditions above."
 msgstr "我接受以上条款与条件。"
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "受信用户"
 
 #: html/tu.php
@@ -735,7 +735,7 @@ msgid "Voting is closed for this proposal."
 msgstr "该提议的投票已被关闭。"
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "只有受信用户可以投票。"
 
 #: html/tu.php
@@ -1231,7 +1231,7 @@ msgstr "开发人员"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "受信用户 & 开发者"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1334,10 +1334,6 @@ msgstr "您的用户名称将用于您的登录。这是公开的，即使您的
 msgid "Normal user"
 msgstr "普通用户"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "受信用户"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "账户被停用"
@@ -1832,14 +1828,14 @@ msgstr "合并到"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr "通过提交删除请求，您请求受信用户进行包基础的删除。这种请求应当被用于重复，软件被上游放弃，非法或损坏且无法修复的软件包。"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1847,7 +1843,7 @@ msgstr "通过提交合并请求，您请求受信用户进行包基础的删除
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2100,7 +2096,7 @@ msgid "Registered Users"
 msgstr "注册用户"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "受信用户"
 
 #: template/stats/updates_table.php
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 56014aac..d446dce3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -310,7 +310,7 @@ msgstr "討論"
 #: html/home.php
 #, php-format
 msgid ""
-"General discussion regarding the Arch User Repository (AUR) and Trusted User"
+"General discussion regarding the Arch User Repository (AUR) and Package Maintainer"
 " structure takes place on %saur-general%s. For discussion relating to the "
 "development of the AUR web interface, use the %saur-dev%s mailing list."
 msgstr "與 Arch 使用者套件庫(AUR)及受信使用者結構相關的一般性討論請見 %saur-general%s 。討論關於 AUR 網頁介面的開發，請使用 %saur-dev%s 郵件列表。"
@@ -526,7 +526,7 @@ msgid "Delete"
 msgstr "刪除"
 
 #: html/pkgdel.php
-msgid "Only Trusted Users and Developers can delete packages."
+msgid "Only Package Maintainers and Developers can delete packages."
 msgstr "只有受信使用者和開發者可以刪除套件。"
 
 #: html/pkgdisown.php template/pkgbase_actions.php
@@ -567,7 +567,7 @@ msgid "Disown"
 msgstr "棄置"
 
 #: html/pkgdisown.php
-msgid "Only Trusted Users and Developers can disown packages."
+msgid "Only Package Maintainers and Developers can disown packages."
 msgstr "只有受信使用者和開發者可以棄置套件。"
 
 #: html/pkgflagcomment.php
@@ -657,7 +657,7 @@ msgid "Merge"
 msgstr "合併"
 
 #: html/pkgmerge.php
-msgid "Only Trusted Users and Developers can merge packages."
+msgid "Only Package Maintainers and Developers can merge packages."
 msgstr "只有受信使用者和開發者可以合併套件。"
 
 #: html/pkgreq.php template/pkgbase_actions.php template/pkgreq_form.php
@@ -715,7 +715,7 @@ msgid "I accept the terms and conditions above."
 msgstr "我接受上述條款與條件。"
 
 #: html/tu.php template/account_details.php template/header.php
-msgid "Trusted User"
+msgid "Package Maintainer"
 msgstr "受信使用者"
 
 #: html/tu.php
@@ -727,7 +727,7 @@ msgid "Voting is closed for this proposal."
 msgstr "這個建議的投票已被關閉。"
 
 #: html/tu.php
-msgid "Only Trusted Users are allowed to vote."
+msgid "Only Package Maintainers are allowed to vote."
 msgstr "只有受信使用者可以投票。"
 
 #: html/tu.php
@@ -1223,7 +1223,7 @@ msgstr "開發者"
 
 #: template/account_details.php template/account_edit_form.php
 #: template/search_accounts_form.php
-msgid "Trusted User & Developer"
+msgid "Package Maintainer & Developer"
 msgstr "受信使用者 & 開發者"
 
 #: template/account_details.php template/account_edit_form.php
@@ -1326,10 +1326,6 @@ msgstr "您的使用者名稱是您要用於登入的名稱。它是公開的，
 msgid "Normal user"
 msgstr "一般使用者"
 
-#: template/account_edit_form.php template/search_accounts_form.php
-msgid "Trusted user"
-msgstr "受信使用者"
-
 #: template/account_edit_form.php template/search_accounts_form.php
 msgid "Account Suspended"
 msgstr "帳號被暫停"
@@ -1824,14 +1820,14 @@ msgstr "合併到"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a deletion request, you ask a Trusted User to delete the "
+"By submitting a deletion request, you ask a Package Maintainer to delete the "
 "package base. This type of request should be used for duplicates, software "
 "abandoned by upstream, as well as illegal and irreparably broken packages."
 msgstr "透過遞交刪除請求，您會請求受信使用者刪除套件基礎。這個類型的請求應該用於重複、被上游放棄的軟體，以及違法與無法修復的損壞套件。"
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting a merge request, you ask a Trusted User to delete the package "
+"By submitting a merge request, you ask a Package Maintainer to delete the package "
 "base and transfer its votes and comments to another package base. Merging a "
 "package does not affect the corresponding Git repositories. Make sure you "
 "update the Git history of the target package yourself."
@@ -1839,7 +1835,7 @@ msgstr "透過遞交合併請求，您會請求受信使用者刪除套件基礎
 
 #: template/pkgreq_form.php
 msgid ""
-"By submitting an orphan request, you ask a Trusted User to disown the "
+"By submitting an orphan request, you ask a Package Maintainer to disown the "
 "package base. Please only do this if the package needs maintainer action, "
 "the maintainer is MIA and you already tried to contact the maintainer "
 "previously."
@@ -2092,7 +2088,7 @@ msgid "Registered Users"
 msgstr "已註冊的使用者"
 
 #: template/stats/general_stats_table.php
-msgid "Trusted Users"
+msgid "Package Maintainers"
 msgstr "受信使用者"
 
 #: template/stats/updates_table.php
diff --git a/schema/gendummydata.py b/schema/gendummydata.py
index dfc8eee5..f9a18e7c 100755
--- a/schema/gendummydata.py
+++ b/schema/gendummydata.py
@@ -26,7 +26,7 @@ PKG_ID = 1  # Packages.ID of first package
 # how many users to 'register'
 MAX_USERS = int(os.environ.get("MAX_USERS", 38000))
 MAX_DEVS = 0.1  # what percentage of MAX_USERS are Developers
-MAX_TUS = 0.2  # what percentage of MAX_USERS are Trusted Users
+MAX_TUS = 0.2  # what percentage of MAX_USERS are Package Maintainers
 # how many packages to load
 MAX_PKGS = int(os.environ.get("MAX_PKGS", 32000))
 PKG_DEPS = (1, 15)  # min/max depends a package has
diff --git a/templates/account/search.html b/templates/account/search.html
index d28d4169..325ef0ba 100644
--- a/templates/account/search.html
+++ b/templates/account/search.html
@@ -20,9 +20,9 @@
                     <select name="T" id="id_type">
                         <option value="">{{ "Any type" | tr }}</option>
                         <option value="u">{{ "Normal user" | tr }}</option>
-                        <option value="t">{{ "Trusted user" | tr }}</option>
+                        <option value="t">{{ "Package Maintainer" | tr }}</option>
                         <option value="d">{{ "Developer" | tr }}</option>
-                        <option value="td">{{ "Trusted User & Developer" | tr }}</option>
+                        <option value="td">{{ "Package Maintainer & Developer" | tr }}</option>
                     </select>
                 </p>
                 <p>
diff --git a/templates/partials/archdev-navbar.html b/templates/partials/archdev-navbar.html
index 98bb1841..9aee9e45 100644
--- a/templates/partials/archdev-navbar.html
+++ b/templates/partials/archdev-navbar.html
@@ -36,10 +36,10 @@
                 </a>
             </li>
 
-            {# Only CRED_TU_LIST_VOTES privileged users see Trusted User #}
+            {# Only CRED_TU_LIST_VOTES privileged users see Package Maintainer #}
             {% if request.user.has_credential(creds.TU_LIST_VOTES) %}
                 <li>
-                    <a href="/tu">{% trans %}Trusted User{% endtrans %}</a>
+                    <a href="/tu">{% trans %}Package Maintainer{% endtrans %}</a>
                 </li>
             {% endif %}
 
diff --git a/templates/partials/packages/statistics.html b/templates/partials/packages/statistics.html
index 7c3c3ef6..7ce5fba1 100644
--- a/templates/partials/packages/statistics.html
+++ b/templates/partials/packages/statistics.html
@@ -42,7 +42,7 @@
         </tr>
         <tr>
             <td class="stat-desc">
-                {{ "Trusted Users" | tr }}
+                {{ "Package Maintainers" | tr }}
             </td>
             <td>{{ package_maintainer_count }}</td>
         </tr>
diff --git a/templates/partials/support.html b/templates/partials/support.html
index a2890cc5..26fcf663 100644
--- a/templates/partials/support.html
+++ b/templates/partials/support.html
@@ -44,7 +44,7 @@
 <h4>{% trans %}Discussion{% endtrans %}</h4>
 <div class="article-content">
     <p>
-    {{ "General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. For discussion relating to the development of the AUR web interface, use the %saur-dev%s mailing list."
+    {{ "General discussion regarding the Arch User Repository (AUR) and Package Maintainer structure takes place on %saur-general%s. For discussion relating to the development of the AUR web interface, use the %saur-dev%s mailing list."
         | tr
         | format('<a href="https://lists.archlinux.org/mailman3/lists/aur-general.lists.archlinux.org/">', "</a>",
                 '<a href="https://lists.archlinux.org/mailman3/lists/aur-dev.lists.archlinux.org/">', "</a>")
diff --git a/templates/partials/tu/proposal/details.html b/templates/partials/tu/proposal/details.html
index 4cbee9ad..c74a5c5e 100644
--- a/templates/partials/tu/proposal/details.html
+++ b/templates/partials/tu/proposal/details.html
@@ -22,7 +22,7 @@
     </div>
 
     <div class="field">
-        {{ "Active" | tr }} {{ "Trusted Users" | tr }} {{ "assigned" | tr }}:
+        {{ "Active" | tr }} {{ "Package Maintainers" | tr }} {{ "assigned" | tr }}:
         {{ voteinfo.ActiveTUs }}
     </div>
 
diff --git a/templates/pkgbase/request.html b/templates/pkgbase/request.html
index 61654a49..3ffa2d2d 100644
--- a/templates/pkgbase/request.html
+++ b/templates/pkgbase/request.html
@@ -69,8 +69,8 @@
 
                 <p id="deletion_hint">
                     {{
-                        "By submitting a deletion request, you ask a Trusted "
-                        "User to delete the package base. This type of "
+                        "By submitting a deletion request, you ask a Package "
+                        "Maintainer to delete the package base. This type of "
                         "request should be used for duplicates, software "
                         "abandoned by upstream, as well as illegal and "
                         "irreparably broken packages." | tr
@@ -79,8 +79,8 @@
 
                 <p id="merge_hint" style="display: none">
                     {{
-                        "By submitting a merge request, you ask a Trusted "
-                        "User to delete the package base and transfer its "
+                        "By submitting a merge request, you ask a Package "
+                        "Maintainer to delete the package base and transfer its "
                         "votes and comments to another package base. "
                         "Merging a package does not affect the corresponding "
                         "Git repositories. Make sure you update the Git "
@@ -90,8 +90,8 @@
 
                 <p id="orphan_hint" style="display: none">
                     {{
-                        "By submitting an orphan request, you ask a Trusted "
-                        "User to disown the package base. Please only do this "
+                        "By submitting an orphan request, you ask a Package "
+                        "Maintainer to disown the package base. Please only do this "
                         "if the package needs maintainer action, the "
                         "maintainer is MIA and you already tried to contact "
                         "the maintainer previously." | tr
diff --git a/templates/tu/index.html b/templates/tu/index.html
index 557645fa..94f2bfe4 100644
--- a/templates/tu/index.html
+++ b/templates/tu/index.html
@@ -6,11 +6,11 @@
         <table class="no-width">
             <tbody>
                 <tr>
-                    <td>{{ "Total" | tr }} {{ "Trusted Users" | tr }}:</td>
+                    <td>{{ "Total" | tr }} {{ "Package Maintainers" | tr }}:</td>
                     <td>{{ package_maintainer_count }}</td>
                 </tr>
                 <tr>
-                    <td>{{ "Active" | tr }} {{ "Trusted Users" | tr }}:</td>
+                    <td>{{ "Active" | tr }} {{ "Package Maintainers" | tr }}:</td>
                     <td>{{ active_package_maintainer_count }}</td>
                 </tr>
             </tbody>
diff --git a/test/t1100-git-auth.t b/test/t1100-git-auth.t
index e29bccdd..fffca776 100755
--- a/test/t1100-git-auth.t
+++ b/test/t1100-git-auth.t
@@ -11,7 +11,7 @@ test_expect_success 'Test basic authentication.' '
 	grep -q AUR_PRIVILEGED=0 out
 '
 
-test_expect_success 'Test Trusted User authentication.' '
+test_expect_success 'Test Package Maintainer authentication.' '
 	cover "$GIT_AUTH" "$AUTH_KEYTYPE_TU" "$AUTH_KEYTEXT_TU" >out &&
 	grep -q AUR_USER=tu out &&
 	grep -q AUR_PRIVILEGED=1 out
diff --git a/test/t1200-git-serve.t b/test/t1200-git-serve.t
index bb3a004f..3aea2163 100755
--- a/test/t1200-git-serve.t
+++ b/test/t1200-git-serve.t
@@ -124,7 +124,7 @@ test_expect_success "Try to push to someone else's repository." '
 	cover "$GIT_SERVE" 2>&1
 '
 
-test_expect_success "Try to push to someone else's repository as Trusted User." '
+test_expect_success "Try to push to someone else's repository as Package Maintainer." '
 	cat >expected <<-EOF &&
 	tu
 	foobar
@@ -195,7 +195,7 @@ test_expect_success "Adopt an already adopted package base." '
 	cover "$GIT_SERVE" 2>&1
 '
 
-test_expect_success "Adopt a package base as a Trusted User." '
+test_expect_success "Adopt a package base as a Package Maintainer." '
 	SSH_ORIGINAL_COMMAND="adopt foobar2" AUR_USER=tu AUR_PRIVILEGED=1 \
 	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
@@ -216,7 +216,7 @@ test_expect_success "Disown one's own package base as a regular user." '
 	test_cmp expected actual
 '
 
-test_expect_success "Disown one's own package base as a Trusted User." '
+test_expect_success "Disown one's own package base as a Package Maintainer." '
 	SSH_ORIGINAL_COMMAND="disown foobar2" AUR_USER=tu AUR_PRIVILEGED=1 \
 	cover "$GIT_SERVE" 2>&1 &&
 	cat >expected <<-EOF &&
@@ -248,7 +248,7 @@ test_expect_success "Try to steal another user's package as a regular user." '
 	cover "$GIT_SERVE" 2>&1
 '
 
-test_expect_success "Try to steal another user's package as a Trusted User." '
+test_expect_success "Try to steal another user's package as a Package Maintainer." '
 	SSH_ORIGINAL_COMMAND="adopt foobar" AUR_USER=user AUR_PRIVILEGED=0 \
 	cover "$GIT_SERVE" 2>&1 &&
 	SSH_ORIGINAL_COMMAND="adopt foobar" AUR_USER=tu AUR_PRIVILEGED=1 \
@@ -285,7 +285,7 @@ test_expect_success "Try to disown another user's package as a regular user." '
 	cover "$GIT_SERVE" 2>&1
 '
 
-test_expect_success "Try to disown another user's package as a Trusted User." '
+test_expect_success "Try to disown another user's package as a Package Maintainer." '
 	SSH_ORIGINAL_COMMAND="adopt foobar" AUR_USER=user AUR_PRIVILEGED=0 \
 	cover "$GIT_SERVE" 2>&1 &&
 	SSH_ORIGINAL_COMMAND="disown foobar" AUR_USER=tu AUR_PRIVILEGED=1 \
diff --git a/test/t1300-git-update.t b/test/t1300-git-update.t
index 0fb2da17..e4bddd82 100755
--- a/test/t1300-git-update.t
+++ b/test/t1300-git-update.t
@@ -125,7 +125,7 @@ test_expect_success 'Performing a non-fast-forward ref update.' '
 	test_cmp expected actual
 '
 
-test_expect_success 'Performing a non-fast-forward ref update as Trusted User.' '
+test_expect_success 'Performing a non-fast-forward ref update as Package Maintainer.' '
 	old=$(git -C aur.git rev-parse HEAD) &&
 	new=$(git -C aur.git rev-parse HEAD^) &&
 	cat >expected <<-EOD &&
@@ -149,7 +149,7 @@ test_expect_success 'Performing a non-fast-forward ref update as normal user wit
 	test_cmp expected actual
 '
 
-test_expect_success 'Performing a non-fast-forward ref update as Trusted User with AUR_OVERWRITE=1.' '
+test_expect_success 'Performing a non-fast-forward ref update as Package Maintainer with AUR_OVERWRITE=1.' '
 	old=$(git -C aur.git rev-parse HEAD) &&
 	new=$(git -C aur.git rev-parse HEAD^) &&
 	AUR_USER=tu AUR_PKGBASE=foobar AUR_PRIVILEGED=1 AUR_OVERWRITE=1 \
@@ -536,7 +536,7 @@ test_expect_success 'Pushing a blacklisted package.' '
 	test_cmp expected actual
 '
 
-test_expect_success 'Pushing a blacklisted package as Trusted User.' '
+test_expect_success 'Pushing a blacklisted package as Package Maintainer.' '
 	old=$(git -C aur.git rev-parse HEAD) &&
 	test_when_finished "git -C aur.git reset --hard $old" &&
 	echo "pkgname = forbidden" >>aur.git/.SRCINFO &&
@@ -565,7 +565,7 @@ test_expect_success 'Pushing a package already in the official repositories.' '
 	test_cmp expected actual
 '
 
-test_expect_success 'Pushing a package already in the official repositories as Trusted User.' '
+test_expect_success 'Pushing a package already in the official repositories as Package Maintainer.' '
 	old=$(git -C aur.git rev-parse HEAD) &&
 	test_when_finished "git -C aur.git reset --hard $old" &&
 	echo "pkgname = official" >>aur.git/.SRCINFO &&
diff --git a/test/test_homepage.py b/test/test_homepage.py
index d14fc91a..fc5eb17e 100644
--- a/test/test_homepage.py
+++ b/test/test_homepage.py
@@ -183,7 +183,7 @@ def test_homepage_stats(redis, packages):
         ("Packages updated in the past year", r"\d+"),
         ("Packages never updated", r"\d+"),
         ("Registered Users", r"\d+"),
-        ("Trusted Users", r"\d+"),
+        ("Package Maintainers", r"\d+"),
     ]
 
     stats = root.xpath('//div[@id="pkg-stats"]//tr')
diff --git a/test/test_html.py b/test/test_html.py
index 0eed5640..ceac9dc6 100644
--- a/test/test_html.py
+++ b/test/test_html.py
@@ -88,7 +88,7 @@ def test_archdev_navbar_authenticated_tu(client: TestClient, package_maintainer:
         "Requests",
         "Accounts",
         "My Account",
-        "Trusted User",
+        "Package Maintainer",
         "Logout",
     ]
     cookies = {"AURSID": package_maintainer.login(Request(), "testPassword")}
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index ed3e6dd5..d56e4cd0 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -1574,7 +1574,7 @@ def test_packages_post_disown_as_maintainer(
 def test_packages_post_disown(
     client: TestClient, tu_user: User, maintainer: User, package: Package
 ):
-    """Disown packages as a Trusted User, which cannot bypass idle time."""
+    """Disown packages as a Package Maintainer, which cannot bypass idle time."""
     cookies = {"AURSID": tu_user.login(Request(), "testPassword")}
     with client as request:
         request.cookies = cookies
diff --git a/test/test_trusted_user_routes.py b/test/test_trusted_user_routes.py
index a93ad8a5..6562e32b 100644
--- a/test/test_trusted_user_routes.py
+++ b/test/test_trusted_user_routes.py
@@ -634,7 +634,7 @@ def test_tu_running_proposal(
 
     active = details.xpath('./div[contains(@class, "field")]')[1]
     content = active.text.strip()
-    assert "Active Trusted Users assigned:" in content
+    assert "Active Package Maintainers assigned:" in content
     assert "1" in content
 
     submitted = details.xpath('./div[contains(@class, "submitted")]/text()')[0]
@@ -796,7 +796,7 @@ def test_tu_proposal_vote_unauthorized(
 
     root = parse_root(response.text)
     status = root.xpath('//span[contains(@class, "status")]/text()')[0]
-    assert status == "Only Trusted Users are allowed to vote."
+    assert status == "Only Package Maintainers are allowed to vote."
 
     with client as request:
         data = {"decision": "Yes"}
@@ -806,7 +806,7 @@ def test_tu_proposal_vote_unauthorized(
 
     root = parse_root(response.text)
     status = root.xpath('//span[contains(@class, "status")]/text()')[0]
-    assert status == "Only Trusted Users are allowed to vote."
+    assert status == "Only Package Maintainers are allowed to vote."
 
 
 def test_tu_proposal_vote_cant_self_vote(client, proposal):
diff --git a/upgrading/3.4.0.txt b/upgrading/3.4.0.txt
index c2f16888..b3804e94 100644
--- a/upgrading/3.4.0.txt
+++ b/upgrading/3.4.0.txt
@@ -1,5 +1,5 @@
-1. Add the "Trusted User & Developer" user group:
+1. Add the "Package Maintainer & Developer" user group:
 
 ----
-INSERT INTO AccountTypes (ID, AccountType) VALUES (4, 'Trusted User & Developer');
+INSERT INTO AccountTypes (ID, AccountType) VALUES (4, 'Package Maintainer & Developer');
 ----