kallithea Changeset - b361974171ea

Changeset - b361974171ea

Parent rev.

Child rev.

[Not reviewed]

default

0 22 0

Søren Løvborg - 10 years ago 2015-08-14 17:21:26
sorenl@unity3d.com

spelling: fix inappropriate use of title case

These are not titles or labels, and should not be title cased.

22 files changed with 136 insertions and 136 deletions:

kallithea/controllers/admin/repo_groups.py

kallithea/controllers/admin/user_groups.py

kallithea/i18n/be/LC_MESSAGES/kallithea.po

kallithea/i18n/cs/LC_MESSAGES/kallithea.po

kallithea/i18n/de/LC_MESSAGES/kallithea.po

kallithea/i18n/en/LC_MESSAGES/kallithea.mo

bin+mod

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

kallithea/i18n/hu/LC_MESSAGES/kallithea.po

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

kallithea/i18n/kallithea.pot

kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

kallithea/i18n/sk/LC_MESSAGES/kallithea.po

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

kallithea/lib/helpers.py

kallithea/model/db.py

kallithea/model/user.py

kallithea/templates/admin/settings/settings_visual.html

kallithea/templates/admin/users/user_edit_advanced.html

0 comments (0 inline, 0 general)

kallithea/controllers/admin/repo_groups.py

➞

Show inline comments

@@ @@ -408,25 +408,25 @@ class RepoGroupsController(BaseControlle @@
         recursive = form_result['recursive']
         # iterate over all members(if in recursive mode) of this groups and
         # set the permissions !
         # this can be potentially heavy operation
         RepoGroupModel()._update_permissions(c.repo_group,
                                              form_result['perms_new'],
                                              form_result['perms_updates'],
                                              recursive)
         #TODO: implement this
         #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')
     def delete_perms(self, group_name):
         """
         DELETE an existing repository group permission user
         :param group_name:
         """
         try:
             obj_type = request.POST.get('obj_type')
             obj_id = None

kallithea/controllers/admin/user_groups.py

➞

Show inline comments

@@ @@ -308,25 +308,25 @@ class UserGroupsController(BaseControlle @@
         # set the permissions !
         try:
             UserGroupModel()._update_permissions(user_group, form['perms_new'],
                                                  form['perms_updates'])
         except RepoGroupAssignmentError:
             h.flash(_('Target group cannot be the same'), category='error')
             return redirect(url('edit_user_group_perms', id=id))
         #TODO: implement this
         #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')
     def delete_perms(self, id):
         """
         DELETE an existing repository group permission user
         :param group_name:
         """
         try:
             obj_type = request.POST.get('obj_type')
             obj_id = None

kallithea/i18n/be/LC_MESSAGES/kallithea.po

➞

Show inline comments

 #: kallithea/controllers/admin/repo_groups.py:307
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr "Адбылася памылка пры выдаленні групы рэпазітароў %s"
 #: kallithea/controllers/admin/repo_groups.py:420
 #: kallithea/controllers/admin/repo_groups.py:455
 #: kallithea/controllers/admin/user_groups.py:340
 msgid "Cannot revoke permission for yourself as admin"
 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
 #: kallithea/controllers/admin/repos.py:430
 #: kallithea/controllers/admin/user_groups.py:352
 msgid "An error occurred during revoking of permission"
 msgstr "Адбылася памылка пры водгуку прывелеі"
 #: kallithea/controllers/admin/repos.py:163
 #, python-format
 msgid "Error creating repository %s"
 msgstr "Адбылася памылка пры стварэнні рэпазітара %s"
 msgid "Successfully deleted user group"
 msgstr "Група карыстачоў паспяхова выдалена"
 #: kallithea/controllers/admin/user_groups.py:247
 msgid "An error occurred during deletion of user group"
 msgstr "Адбылася памылка пры выдаленні групы карыстачоў"
 #: kallithea/controllers/admin/user_groups.py:314
 msgid "Target group cannot be the same"
 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
 #: kallithea/controllers/admin/users.py:396
 msgid "Updated permissions"
 msgstr "Абноўлены прывілеі"
 #: kallithea/controllers/admin/user_groups.py:444
 #: kallithea/controllers/admin/users.py:400
 msgid "An error occurred during permissions saving"
 msgstr "Адбылася памылка пры захаванні прывілеяў"
@@ @@ -1816,25 +1816,25 @@ msgstr "Зачынены" @@
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr "%(user)s просіць вас разгледзець pull request #%(pr_id)s: %(pr_title)s"
 #: kallithea/model/scm.py:808
 msgid "latest tip"
 msgstr "апошняя версія"
 #: kallithea/model/user.py:194
 msgid "New user registration"
 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
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 "Вы не можаце выдаліць карыстача, паколькі гэта крытычна для працы ўсяго "
 "прыкладання"
 #: kallithea/model/user.py:261
 #, python-format
@@ @@ -2917,25 +2917,25 @@ msgstr "Аватары адключаны" @@
 #: kallithea/templates/admin/my_account/my_account_profile.html:15
 msgid "Missing email, please update your user email address."
 msgstr "Не паказаны email. Калі ласка, абновіце ваш email."
 #: kallithea/templates/admin/my_account/my_account_profile.html:16
 #: kallithea/templates/admin/users/user_edit_profile.html:15
 msgid "current IP"
 msgstr "бягучы IP-адрас"
 #: 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 ""
 #: kallithea/templates/admin/my_account/my_account_repos.html:1
 msgid "Repositories You Own"
 msgstr "Рэпазітары, дзе Вы — уладальнік"
 #: kallithea/templates/admin/my_account/my_account_repos.html:59
 #: kallithea/templates/admin/my_account/my_account_watched.html:59
 #: kallithea/templates/base/root.html:46
 #: kallithea/templates/bookmarks/bookmarks.html:81
 #: kallithea/templates/branches/branches.html:81
@@ @@ -4217,25 +4217,25 @@ msgstr "Карыстальнік: %s" @@
 #: kallithea/templates/admin/users/user_edit_advanced.html:7
 #: kallithea/templates/admin/users/user_edit_profile.html:51
 msgid "Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:9
 #: kallithea/templates/admin/users/users.html:53
 msgid "Last Login"
 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
 #: kallithea/templates/data_table/_dt_elements.html:160
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "Пацвердзіце выдаленне карыстача %s"
 #: kallithea/templates/admin/users/user_edit_advanced.html:23
 msgid "Delete this user"
 msgstr "Выдаліць гэтага карыстальніка"
@@ @@ -4246,25 +4246,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_profile.html:8
 msgid "Change avatar at"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:12
 msgid "Missing email, please update this user email address."
 msgstr "Не паказаны email. Калі ласка, абнавіце email карыстальніка."
 #: 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 ""
 #: kallithea/templates/admin/users/user_edit_profile.html:60
 msgid "Name in Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr "Пацвердзіце новы пароль"
 #: kallithea/templates/admin/users/users.html:5

kallithea/i18n/cs/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -701,25 +701,25 @@ msgstr "" @@
 #: kallithea/controllers/admin/repo_groups.py:307
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:420
 #: kallithea/controllers/admin/repo_groups.py:455
 #: kallithea/controllers/admin/user_groups.py:340
 msgid "Cannot revoke permission for yourself as admin"
 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
 #: kallithea/controllers/admin/repos.py:430
 #: kallithea/controllers/admin/user_groups.py:352
 msgid "An error occurred during revoking of permission"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:163
 #, python-format
 msgid "Error creating repository %s"
 msgstr "Chyba při vytváření repozitáře %s"
@@ @@ -941,25 +941,25 @@ msgstr "" @@
 msgid "Successfully deleted user group"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:247
 msgid "An error occurred during deletion of user group"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:314
 msgid "Target group cannot be the same"
 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
 #: kallithea/controllers/admin/users.py:396
 msgid "Updated permissions"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:444
 #: kallithea/controllers/admin/users.py:400
 msgid "An error occurred during permissions saving"
 msgstr ""
@@ @@ -1800,25 +1800,25 @@ msgstr "" @@
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr ""
 #: kallithea/model/scm.py:808
 msgid "latest tip"
 msgstr ""
 #: kallithea/model/user.py:194
 msgid "New user registration"
 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
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 #: kallithea/model/user.py:261
 #, python-format
 msgid ""
 "User \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories: %s"
 msgstr ""
@@ @@ -2876,25 +2876,25 @@ msgstr "" @@
 #: kallithea/templates/admin/my_account/my_account_profile.html:15
 msgid "Missing email, please update your user email address."
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_profile.html:16
 #: kallithea/templates/admin/users/user_edit_profile.html:15
 msgid "current IP"
 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 "
+"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
 #, fuzzy
 msgid "Repositories You Own"
 msgstr "Umístění repozitářů"
 #: kallithea/templates/admin/my_account/my_account_repos.html:59
 #: kallithea/templates/admin/my_account/my_account_watched.html:59
 #: kallithea/templates/base/root.html:46
 #: kallithea/templates/bookmarks/bookmarks.html:81
@@ @@ -4168,25 +4168,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_advanced.html:7
 #: kallithea/templates/admin/users/user_edit_profile.html:51
 msgid "Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:9
 #: kallithea/templates/admin/users/users.html:53
 msgid "Last Login"
 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
 #: kallithea/templates/data_table/_dt_elements.html:160
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:23
 msgid "Delete this user"
 msgstr ""
@@ @@ -4197,25 +4197,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_profile.html:8
 msgid "Change avatar at"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:12
 msgid "Missing email, please update this user email address."
 msgstr ""
 #: 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 ""
 #: kallithea/templates/admin/users/user_edit_profile.html:60
 msgid "Name in Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr ""
 #: kallithea/templates/admin/users/users.html:5

kallithea/i18n/de/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -716,25 +716,25 @@ msgstr "Repositoriumsgruppe %s entfernt" @@
 #: kallithea/controllers/admin/repo_groups.py:307
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr "Fehler beim Löschen der Repositoriumsgruppe %s"
 #: kallithea/controllers/admin/repo_groups.py:420
 #: kallithea/controllers/admin/repo_groups.py:455
 #: kallithea/controllers/admin/user_groups.py:340
 msgid "Cannot revoke permission for yourself as admin"
 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
 #: kallithea/controllers/admin/repos.py:430
 #: kallithea/controllers/admin/user_groups.py:352
 msgid "An error occurred during revoking of permission"
 msgstr "Fehler beim Entzug der Berechtigungen"
 #: kallithea/controllers/admin/repos.py:163
 #, python-format
 msgid "Error creating repository %s"
 msgstr "Fehler beim Erstellen des Repositoriums %s"
 msgid "Successfully deleted user group"
 msgstr "Die Nutzergruppe wurde erfolgreich entfernt"
 #: kallithea/controllers/admin/user_groups.py:247
 msgid "An error occurred during deletion of user group"
 msgstr "Während des Löschens der Benutzergruppe ist ein Fehler aufgetreten"
 #: kallithea/controllers/admin/user_groups.py:314
 msgid "Target group cannot be the same"
 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
 #: kallithea/controllers/admin/users.py:396
 msgid "Updated permissions"
 msgstr "Berechtigungen wurden aktualisiert"
 #: kallithea/controllers/admin/user_groups.py:444
 #: kallithea/controllers/admin/users.py:400
 msgid "An error occurred during permissions saving"
 msgstr "Es ist ein Fehler während des Speicherns der Berechtigungen aufgetreten"
@@ @@ -1834,25 +1834,25 @@ msgstr "Schließen" @@
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr "%(user)s möchte ein Review des Pull Request #%(pr_id)s: %(pr_title)s"
 #: kallithea/model/scm.py:808
 msgid "latest tip"
 msgstr "Letzter Tip"
 #: kallithea/model/user.py:194
 msgid "New user registration"
 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"
 #: kallithea/model/user.py:255
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 "Sie können diesen Benutzer nicht löschen, da er von entscheidender Bedeutung "
 "für die gesamte Applikation ist"
 #: kallithea/model/user.py:261
 #, python-format
@@ @@ -2952,25 +2952,25 @@ msgstr "Avatare sind deaktiviert" @@
 #: kallithea/templates/admin/my_account/my_account_profile.html:15
 msgid "Missing email, please update your user email address."
 msgstr "E-Mailadresse fehlt, bitte aktualisieren."
 #: kallithea/templates/admin/my_account/my_account_profile.html:16
 #: kallithea/templates/admin/users/user_edit_profile.html:15
 msgid "current IP"
 msgstr "Aktuelle IP-Adresse"
 #: 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 ""
 #: kallithea/templates/admin/my_account/my_account_repos.html:1
 msgid "Repositories You Own"
 msgstr "Repositories in Ihrem Besitz"
 #: kallithea/templates/admin/my_account/my_account_repos.html:59
 #: kallithea/templates/admin/my_account/my_account_watched.html:59
 #: kallithea/templates/base/root.html:46
 #: kallithea/templates/bookmarks/bookmarks.html:81
 #: kallithea/templates/branches/branches.html:81
@@ @@ -4250,25 +4250,25 @@ msgstr "Benutzer: %s" @@
 #: kallithea/templates/admin/users/user_edit_advanced.html:7
 #: kallithea/templates/admin/users/user_edit_profile.html:51
 msgid "Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:9
 #: kallithea/templates/admin/users/users.html:53
 msgid "Last Login"
 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
 #: kallithea/templates/data_table/_dt_elements.html:160
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:23
 msgid "Delete this user"
 msgstr "Diesen Benutzer löschen"
@@ @@ -4279,25 +4279,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_profile.html:8
 msgid "Change avatar at"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:12
 msgid "Missing email, please update this user email address."
 msgstr ""
 #: 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 ""
 #: kallithea/templates/admin/users/user_edit_profile.html:60
 msgid "Name in Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr ""
 #: kallithea/templates/admin/users/users.html:5

kallithea/i18n/en/LC_MESSAGES/kallithea.mo

➞

Show inline comments

binary diff not shown

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -727,25 +727,25 @@ msgstr "Groupe de dépôts %s supprimé" @@
 #: kallithea/controllers/admin/repo_groups.py:307
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr "Une erreur est survenue durant la suppression du groupe de dépôts %s"
 #: kallithea/controllers/admin/repo_groups.py:420
 #: kallithea/controllers/admin/repo_groups.py:455
 #: kallithea/controllers/admin/user_groups.py:340
 msgid "Cannot revoke permission for yourself as admin"
 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
 #: kallithea/controllers/admin/repos.py:430
 #: kallithea/controllers/admin/user_groups.py:352
 msgid "An error occurred during revoking of permission"
 msgstr "Une erreur est survenue durant la révocation de la permission"
 #: kallithea/controllers/admin/repos.py:163
 #, python-format
 msgid "Error creating repository %s"
 msgstr "Erreur de création du dépôt %s"
 msgid "Successfully deleted user group"
 msgstr "Groupe d'utilisateurs supprimé avec succès"
 #: kallithea/controllers/admin/user_groups.py:247
 msgid "An error occurred during deletion of user group"
 msgstr "Une erreur est survenue durant la suppression du groupe d'utilisateurs"
 #: kallithea/controllers/admin/user_groups.py:314
 msgid "Target group cannot be the same"
 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
 #: kallithea/controllers/admin/users.py:396
 msgid "Updated permissions"
 msgstr "Permissions mises à jour"
 #: kallithea/controllers/admin/user_groups.py:444
 #: kallithea/controllers/admin/users.py:400
 msgid "An error occurred during permissions saving"
 msgstr "Une erreur est survenue durant l’enregistrement des permissions"
@@ @@ -1839,25 +1839,25 @@ msgstr "" @@
 "%(user)s veut que vous regardiez la demande de pull #%(pr_id)s : "
 "%(pr_title)s"
 #: kallithea/model/scm.py:808
 msgid "latest tip"
 msgstr "Dernier sommet"
 #: kallithea/model/user.py:194
 msgid "New user registration"
 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"
 #: kallithea/model/user.py:255
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 "Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le "
 "bon fonctionnement de l’application"
 #: kallithea/model/user.py:261
 #, python-format
@@ @@ -2948,25 +2948,25 @@ msgstr "Les avatars sont désactivés" @@
 #: kallithea/templates/admin/my_account/my_account_profile.html:15
 msgid "Missing email, please update your user email address."
 msgstr "Adresse courriel manquante, veuillez mettre à jour votre adresse courriel."
 #: kallithea/templates/admin/my_account/my_account_profile.html:16
 #: kallithea/templates/admin/users/user_edit_profile.html:15
 msgid "current IP"
 msgstr "adresse IP actuelle"
 #: 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 ""
 #: kallithea/templates/admin/my_account/my_account_repos.html:1
 msgid "Repositories You Own"
 msgstr "Dépôts dont vous êtes le propriétaire"
 #: kallithea/templates/admin/my_account/my_account_repos.html:59
 #: kallithea/templates/admin/my_account/my_account_watched.html:59
 #: kallithea/templates/base/root.html:46
 #: kallithea/templates/bookmarks/bookmarks.html:81
 #: kallithea/templates/branches/branches.html:81
@@ @@ -4296,25 +4296,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_advanced.html:7
 #: kallithea/templates/admin/users/user_edit_profile.html:51
 msgid "Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:9
 #: kallithea/templates/admin/users/users.html:53
 msgid "Last Login"
 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
 #: kallithea/templates/data_table/_dt_elements.html:160
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?"
 #: kallithea/templates/admin/users/user_edit_advanced.html:23
 msgid "Delete this user"
 msgstr ""
@@ @@ -4325,25 +4325,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_profile.html:8
 msgid "Change avatar at"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:12
 msgid "Missing email, please update this user email address."
 msgstr ""
 #: 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 ""
 #: kallithea/templates/admin/users/user_edit_profile.html:60
 msgid "Name in Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr "Confirmation du nouveau mot de passe"
 #: kallithea/templates/admin/users/users.html:5

kallithea/i18n/hu/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -700,25 +700,25 @@ msgstr "" @@
 #: kallithea/controllers/admin/repo_groups.py:307
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:420
 #: kallithea/controllers/admin/repo_groups.py:455
 #: kallithea/controllers/admin/user_groups.py:340
 msgid "Cannot revoke permission for yourself as admin"
 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
 #: kallithea/controllers/admin/repos.py:430
 #: kallithea/controllers/admin/user_groups.py:352
 msgid "An error occurred during revoking of permission"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:163
 #, python-format
 msgid "Error creating repository %s"
 msgstr ""
@@ @@ -940,25 +940,25 @@ msgstr "" @@
 msgid "Successfully deleted user group"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:247
 msgid "An error occurred during deletion of user group"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:314
 msgid "Target group cannot be the same"
 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
 #: kallithea/controllers/admin/users.py:396
 msgid "Updated permissions"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:444
 #: kallithea/controllers/admin/users.py:400
 msgid "An error occurred during permissions saving"
 msgstr ""
@@ @@ -1793,25 +1793,25 @@ msgstr "" @@
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr ""
 #: kallithea/model/scm.py:808
 msgid "latest tip"
 msgstr ""
 #: kallithea/model/user.py:194
 msgid "New user registration"
 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
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 #: kallithea/model/user.py:261
 #, python-format
 msgid ""
 "User \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories: %s"
 msgstr ""
@@ @@ -2867,25 +2867,25 @@ msgstr "" @@
 #: kallithea/templates/admin/my_account/my_account_profile.html:15
 msgid "Missing email, please update your user email address."
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_profile.html:16
 #: kallithea/templates/admin/users/user_edit_profile.html:15
 msgid "current IP"
 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 "
+"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
 msgid "Repositories You Own"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_repos.html:59
 #: kallithea/templates/admin/my_account/my_account_watched.html:59
 #: kallithea/templates/base/root.html:46
 #: kallithea/templates/bookmarks/bookmarks.html:81
 #: kallithea/templates/branches/branches.html:81
@@ @@ -4147,25 +4147,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_advanced.html:7
 #: kallithea/templates/admin/users/user_edit_profile.html:51
 msgid "Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:9
 #: kallithea/templates/admin/users/users.html:53
 msgid "Last Login"
 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
 #: kallithea/templates/data_table/_dt_elements.html:160
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:23
 msgid "Delete this user"
 msgstr ""
@@ @@ -4176,25 +4176,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_profile.html:8
 msgid "Change avatar at"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:12
 msgid "Missing email, please update this user email address."
 msgstr ""
 #: 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 ""
 #: kallithea/templates/admin/users/user_edit_profile.html:60
 msgid "Name in Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr ""
 #: kallithea/templates/admin/users/users.html:5

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

➞

Show inline comments

 #: kallithea/controllers/admin/repo_groups.py:307
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr "リポジトリグループ %s の削除中にエラーが発生しました"
 #: kallithea/controllers/admin/repo_groups.py:420
 #: kallithea/controllers/admin/repo_groups.py:455
 #: kallithea/controllers/admin/user_groups.py:340
 msgid "Cannot revoke permission for yourself as admin"
 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
 #: kallithea/controllers/admin/repos.py:430
 #: kallithea/controllers/admin/user_groups.py:352
 msgid "An error occurred during revoking of permission"
 msgstr "権限の取消中にエラーが発生しました"
 #: kallithea/controllers/admin/repos.py:163
 #, python-format
 msgid "Error creating repository %s"
 msgstr "リポジトリ %s の作成中にエラーが発生しました"
 msgid "Successfully deleted user group"
 msgstr "ユーザーグループの削除に成功しました"
 #: kallithea/controllers/admin/user_groups.py:247
 msgid "An error occurred during deletion of user group"
 msgstr "ユーザーグループの削除中にエラーが発生しました"
 #: kallithea/controllers/admin/user_groups.py:314
 msgid "Target group cannot be the same"
 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
 #: kallithea/controllers/admin/users.py:396
 msgid "Updated permissions"
 msgstr "権限を更新しました"
 #: kallithea/controllers/admin/user_groups.py:444
 #: kallithea/controllers/admin/users.py:400
 msgid "An error occurred during permissions saving"
 msgstr "権限の保存時にエラーが発生しました"
@@ @@ -1802,25 +1802,25 @@ msgstr "メールアドレス:" @@
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr "%(user)s がプリリクエスト #%(pr_id)s: %(pr_title)s のレビューを求めています"
 #: kallithea/model/scm.py:808
 msgid "latest tip"
 msgstr "最新のtip"
 #: kallithea/model/user.py:194
 msgid "New user registration"
 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
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr "このユーザーを削除できません。このユーザーはアプリケーションにとって必要不可欠です。"
 #: kallithea/model/user.py:261
 #, fuzzy, python-format
 msgid ""
 "User \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories: %s"
 msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください。 %s"
@@ @@ -2891,27 +2891,27 @@ msgstr "アバターは無効です" @@
 #: kallithea/templates/admin/my_account/my_account_profile.html:15
 msgid "Missing email, please update your user email address."
 msgstr "メールアドレスがありません。更新してください。"
 #: kallithea/templates/admin/my_account/my_account_profile.html:16
 #: kallithea/templates/admin/users/user_edit_profile.html:15
 msgid "current IP"
 msgstr "現在の IP"
 #: 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
 msgid "Repositories You Own"
 msgstr "あなたが所有者のリポジトリ"
 #: kallithea/templates/admin/my_account/my_account_repos.html:59
 #: kallithea/templates/admin/my_account/my_account_watched.html:59
 #: kallithea/templates/base/root.html:46
 #: kallithea/templates/bookmarks/bookmarks.html:81
 #: kallithea/templates/branches/branches.html:81
 #: kallithea/templates/journal/journal.html:200
@@ @@ -4262,25 +4262,25 @@ msgstr "ユーザー: %s" @@
 #: kallithea/templates/admin/users/user_edit_advanced.html:7
 #: kallithea/templates/admin/users/user_edit_profile.html:51
 msgid "Source of Record"
 msgstr "アカウントのソース"
 #: kallithea/templates/admin/users/user_edit_advanced.html:9
 #: kallithea/templates/admin/users/users.html:53
 msgid "Last Login"
 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
 #: kallithea/templates/data_table/_dt_elements.html:160
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "このユーザーを削除してもよろしいですか？ : %s"
 #: kallithea/templates/admin/users/user_edit_advanced.html:23
 msgid "Delete this user"
 msgstr "このユーザーを削除"
@@ @@ -4291,27 +4291,27 @@ msgstr "%s から継承" @@
 #: kallithea/templates/admin/users/user_edit_profile.html:8
 msgid "Change avatar at"
 msgstr "アバターを変更:"
 #: kallithea/templates/admin/users/user_edit_profile.html:12
 msgid "Missing email, please update this user email address."
 msgstr "メールアドレスがありません。このユーザーのメールアドレスを更新してください。"
 #: 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"
 msgstr "アカウントのソースでの名前"
 #: kallithea/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr "新しいパスワード 再入力"
 #: kallithea/templates/admin/users/users.html:5
 #, fuzzy
 msgid "Users Administration"

kallithea/i18n/kallithea.pot

➞

Show inline comments

@@ @@ -719,25 +719,25 @@ msgstr "" @@
 #: kallithea/controllers/admin/repo_groups.py:307
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:420
 #: kallithea/controllers/admin/repo_groups.py:455
 #: kallithea/controllers/admin/user_groups.py:340
 msgid "Cannot revoke permission for yourself as admin"
 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
 #: kallithea/controllers/admin/repos.py:429
 #: kallithea/controllers/admin/user_groups.py:352
 msgid "An error occurred during revoking of permission"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:162
 #, python-format
 msgid "Error creating repository %s"
 msgstr ""
@@ @@ -953,25 +953,25 @@ msgstr "" @@
 msgid "Successfully deleted user group"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:247
 msgid "An error occurred during deletion of user group"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:314
 msgid "Target group cannot be the same"
 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
 #: kallithea/controllers/admin/users.py:386
 msgid "Updated permissions"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:444
 #: kallithea/controllers/admin/users.py:390
 msgid "An error occurred during permissions saving"
 msgstr ""
@@ @@ -1709,93 +1709,93 @@ msgstr "" @@
 msgid "on line %s"
 msgstr ""
 #: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169
 msgid "[Mention]"
 msgstr ""
 #: kallithea/model/db.py:1517
 msgid "Top level"
 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
 msgid "Only admins can create Repository Groups"
 msgstr ""
 #: kallithea/model/db.py:1684
 msgid "Non-admins can create Repository Groups"
 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
 msgid "Only admins can fork repositories"
 msgstr ""
 #: kallithea/model/db.py:1696
 msgid "Non-admins can can fork repositories"
 msgstr ""
 #: kallithea/model/forms.py:57
 msgid "Please enter a login"
@@ @@ -1908,25 +1908,25 @@ msgstr "" @@
 msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s"
 msgstr ""
 #: kallithea/model/scm.py:808
 msgid "latest tip"
 msgstr ""
 #: kallithea/model/user.py:194
 msgid "New user registration"
 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
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 #: kallithea/model/user.py:263
 #, python-format
 msgid "User \"%s\" still owns %s repositories and cannot be removed. Switch owners or remove those repositories: %s"
 msgstr ""
 #: kallithea/model/user.py:268
@@ @@ -2956,25 +2956,25 @@ msgid "Avatars are disabled" @@
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_profile.html:15
 msgid "Missing email, please update your user email address."
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_profile.html:16
 #: kallithea/templates/admin/users/user_edit_profile.html:15
 msgid "Current IP"
 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
 msgid "Repositories You Own"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_repos.html:59
 #: kallithea/templates/admin/my_account/my_account_watched.html:59
 #: kallithea/templates/base/root.html:46
 #: kallithea/templates/bookmarks/bookmarks.html:81
 #: kallithea/templates/branches/branches.html:81
 #: kallithea/templates/journal/journal.html:200
@@ @@ -4126,25 +4126,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_advanced.html:7
 #: kallithea/templates/admin/users/user_edit_profile.html:51
 msgid "Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:9
 #: kallithea/templates/admin/users/users.html:53
 msgid "Last Login"
 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
 #: kallithea/templates/data_table/_dt_elements.html:158
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:23
 msgid "Delete this user"
 msgstr ""
@@ @@ -4154,25 +4154,25 @@ msgid "Inherited from %s" @@
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:8
 msgid "Change avatar at"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:12
 msgid "Missing email, please update this user email address."
 msgstr ""
 #: 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
 msgid "Name in Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr ""
 #: kallithea/templates/admin/users/users.html:5
 msgid "Users Administration"

kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -703,25 +703,25 @@ msgstr "" @@
 #: kallithea/controllers/admin/repo_groups.py:307
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:420
 #: kallithea/controllers/admin/repo_groups.py:455
 #: kallithea/controllers/admin/user_groups.py:340
 msgid "Cannot revoke permission for yourself as admin"
 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
 #: kallithea/controllers/admin/repos.py:430
 #: kallithea/controllers/admin/user_groups.py:352
 msgid "An error occurred during revoking of permission"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:163
 #, python-format
 msgid "Error creating repository %s"
 msgstr ""
@@ @@ -943,25 +943,25 @@ msgstr "" @@
 msgid "Successfully deleted user group"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:247
 msgid "An error occurred during deletion of user group"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:314
 msgid "Target group cannot be the same"
 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
 #: kallithea/controllers/admin/users.py:396
 msgid "Updated permissions"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:444
 #: kallithea/controllers/admin/users.py:400
 msgid "An error occurred during permissions saving"
 msgstr ""
@@ @@ -1796,25 +1796,25 @@ msgstr "" @@
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr ""
 #: kallithea/model/scm.py:808
 msgid "latest tip"
 msgstr ""
 #: kallithea/model/user.py:194
 msgid "New user registration"
 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
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 #: kallithea/model/user.py:261
 #, python-format
 msgid ""
 "User \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories: %s"
 msgstr ""
@@ @@ -2870,25 +2870,25 @@ msgstr "" @@
 #: kallithea/templates/admin/my_account/my_account_profile.html:15
 msgid "Missing email, please update your user email address."
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_profile.html:16
 #: kallithea/templates/admin/users/user_edit_profile.html:15
 msgid "current IP"
 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 "
+"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
 msgid "Repositories You Own"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_repos.html:59
 #: kallithea/templates/admin/my_account/my_account_watched.html:59
 #: kallithea/templates/base/root.html:46
 #: kallithea/templates/bookmarks/bookmarks.html:81
 #: kallithea/templates/branches/branches.html:81
@@ @@ -4152,25 +4152,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_advanced.html:7
 #: kallithea/templates/admin/users/user_edit_profile.html:51
 msgid "Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:9
 #: kallithea/templates/admin/users/users.html:53
 msgid "Last Login"
 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
 #: kallithea/templates/data_table/_dt_elements.html:160
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:23
 msgid "Delete this user"
 msgstr ""
@@ @@ -4181,25 +4181,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_profile.html:8
 msgid "Change avatar at"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:12
 msgid "Missing email, please update this user email address."
 msgstr ""
 #: 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 ""
 #: kallithea/templates/admin/users/user_edit_profile.html:60
 msgid "Name in Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr ""
 #: kallithea/templates/admin/users/users.html:5

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -715,25 +715,25 @@ msgstr "Usunięto grupę repo %s" @@
 #: kallithea/controllers/admin/repo_groups.py:307
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr "Wystąpił błąd podczas usuwania z repozytorium grupy %s"
 #: kallithea/controllers/admin/repo_groups.py:420
 #: kallithea/controllers/admin/repo_groups.py:455
 #: kallithea/controllers/admin/user_groups.py:340
 msgid "Cannot revoke permission for yourself as admin"
 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
 #: kallithea/controllers/admin/repos.py:430
 #: kallithea/controllers/admin/user_groups.py:352
 msgid "An error occurred during revoking of permission"
 msgstr "Wystąpił błąd podczas cofania zezwolenia"
 #: kallithea/controllers/admin/repos.py:163
 #, python-format
 msgid "Error creating repository %s"
 msgstr "utworzone repozytorium %s"
 msgid "Successfully deleted user group"
 msgstr "Grupa użytkowników została usunięta z powodzeniem"
 #: kallithea/controllers/admin/user_groups.py:247
 msgid "An error occurred during deletion of user group"
 msgstr "Wystąpił błąd podczas usuwania grupy użytkowników"
 #: kallithea/controllers/admin/user_groups.py:314
 msgid "Target group cannot be the same"
 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
 #: kallithea/controllers/admin/users.py:396
 msgid "Updated permissions"
 msgstr "Aktualizacja uprawnień"
 #: kallithea/controllers/admin/user_groups.py:444
 #: kallithea/controllers/admin/users.py:400
 msgid "An error occurred during permissions saving"
 msgstr "Wystąpił błąd podczas zapisywania uprawnień"
@@ @@ -1822,25 +1822,25 @@ msgstr "Używa:" @@
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s: %(pr_title)s"
 #: kallithea/model/scm.py:808
 msgid "latest tip"
 msgstr "ostatni tip"
 #: kallithea/model/user.py:194
 msgid "New user registration"
 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"
 #: kallithea/model/user.py:255
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 "Nie możesz usunąć tego użytkownika ponieważ jest kluczowy dla całej "
 "aplikacji"
 #: kallithea/model/user.py:261
 #, fuzzy, python-format
@@ @@ -2929,25 +2929,25 @@ msgstr "Avatary są wyłączone" @@
 #: kallithea/templates/admin/my_account/my_account_profile.html:15
 msgid "Missing email, please update your user email address."
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_profile.html:16
 #: kallithea/templates/admin/users/user_edit_profile.html:15
 msgid "current IP"
 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 "
+"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
 #, fuzzy
 msgid "Repositories You Own"
 msgstr "Nie znaleziono repozytorium."
 #: kallithea/templates/admin/my_account/my_account_repos.html:59
 #: kallithea/templates/admin/my_account/my_account_watched.html:59
 #: kallithea/templates/base/root.html:46
 #: kallithea/templates/bookmarks/bookmarks.html:81
@@ @@ -4276,25 +4276,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_advanced.html:7
 #: kallithea/templates/admin/users/user_edit_profile.html:51
 msgid "Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:9
 #: kallithea/templates/admin/users/users.html:53
 msgid "Last Login"
 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
 #: kallithea/templates/data_table/_dt_elements.html:160
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "Potwierdź usunięcie tego użytkownika: %s"
 #: kallithea/templates/admin/users/user_edit_advanced.html:23
 msgid "Delete this user"
 msgstr ""
@@ @@ -4305,25 +4305,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_profile.html:8
 msgid "Change avatar at"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:12
 msgid "Missing email, please update this user email address."
 msgstr ""
 #: 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 ""
 #: kallithea/templates/admin/users/user_edit_profile.html:60
 msgid "Name in Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr "Potwierdzenie nowego hasła"
 #: kallithea/templates/admin/users/users.html:5

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -713,25 +713,25 @@ msgstr "Grupo de repositórios %s excluído" @@
 #: kallithea/controllers/admin/repo_groups.py:307
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr "Ocorreu um erro durante a exclusão do grupo de repositórios %s"
 #: kallithea/controllers/admin/repo_groups.py:420
 #: kallithea/controllers/admin/repo_groups.py:455
 #: kallithea/controllers/admin/user_groups.py:340
 msgid "Cannot revoke permission for yourself as admin"
 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
 #: kallithea/controllers/admin/repos.py:430
 #: kallithea/controllers/admin/user_groups.py:352
 msgid "An error occurred during revoking of permission"
 msgstr "Ocorreu um erro durante a revocação das permissões"
 #: kallithea/controllers/admin/repos.py:163
 #, python-format
 msgid "Error creating repository %s"
 msgstr "Erro ao criar repositório %s"
 msgid "Successfully deleted user group"
 msgstr "Grupo de usuários excluído com sucesso"
 #: kallithea/controllers/admin/user_groups.py:247
 msgid "An error occurred during deletion of user group"
 msgstr "Ocorreu um erro durante a exclusão do grupo de usuários"
 #: kallithea/controllers/admin/user_groups.py:314
 msgid "Target group cannot be the same"
 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
 #: kallithea/controllers/admin/users.py:396
 msgid "Updated permissions"
 msgstr "Permissões atualizadas"
 #: kallithea/controllers/admin/user_groups.py:444
 #: kallithea/controllers/admin/users.py:400
 msgid "An error occurred during permissions saving"
 msgstr "Ocorreu um erro durante o salvamento das permissões"
@@ @@ -1812,25 +1812,25 @@ msgstr "Usando" @@
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr "%(user)s solicita sua revisão no pull request $%(pr_id)s: %(pr_title)s"
 #: kallithea/model/scm.py:808
 msgid "latest tip"
 msgstr "tip mais recente"
 #: kallithea/model/user.py:194
 msgid "New user registration"
 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"
 #: kallithea/model/user.py:255
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 "Você não pode remover esse usuário, pois ele é crucial para toda a "
 "aplicação"
 #: kallithea/model/user.py:261
 #, fuzzy, python-format
@@ @@ -2919,25 +2919,25 @@ msgstr "" @@
 #: kallithea/templates/admin/my_account/my_account_profile.html:15
 msgid "Missing email, please update your user email address."
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_profile.html:16
 #: kallithea/templates/admin/users/user_edit_profile.html:15
 msgid "current IP"
 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 "
+"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
 #, fuzzy
 msgid "Repositories You Own"
 msgstr "Nenhum repositório encontrado."
 #: kallithea/templates/admin/my_account/my_account_repos.html:59
 #: kallithea/templates/admin/my_account/my_account_watched.html:59
 #: kallithea/templates/base/root.html:46
 #: kallithea/templates/bookmarks/bookmarks.html:81
@@ @@ -4266,25 +4266,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_advanced.html:7
 #: kallithea/templates/admin/users/user_edit_profile.html:51
 msgid "Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:9
 #: kallithea/templates/admin/users/users.html:53
 msgid "Last Login"
 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
 #: kallithea/templates/data_table/_dt_elements.html:160
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "Confirma excluir este usuário: %s"
 #: kallithea/templates/admin/users/user_edit_advanced.html:23
 msgid "Delete this user"
 msgstr ""
@@ @@ -4295,25 +4295,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_profile.html:8
 msgid "Change avatar at"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:12
 msgid "Missing email, please update this user email address."
 msgstr ""
 #: 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 ""
 #: kallithea/templates/admin/users/user_edit_profile.html:60
 msgid "Name in Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr "Confirmação de nova senha"
 #: kallithea/templates/admin/users/users.html:5

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

➞

Show inline comments

 #: kallithea/controllers/admin/repo_groups.py:307
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr "Произошла ошибка при удалении группы репозиториев %s"
 #: kallithea/controllers/admin/repo_groups.py:420
 #: kallithea/controllers/admin/repo_groups.py:455
 #: kallithea/controllers/admin/user_groups.py:340
 msgid "Cannot revoke permission for yourself as admin"
 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
 #: kallithea/controllers/admin/repos.py:430
 #: kallithea/controllers/admin/user_groups.py:352
 msgid "An error occurred during revoking of permission"
 msgstr "Произошла ошибка при отзыве привелегии"
 #: kallithea/controllers/admin/repos.py:163
 #, python-format
 msgid "Error creating repository %s"
 msgstr "Произошла ошибка при создании репозитория %s"
 msgid "Successfully deleted user group"
 msgstr "Группа пользователей успешно удалена"
 #: kallithea/controllers/admin/user_groups.py:247
 msgid "An error occurred during deletion of user group"
 msgstr "Произошла ошибка при удалении группы пользователей"
 #: kallithea/controllers/admin/user_groups.py:314
 msgid "Target group cannot be the same"
 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
 #: kallithea/controllers/admin/users.py:396
 msgid "Updated permissions"
 msgstr "Обновлены привилегии"
 #: kallithea/controllers/admin/user_groups.py:444
 #: kallithea/controllers/admin/users.py:400
 msgid "An error occurred during permissions saving"
 msgstr "Произошла ошибка при сохранении привилегий"
@@ @@ -1828,25 +1828,25 @@ msgstr "Закрыт" @@
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr "%(user)s просит вас рассмотреть pull request #%(pr_id)s: %(pr_title)s"
 #: kallithea/model/scm.py:808
 msgid "latest tip"
 msgstr "последняя версия"
 #: kallithea/model/user.py:194
 msgid "New user registration"
 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
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 "Вы не можете удалить пользователя, поскольку это критично для работы "
 "всего приложения"
 #: kallithea/model/user.py:261
 #, python-format
@@ @@ -2930,25 +2930,25 @@ msgstr "Аватары отключены" @@
 #: kallithea/templates/admin/my_account/my_account_profile.html:15
 msgid "Missing email, please update your user email address."
 msgstr "Не указан email. Пожалуйста, обновите ваш email."
 #: kallithea/templates/admin/my_account/my_account_profile.html:16
 #: kallithea/templates/admin/users/user_edit_profile.html:15
 msgid "current IP"
 msgstr "текущий IP-адрес"
 #: 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 ""
 #: kallithea/templates/admin/my_account/my_account_repos.html:1
 msgid "Repositories You Own"
 msgstr "Репозитории, где Вы — владелец"
 #: kallithea/templates/admin/my_account/my_account_repos.html:59
 #: kallithea/templates/admin/my_account/my_account_watched.html:59
 #: kallithea/templates/base/root.html:46
 #: kallithea/templates/bookmarks/bookmarks.html:81
 #: kallithea/templates/branches/branches.html:81
@@ @@ -4229,25 +4229,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_advanced.html:7
 #: kallithea/templates/admin/users/user_edit_profile.html:51
 msgid "Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:9
 #: kallithea/templates/admin/users/users.html:53
 msgid "Last Login"
 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
 #: kallithea/templates/data_table/_dt_elements.html:160
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "Подтвердите удаление пользователя %s"
 #: kallithea/templates/admin/users/user_edit_advanced.html:23
 msgid "Delete this user"
 msgstr ""
@@ @@ -4258,25 +4258,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_profile.html:8
 msgid "Change avatar at"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:12
 msgid "Missing email, please update this user email address."
 msgstr ""
 #: 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 ""
 #: kallithea/templates/admin/users/user_edit_profile.html:60
 msgid "Name in Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr "Подтвердите новый пароль"
 #: kallithea/templates/admin/users/users.html:5

kallithea/i18n/sk/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -700,25 +700,25 @@ msgstr "" @@
 #: kallithea/controllers/admin/repo_groups.py:307
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:420
 #: kallithea/controllers/admin/repo_groups.py:455
 #: kallithea/controllers/admin/user_groups.py:340
 msgid "Cannot revoke permission for yourself as admin"
 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
 #: kallithea/controllers/admin/repos.py:430
 #: kallithea/controllers/admin/user_groups.py:352
 msgid "An error occurred during revoking of permission"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:163
 #, python-format
 msgid "Error creating repository %s"
 msgstr ""
@@ @@ -940,25 +940,25 @@ msgstr "" @@
 msgid "Successfully deleted user group"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:247
 msgid "An error occurred during deletion of user group"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:314
 msgid "Target group cannot be the same"
 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
 #: kallithea/controllers/admin/users.py:396
 msgid "Updated permissions"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:444
 #: kallithea/controllers/admin/users.py:400
 msgid "An error occurred during permissions saving"
 msgstr ""
@@ @@ -1799,25 +1799,25 @@ msgstr "" @@
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr ""
 #: kallithea/model/scm.py:808
 msgid "latest tip"
 msgstr ""
 #: kallithea/model/user.py:194
 msgid "New user registration"
 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
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 #: kallithea/model/user.py:261
 #, python-format
 msgid ""
 "User \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories: %s"
 msgstr ""
@@ @@ -2875,25 +2875,25 @@ msgstr "" @@
 #: kallithea/templates/admin/my_account/my_account_profile.html:15
 msgid "Missing email, please update your user email address."
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_profile.html:16
 #: kallithea/templates/admin/users/user_edit_profile.html:15
 msgid "current IP"
 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 "
+"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
 msgid "Repositories You Own"
 msgstr "Vaše repozitáre"
 #: kallithea/templates/admin/my_account/my_account_repos.html:59
 #: kallithea/templates/admin/my_account/my_account_watched.html:59
 #: kallithea/templates/base/root.html:46
 #: kallithea/templates/bookmarks/bookmarks.html:81
 #: kallithea/templates/branches/branches.html:81
@@ @@ -4159,25 +4159,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_advanced.html:7
 #: kallithea/templates/admin/users/user_edit_profile.html:51
 msgid "Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:9
 #: kallithea/templates/admin/users/users.html:53
 msgid "Last Login"
 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
 #: kallithea/templates/data_table/_dt_elements.html:160
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:23
 msgid "Delete this user"
 msgstr ""
@@ @@ -4188,25 +4188,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_profile.html:8
 msgid "Change avatar at"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:12
 msgid "Missing email, please update this user email address."
 msgstr ""
 #: 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 ""
 #: kallithea/templates/admin/users/user_edit_profile.html:60
 msgid "Name in Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr ""
 #: kallithea/templates/admin/users/users.html:5

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -709,25 +709,25 @@ msgstr "" @@
 #: kallithea/controllers/admin/repo_groups.py:307
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:420
 #: kallithea/controllers/admin/repo_groups.py:455
 #: kallithea/controllers/admin/user_groups.py:340
 msgid "Cannot revoke permission for yourself as admin"
 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
 #: kallithea/controllers/admin/repos.py:430
 #: kallithea/controllers/admin/user_groups.py:352
 msgid "An error occurred during revoking of permission"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:163
 #, python-format
 msgid "Error creating repository %s"
 msgstr ""
@@ @@ -949,25 +949,25 @@ msgstr "" @@
 msgid "Successfully deleted user group"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:247
 msgid "An error occurred during deletion of user group"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:314
 msgid "Target group cannot be the same"
 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
 #: kallithea/controllers/admin/users.py:396
 msgid "Updated permissions"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:444
 #: kallithea/controllers/admin/users.py:400
 msgid "An error occurred during permissions saving"
 msgstr "保存权限时发生错误"
@@ @@ -1797,25 +1797,25 @@ msgstr "使用中" @@
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr ""
 #: kallithea/model/scm.py:808
 msgid "latest tip"
 msgstr "最新tip版本"
 #: kallithea/model/user.py:194
 msgid "New user registration"
 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
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr "由于是系统帐号，无法删除该用户"
 #: kallithea/model/user.py:261
 #, fuzzy, python-format
 msgid ""
 "User \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories: %s"
 msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s"
@@ @@ -2880,25 +2880,25 @@ msgstr "" @@
 #: kallithea/templates/admin/my_account/my_account_profile.html:15
 msgid "Missing email, please update your user email address."
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_profile.html:16
 #: kallithea/templates/admin/users/user_edit_profile.html:15
 msgid "current IP"
 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 "
+"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
 #, fuzzy
 msgid "Repositories You Own"
 msgstr "版本库"
 #: kallithea/templates/admin/my_account/my_account_repos.html:59
 #: kallithea/templates/admin/my_account/my_account_watched.html:59
 #: kallithea/templates/base/root.html:46
 #: kallithea/templates/bookmarks/bookmarks.html:81
@@ @@ -4200,25 +4200,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_advanced.html:7
 #: kallithea/templates/admin/users/user_edit_profile.html:51
 msgid "Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:9
 #: kallithea/templates/admin/users/users.html:53
 msgid "Last Login"
 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
 #: kallithea/templates/data_table/_dt_elements.html:160
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "确认删除用户：%s"
 #: kallithea/templates/admin/users/user_edit_advanced.html:23
 msgid "Delete this user"
 msgstr ""
@@ @@ -4229,25 +4229,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_profile.html:8
 msgid "Change avatar at"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:12
 msgid "Missing email, please update this user email address."
 msgstr ""
 #: 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 ""
 #: kallithea/templates/admin/users/user_edit_profile.html:60
 msgid "Name in Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr "确认新密码"
 #: kallithea/templates/admin/users/users.html:5

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -701,25 +701,25 @@ msgstr "" @@
 #: kallithea/controllers/admin/repo_groups.py:307
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:420
 #: kallithea/controllers/admin/repo_groups.py:455
 #: kallithea/controllers/admin/user_groups.py:340
 msgid "Cannot revoke permission for yourself as admin"
 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
 #: kallithea/controllers/admin/repos.py:430
 #: kallithea/controllers/admin/user_groups.py:352
 msgid "An error occurred during revoking of permission"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:163
 #, python-format
 msgid "Error creating repository %s"
 msgstr ""
@@ @@ -941,25 +941,25 @@ msgstr "" @@
 msgid "Successfully deleted user group"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:247
 msgid "An error occurred during deletion of user group"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:314
 msgid "Target group cannot be the same"
 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
 #: kallithea/controllers/admin/users.py:396
 msgid "Updated permissions"
 msgstr ""
 #: kallithea/controllers/admin/user_groups.py:444
 #: kallithea/controllers/admin/users.py:400
 msgid "An error occurred during permissions saving"
 msgstr ""
@@ @@ -1789,25 +1789,25 @@ msgstr "使用中" @@
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr ""
 #: kallithea/model/scm.py:808
 msgid "latest tip"
 msgstr ""
 #: kallithea/model/user.py:194
 msgid "New user registration"
 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
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr "您無法移除這個使用者，因為他是系統帳號"
 #: kallithea/model/user.py:261
 #, python-format
 msgid ""
 "User \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories: %s"
 msgstr ""
@@ @@ -2870,25 +2870,25 @@ msgstr "" @@
 #: kallithea/templates/admin/my_account/my_account_profile.html:15
 msgid "Missing email, please update your user email address."
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_profile.html:16
 #: kallithea/templates/admin/users/user_edit_profile.html:15
 msgid "current IP"
 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 "
+"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
 #, fuzzy
 msgid "Repositories You Own"
 msgstr "個版本庫"
 #: kallithea/templates/admin/my_account/my_account_repos.html:59
 #: kallithea/templates/admin/my_account/my_account_watched.html:59
 #: kallithea/templates/base/root.html:46
 #: kallithea/templates/bookmarks/bookmarks.html:81
@@ @@ -4178,25 +4178,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_advanced.html:7
 #: kallithea/templates/admin/users/user_edit_profile.html:51
 msgid "Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:9
 #: kallithea/templates/admin/users/users.html:53
 msgid "Last Login"
 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
 #: kallithea/templates/data_table/_dt_elements.html:160
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_advanced.html:23
 msgid "Delete this user"
 msgstr ""
@@ @@ -4207,25 +4207,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_profile.html:8
 msgid "Change avatar at"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:12
 msgid "Missing email, please update this user email address."
 msgstr ""
 #: 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 ""
 #: kallithea/templates/admin/users/user_edit_profile.html:60
 msgid "Name in Source of Record"
 msgstr ""
 #: kallithea/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr ""
 #: kallithea/templates/admin/users/users.html:5

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -1116,25 +1116,25 @@ def changed_tooltip(nodes): @@
     It limits the output to 30 entries
     :param nodes: LazyNodesGenerator
     """
     if nodes:
         pref = ': <br/> '
         suf = ''
         if len(nodes) > 30:
             suf = '<br/>' + _(' and %s more') % (len(nodes) - 30)
         return literal(pref + '<br/> '.join([safe_unicode(x.path)
                                              for x in nodes[:30]]) + suf)
     else:
-        return ': ' + _('No Files')
+        return ': ' + _('No files')
 def repo_link(groups_and_repos):
     """
     Makes a breadcrumbs link to repo within a group
     joins &raquo; on each group to create a fancy link
     ex::
         group >> subgroup >> repo
     :param groups_and_repos:
     :param last_url:

kallithea/model/db.py

➞

Show inline comments

@@ @@ -1655,57 +1655,57 @@ class RepoGroup(Base, BaseModel): @@
 class Permission(Base, BaseModel):
     __tablename__ = 'permissions'
     __table_args__ = (
         Index('p_perm_name_idx', 'permission_name'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
     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')),
         ('hg.fork.none', _('Only admins can fork repositories')),
         ('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')),
+    ]
     #definition of system default permissions for DEFAULT user
     DEFAULT_USER_PERMISSIONS = [
         'repository.read',
         'group.read',
         'usergroup.read',
         'hg.create.repository',
         'hg.create.write_on_repogroup.true',
@@ @@ -2216,28 +2216,28 @@ class ChangesetStatus(Base, BaseModel): @@
         Index('cs_changeset_comment_id_idx', 'changeset_comment_id'),
         Index('cs_pull_request_id_user_id_version_idx', 'pull_request_id', 'user_id', 'version'),
         UniqueConstraint('repo_id', 'revision', 'version'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
     STATUS_NOT_REVIEWED = DEFAULT = 'not_reviewed'
     STATUS_APPROVED = 'approved'
     STATUS_REJECTED = 'rejected'
     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)
     repo_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=False)
     user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
     revision = Column(String(40), nullable=False)
     status = Column(String(128), nullable=False, default=DEFAULT)
     changeset_comment_id = Column(Integer(), ForeignKey('changeset_comments.comment_id'), nullable=False)
     modified_at = Column(DateTime(), nullable=False, default=datetime.datetime.now)
     version = Column(Integer(), nullable=False, default=0)
     pull_request_id = Column(Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)

kallithea/model/user.py

➞

Show inline comments

@@ @@ -196,47 +196,47 @@ class UserModel(BaseModel): @@
             'new_username': new_user.username}
         NotificationModel().create(created_by=new_user, subject=subject,
                                    body=body, recipients=None,
                                    type_=Notification.TYPE_REGISTRATION,
                                    email_kwargs=email_kwargs)
     def update(self, user_id, form_data, skip_attrs=[]):
         from kallithea.lib.auth import get_crypt_password
         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():
             if k in skip_attrs:
                 continue
             if k == 'new_password' and v:
                 user.password = get_crypt_password(v)
             else:
                 # old legacy thing orm models store firstname as name,
                 # need proper refactor to username
                 if k == 'firstname':
                     k = 'name'
                 setattr(user, k, v)
         self.sa.add(user)
     def update_user(self, user, **kwargs):
         from kallithea.lib.auth import get_crypt_password
         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")
+            )
         for k, v in kwargs.items():
             if k == 'password' and v:
                 v = get_crypt_password(v)
             setattr(user, k, v)
         self.sa.add(user)
         return user
     def delete(self, user, cur_user=None):

kallithea/templates/admin/settings/settings_visual.html

➞

Show inline comments

@@ @@ -80,25 +80,25 @@ ${h.form(url('admin_settings_visual'), m @@
                         <label for="show_public_icon">${_('Show public repository icon on repositories')}</label>
                     </div>
                     <div class="checkbox">
                         ${h.checkbox('show_private_icon','True')}
                         <label for="show_private_icon">${_('Show private repository icon on repositories')}</label>
                     </div>
                     <span class="help-block">${_('Show public/private icons next to repository names.')}</span>
                  </div>
              </div>
              <div class="field">
                 <div class="label label-checkbox">
-                    <label>${_('Meta-Tagging')}:</label>
+                    <label>${_('Meta Tagging')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('stylify_metatags','True')}
                         <label for="stylify_metatags">${_('Stylify recognised meta tags:')}</label>
                     </div>
                     <div style="padding-left: 20px;">
                         <ul> <!-- Fix style here -->
                             <li>[featured] <span class="metatag" tag="featured">featured</span></li>
                             <li>[stale] <span class="metatag" tag="stale">stale</span></li>
                             <li>[dead] <span class="metatag" tag="dead">dead</span></li>
                             <li>[lang =&gt; lang] <span class="metatag" tag="lang" >lang</span></li>

kallithea/templates/admin/users/user_edit_advanced.html

➞

Show inline comments

 <div style="font-size: 24px; color: #666666; padding: 0px 0px 10px 0px">${_('User: %s') % c.user.username}</div>
 <dl class="dl-horizontal">
 <%
  elems = [
     (_('Repositories'), len(c.user.repositories), ', '.join((x.repo_name for x in c.user.repositories))),
     (_('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:
   <dt style="width:150px; text-align: left">${dt}:</dt>
   <dd style="margin-left: 160px" title="${tt}">${dd}</dd>
 %endfor
 </dl>
 ${h.form(h.url('delete_user', id=c.user.user_id),method='delete')}
     <button class="btn btn-small btn-danger" type="submit"
             onclick="return confirm('${_('Confirm to delete this user: %s') % c.user.username}');">
         <i class="icon-minus-circled"></i>

0 comments (0 inline, 0 general)