# HG changeset patch # User Søren Løvborg # Date 1439565686 -7200 # Node ID b361974171ea3d7cc0d36551013f2103873c5720 # Parent 42ce8e54bae58fc74bddf4baa583cba30d088712 spelling: fix inappropriate use of title case These are not titles or labels, and should not be title cased. diff -r 42ce8e54bae5 -r b361974171ea kallithea/controllers/admin/repo_groups.py --- a/kallithea/controllers/admin/repo_groups.py Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/controllers/admin/repo_groups.py Fri Aug 14 17:21:26 2015 +0200 @@ -417,7 +417,7 @@ #action_logger(self.authuser, 'admin_changed_repo_permissions', # repo_name, self.ip_addr, self.sa) Session().commit() - h.flash(_('Repository Group permissions updated'), category='success') + h.flash(_('Repository group permissions updated'), category='success') return redirect(url('edit_repo_group_perms', group_name=group_name)) @HasRepoGroupPermissionAnyDecorator('group.admin') diff -r 42ce8e54bae5 -r b361974171ea kallithea/controllers/admin/user_groups.py --- a/kallithea/controllers/admin/user_groups.py Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/controllers/admin/user_groups.py Fri Aug 14 17:21:26 2015 +0200 @@ -317,7 +317,7 @@ #action_logger(self.authuser, 'admin_changed_repo_permissions', # repo_name, self.ip_addr, self.sa) Session().commit() - h.flash(_('User Group permissions updated'), category='success') + h.flash(_('User group permissions updated'), category='success') return redirect(url('edit_user_group_perms', id=id)) @HasUserGroupPermissionAnyDecorator('usergroup.admin') diff -r 42ce8e54bae5 -r b361974171ea kallithea/i18n/be/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po Fri Aug 14 17:21:26 2015 +0200 @@ -717,7 +717,7 @@ msgstr "Адміністратар не можа адклікаць свае прывелеі" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "Прывілеі групы рэпазітароў абноўлены" #: kallithea/controllers/admin/repo_groups.py:472 @@ -959,7 +959,7 @@ msgstr "Мэтавая група не можа быць такі ж" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "Прывілеі групы карыстачоў абноўлены" #: kallithea/controllers/admin/user_groups.py:440 @@ -1825,7 +1825,7 @@ msgstr "Рэгістрацыя новага карыстача" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Вы не можаце рэдагаваць карыстача, паколькі гэта крытычна для працы ўсяго " "прыкладання" @@ -2926,7 +2926,7 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be managed " +"Your user is in an external source of record; some details cannot be managed " "here" msgstr "" @@ -4226,7 +4226,7 @@ msgstr "Апошні ўваход" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4255,7 +4255,7 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be " +"This user is in an external source of record (%s); some details cannot be " "managed here." msgstr "" diff -r 42ce8e54bae5 -r b361974171ea kallithea/i18n/cs/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Fri Aug 14 17:21:26 2015 +0200 @@ -710,7 +710,7 @@ msgstr "" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "" #: kallithea/controllers/admin/repo_groups.py:472 @@ -950,7 +950,7 @@ msgstr "" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "" #: kallithea/controllers/admin/user_groups.py:440 @@ -1809,7 +1809,7 @@ msgstr "" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" #: kallithea/model/user.py:255 @@ -2885,7 +2885,7 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4177,7 +4177,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4206,7 +4206,7 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff -r 42ce8e54bae5 -r b361974171ea kallithea/i18n/de/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Fri Aug 14 17:21:26 2015 +0200 @@ -725,7 +725,7 @@ msgstr "Als Administrator kann man sich keine Berechtigungen entziehen" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "Berechtigungen der Repositoriumsgruppe aktualisiert" #: kallithea/controllers/admin/repo_groups.py:472 @@ -976,7 +976,7 @@ msgstr "Zielgruppe kann nicht die gleiche Gruppe sein" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "Berechtigungen der Benutzergruppe wurden aktualisiert" #: kallithea/controllers/admin/user_groups.py:440 @@ -1843,7 +1843,7 @@ msgstr "Neue Benutzerregistrierung" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Sie können diesen Benutzer nicht editieren, da er von entscheidender " "Bedeutung für die gesamte Applikation ist" @@ -2961,7 +2961,7 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4259,7 +4259,7 @@ msgstr "Letzter Login" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "Mitglieder der Benutzergruppe" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4288,7 +4288,7 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff -r 42ce8e54bae5 -r b361974171ea kallithea/i18n/en/LC_MESSAGES/kallithea.mo Binary file kallithea/i18n/en/LC_MESSAGES/kallithea.mo has changed diff -r 42ce8e54bae5 -r b361974171ea kallithea/i18n/fr/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Fri Aug 14 17:21:26 2015 +0200 @@ -736,7 +736,7 @@ msgstr "Impossible de révoquer votre permission d'administrateur" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "Permissions du groupe de dépôts mises à jour" #: kallithea/controllers/admin/repo_groups.py:472 @@ -984,7 +984,7 @@ msgstr "Le groupe cible ne peut pas être le même" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "Permissions du groupe d'utilisateurs mises à jour" #: kallithea/controllers/admin/user_groups.py:440 @@ -1848,7 +1848,7 @@ msgstr "Nouveau enregistrement d'utilisateur" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" " fonctionnement de l’application" @@ -2957,7 +2957,7 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4305,7 +4305,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4334,7 +4334,7 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff -r 42ce8e54bae5 -r b361974171ea kallithea/i18n/hu/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Fri Aug 14 17:21:26 2015 +0200 @@ -709,7 +709,7 @@ msgstr "" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "" #: kallithea/controllers/admin/repo_groups.py:472 @@ -949,7 +949,7 @@ msgstr "" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "" #: kallithea/controllers/admin/user_groups.py:440 @@ -1802,7 +1802,7 @@ msgstr "" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" #: kallithea/model/user.py:255 @@ -2876,7 +2876,7 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4156,7 +4156,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4185,7 +4185,7 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff -r 42ce8e54bae5 -r b361974171ea kallithea/i18n/ja/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Fri Aug 14 17:21:26 2015 +0200 @@ -721,7 +721,7 @@ msgstr "自分自身の管理者としての権限を取り消すことはできません" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "リポジトリグループ権限を更新しました" #: kallithea/controllers/admin/repo_groups.py:472 @@ -961,7 +961,7 @@ msgstr "対象に同じ物を選ぶことはできません" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "ユーザーグループ権限を更新しました" #: kallithea/controllers/admin/user_groups.py:440 @@ -1811,7 +1811,7 @@ msgstr "新規ユーザー登録" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "このユーザーを編集できません。このユーザーはアプリケーションにとって必要不可欠です。" #: kallithea/model/user.py:255 @@ -2900,9 +2900,9 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" -msgstr "ユーザーは外部の Source of Record に属しているため、ここでは詳細を管理できません" +msgstr "ユーザーは外部の source of record に属しているため、ここでは詳細を管理できません" #: kallithea/templates/admin/my_account/my_account_repos.html:1 #, fuzzy @@ -4271,7 +4271,7 @@ msgstr "最終ログイン日時" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "グループのメンバー数" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4300,9 +4300,9 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." -msgstr "このユーザーは外部の Source of Record (%s) に属しています。ここでは詳細を管理できません。" +msgstr "このユーザーは外部の source of record (%s) に属しています。ここでは詳細を管理できません。" #: kallithea/templates/admin/users/user_edit_profile.html:60 msgid "Name in Source of Record" diff -r 42ce8e54bae5 -r b361974171ea kallithea/i18n/kallithea.pot --- a/kallithea/i18n/kallithea.pot Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/i18n/kallithea.pot Fri Aug 14 17:21:26 2015 +0200 @@ -728,7 +728,7 @@ msgstr "" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "" #: kallithea/controllers/admin/repo_groups.py:472 @@ -962,7 +962,7 @@ msgstr "" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "" #: kallithea/controllers/admin/user_groups.py:440 @@ -1718,51 +1718,51 @@ msgstr "" #: kallithea/model/db.py:1668 -msgid "Default user has no access to new Repositories" +msgid "Default user has no access to new repositories" msgstr "" #: kallithea/model/db.py:1669 -msgid "Default user has read access to new Repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1670 -msgid "Default user has write access to new Repositories" +msgid "Default user has write access to new repositories" msgstr "" #: kallithea/model/db.py:1671 -msgid "Default user has admin access to new Repositories" +msgid "Default user has admin access to new repositories" msgstr "" #: kallithea/model/db.py:1673 -msgid "Default user has no access to new Repository Groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1674 -msgid "Default user has read access to new Repository Groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1675 -msgid "Default user has write access to new Repository Groups" +msgid "Default user has write access to new repository groups" msgstr "" #: kallithea/model/db.py:1676 -msgid "Default user has admin access to new Repository Groups" +msgid "Default user has admin access to new repository groups" msgstr "" #: kallithea/model/db.py:1678 -msgid "Default user has no access to new User Groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1679 -msgid "Default user has read access to new User Groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1680 -msgid "Default user has write access to new User Groups" +msgid "Default user has write access to new user groups" msgstr "" #: kallithea/model/db.py:1681 -msgid "Default user has admin access to new User Groups" +msgid "Default user has admin access to new user groups" msgstr "" #: kallithea/model/db.py:1683 @@ -1774,19 +1774,19 @@ msgstr "" #: kallithea/model/db.py:1686 -msgid "Only admins can create User Groups" +msgid "Only admins can create user groups" msgstr "" #: kallithea/model/db.py:1687 -msgid "Non-admins can create User Groups" +msgid "Non-admins can create user groups" msgstr "" #: kallithea/model/db.py:1689 -msgid "Only admins can create top level Repositories" +msgid "Only admins can create top level repositories" msgstr "" #: kallithea/model/db.py:1690 -msgid "Non-admins can create top level Repositories" +msgid "Non-admins can create top level repositories" msgstr "" #: kallithea/model/db.py:1695 @@ -1917,7 +1917,7 @@ msgstr "" #: kallithea/model/user.py:217 kallithea/model/user.py:239 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" #: kallithea/model/user.py:258 @@ -2965,7 +2965,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:28 -msgid "Your user is in an external Source of Record; some details cannot be managed here" +msgid "Your user is in an external source of record; some details cannot be managed here" msgstr "" #: kallithea/templates/admin/my_account/my_account_repos.html:1 @@ -4135,7 +4135,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4163,7 +4163,7 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format -msgid "This user is in an external Source of Record (%s); some details cannot be managed here." +msgid "This user is in an external source of record (%s); some details cannot be managed here." msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:60 diff -r 42ce8e54bae5 -r b361974171ea kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Fri Aug 14 17:21:26 2015 +0200 @@ -712,7 +712,7 @@ msgstr "" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "" #: kallithea/controllers/admin/repo_groups.py:472 @@ -952,7 +952,7 @@ msgstr "" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "" #: kallithea/controllers/admin/user_groups.py:440 @@ -1805,7 +1805,7 @@ msgstr "" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" #: kallithea/model/user.py:255 @@ -2879,7 +2879,7 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4161,7 +4161,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4190,7 +4190,7 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff -r 42ce8e54bae5 -r b361974171ea kallithea/i18n/pl/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Fri Aug 14 17:21:26 2015 +0200 @@ -724,7 +724,7 @@ msgstr "Nie można cofnąć zezwolenia dla admina jako admin" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "Aktualizacja uprawnień grup repozytorium" #: kallithea/controllers/admin/repo_groups.py:472 @@ -966,7 +966,7 @@ msgstr "Grupa docelowa nie może być taka sama" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "Aktualizacja uprawnień grupy użytkowników" #: kallithea/controllers/admin/user_groups.py:440 @@ -1831,7 +1831,7 @@ msgstr "nowy użytkownik się zarejestrował" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej " "aplikacji" @@ -2938,7 +2938,7 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4285,7 +4285,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4314,7 +4314,7 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff -r 42ce8e54bae5 -r b361974171ea kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Fri Aug 14 17:21:26 2015 +0200 @@ -722,7 +722,7 @@ msgstr "Você não pode revocar sua própria permissão de administrador" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "Permissões atualizadas do Grupo de Repositórios" #: kallithea/controllers/admin/repo_groups.py:472 @@ -962,7 +962,7 @@ msgstr "O grupo destino não pode ser o mesmo" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "Permissões do Grupo de Usuários atualizadas" #: kallithea/controllers/admin/user_groups.py:440 @@ -1821,7 +1821,7 @@ msgstr "Novo registro de usuário" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Você não pode Editar esse usuário, pois ele é crucial para toda a " "aplicação" @@ -2928,7 +2928,7 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4275,7 +4275,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4304,7 +4304,7 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff -r 42ce8e54bae5 -r b361974171ea kallithea/i18n/ru/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Fri Aug 14 17:21:26 2015 +0200 @@ -729,7 +729,7 @@ msgstr "Администратор не может отозвать свои привелегии" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "Привилегии группы репозиториев обновлены" #: kallithea/controllers/admin/repo_groups.py:472 @@ -971,7 +971,7 @@ msgstr "Целевая группа не может быть такой же" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "Привилегии группы пользователей обновлены" #: kallithea/controllers/admin/user_groups.py:440 @@ -1837,7 +1837,7 @@ msgstr "Регистрация нового пользователя" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Вы не можете редактировать пользователя, поскольку это критично для " "работы всего приложения" @@ -2939,7 +2939,7 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4238,7 +4238,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4267,7 +4267,7 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff -r 42ce8e54bae5 -r b361974171ea kallithea/i18n/sk/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Fri Aug 14 17:21:26 2015 +0200 @@ -709,7 +709,7 @@ msgstr "" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "" #: kallithea/controllers/admin/repo_groups.py:472 @@ -949,7 +949,7 @@ msgstr "" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "" #: kallithea/controllers/admin/user_groups.py:440 @@ -1808,7 +1808,7 @@ msgstr "" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" #: kallithea/model/user.py:255 @@ -2884,7 +2884,7 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4168,7 +4168,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4197,7 +4197,7 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff -r 42ce8e54bae5 -r b361974171ea kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Fri Aug 14 17:21:26 2015 +0200 @@ -718,7 +718,7 @@ msgstr "" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "" #: kallithea/controllers/admin/repo_groups.py:472 @@ -958,7 +958,7 @@ msgstr "" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "" #: kallithea/controllers/admin/user_groups.py:440 @@ -1806,7 +1806,7 @@ msgstr "" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" #: kallithea/model/user.py:255 @@ -2889,7 +2889,7 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4209,7 +4209,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4238,7 +4238,7 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff -r 42ce8e54bae5 -r b361974171ea kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Fri Aug 14 17:21:26 2015 +0200 @@ -710,7 +710,7 @@ msgstr "" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "" #: kallithea/controllers/admin/repo_groups.py:472 @@ -950,7 +950,7 @@ msgstr "" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "" #: kallithea/controllers/admin/user_groups.py:440 @@ -1798,7 +1798,7 @@ msgstr "" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "您無法編輯這個使用者，因為他是系統帳號" #: kallithea/model/user.py:255 @@ -2879,7 +2879,7 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4187,7 +4187,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4216,7 +4216,7 @@ #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff -r 42ce8e54bae5 -r b361974171ea kallithea/lib/helpers.py --- a/kallithea/lib/helpers.py Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/lib/helpers.py Fri Aug 14 17:21:26 2015 +0200 @@ -1125,7 +1125,7 @@ return literal(pref + '
'.join([safe_unicode(x.path) for x in nodes[:30]]) + suf) else: - return ': ' + _('No Files') + return ': ' + _('No files') def repo_link(groups_and_repos): diff -r 42ce8e54bae5 -r b361974171ea kallithea/model/db.py --- a/kallithea/model/db.py Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/model/db.py Fri Aug 14 17:21:26 2015 +0200 @@ -1664,29 +1664,29 @@ PERMS = [ ('hg.admin', _('Kallithea Administrator')), - ('repository.none', _('Default user has no access to new Repositories')), - ('repository.read', _('Default user has read access to new Repositories')), - ('repository.write', _('Default user has write access to new Repositories')), - ('repository.admin', _('Default user has admin access to new Repositories')), - - ('group.none', _('Default user has no access to new Repository Groups')), - ('group.read', _('Default user has read access to new Repository Groups')), - ('group.write', _('Default user has write access to new Repository Groups')), - ('group.admin', _('Default user has admin access to new Repository Groups')), - - ('usergroup.none', _('Default user has no access to new User Groups')), - ('usergroup.read', _('Default user has read access to new User Groups')), - ('usergroup.write', _('Default user has write access to new User Groups')), - ('usergroup.admin', _('Default user has admin access to new User Groups')), - - ('hg.repogroup.create.false', _('Only admins can create Repository Groups')), - ('hg.repogroup.create.true', _('Non-admins can create Repository Groups')), - - ('hg.usergroup.create.false', _('Only admins can create User Groups')), - ('hg.usergroup.create.true', _('Non-admins can create User Groups')), - - ('hg.create.none', _('Only admins can create top level Repositories')), - ('hg.create.repository', _('Non-admins can create top level Repositories')), + ('repository.none', _('Default user has no access to new repositories')), + ('repository.read', _('Default user has read access to new repositories')), + ('repository.write', _('Default user has write access to new repositories')), + ('repository.admin', _('Default user has admin access to new repositories')), + + ('group.none', _('Default user has no access to new repository groups')), + ('group.read', _('Default user has read access to new repository groups')), + ('group.write', _('Default user has write access to new repository groups')), + ('group.admin', _('Default user has admin access to new repository groups')), + + ('usergroup.none', _('Default user has no access to new user groups')), + ('usergroup.read', _('Default user has read access to new user groups')), + ('usergroup.write', _('Default user has write access to new user groups')), + ('usergroup.admin', _('Default user has admin access to new user groups')), + + ('hg.repogroup.create.false', _('Only admins can create repository groups')), + ('hg.repogroup.create.true', _('Non-admins can create repository groups')), + + ('hg.usergroup.create.false', _('Only admins can create user groups')), + ('hg.usergroup.create.true', _('Non-admins can create user groups')), + + ('hg.create.none', _('Only admins can create top level repositories')), + ('hg.create.repository', _('Non-admins can create top level repositories')), ('hg.create.write_on_repogroup.true', _('Repository creation enabled with write permission to a repository group')), ('hg.create.write_on_repogroup.false', _('Repository creation disabled with write permission to a repository group')), @@ -1695,8 +1695,8 @@ ('hg.fork.repository', _('Non-admins can can fork repositories')), ('hg.register.none', _('Registration disabled')), - ('hg.register.manual_activate', _('User Registration with manual account activation')), - ('hg.register.auto_activate', _('User Registration with automatic account activation')), + ('hg.register.manual_activate', _('User registration with manual account activation')), + ('hg.register.auto_activate', _('User registration with automatic account activation')), ('hg.extern_activate.manual', _('Manual activation of external account')), ('hg.extern_activate.auto', _('Automatic activation of external account')), @@ -2225,10 +2225,10 @@ STATUS_UNDER_REVIEW = 'under_review' STATUSES = [ - (STATUS_NOT_REVIEWED, _("Not Reviewed")), # (no icon) and default + (STATUS_NOT_REVIEWED, _("Not reviewed")), # (no icon) and default (STATUS_APPROVED, _("Approved")), (STATUS_REJECTED, _("Rejected")), - (STATUS_UNDER_REVIEW, _("Under Review")), + (STATUS_UNDER_REVIEW, _("Under review")), ] changeset_status_id = Column(Integer(), nullable=False, unique=True, primary_key=True) diff -r 42ce8e54bae5 -r b361974171ea kallithea/model/user.py --- a/kallithea/model/user.py Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/model/user.py Fri Aug 14 17:21:26 2015 +0200 @@ -205,7 +205,7 @@ user = self.get(user_id, cache=False) if user.username == User.DEFAULT_USER: raise DefaultUserException( - _("You can't Edit this user since it's " + _("You can't edit this user since it's " "crucial for entire application")) for k, v in form_data.items(): @@ -227,7 +227,7 @@ user = self._get_user(user) if user.username == User.DEFAULT_USER: raise DefaultUserException( - _("You can't Edit this user since it's" + _("You can't edit this user since it's" " crucial for entire application") ) diff -r 42ce8e54bae5 -r b361974171ea kallithea/templates/admin/settings/settings_visual.html --- a/kallithea/templates/admin/settings/settings_visual.html Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/templates/admin/settings/settings_visual.html Fri Aug 14 17:21:26 2015 +0200 @@ -89,7 +89,7 @@
- +
diff -r 42ce8e54bae5 -r b361974171ea kallithea/templates/admin/users/user_edit_advanced.html --- a/kallithea/templates/admin/users/user_edit_advanced.html Thu Aug 13 21:52:18 2015 +0200 +++ b/kallithea/templates/admin/users/user_edit_advanced.html Fri Aug 14 17:21:26 2015 +0200 @@ -7,7 +7,7 @@ (_('Source of Record'), c.user.extern_type, ''), (_('Created on'), h.fmt_date(c.user.created_on), ''), (_('Last Login'), c.user.last_login or '-', ''), - (_('Member of User groups'), len(c.user.group_member), ', '.join((x.users_group.users_group_name for x in c.user.group_member))), + (_('Member of User Groups'), len(c.user.group_member), ', '.join((x.users_group.users_group_name for x in c.user.group_member))), ] %> %for dt, dd, tt in elems: