kallithea Changeset - 923037eb67d4

Changeset - 923037eb67d4

Parent rev.

Child rev.

[Not reviewed]

default

0 31 0

Thomas De Schampheleire - 11 years ago 2015-01-24 21:17:39
thomas.de_schampheleire@alcatel-lucent.com

spelling: fix various typos

This commit fixes various typos or basic English grammar mistakes found by
reviewing the kallithea.pot file.

Full correction of sentences that are not very well formulated, like missing
articles, is out of scope for this commit. Likewise for inconsistent
capitalization of strings like 'Repository group'/'Repository Group'.

31 files changed with 266 insertions and 266 deletions:

kallithea/controllers/admin/repo_groups.py

kallithea/controllers/api/api.py

kallithea/controllers/files.py

kallithea/i18n/cs/LC_MESSAGES/kallithea.po

kallithea/i18n/de/LC_MESSAGES/kallithea.po

kallithea/i18n/en/LC_MESSAGES/kallithea.po

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/pl/LC_MESSAGES/kallithea.po

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

kallithea/lib/auth.py

kallithea/lib/celerylib/tasks.py

kallithea/lib/dbmigrate/schema/db_1_4_0.py

kallithea/lib/dbmigrate/schema/db_1_5_0.py

kallithea/lib/dbmigrate/schema/db_1_5_2.py

kallithea/lib/helpers.py

kallithea/lib/paster_commands/make_index.py

kallithea/lib/paster_commands/update_repoinfo.py

kallithea/lib/vcs/utils/hgcompat.py

kallithea/model/validators.py

kallithea/templates/admin/repos/repo_creating.html

kallithea/templates/admin/repos/repo_edit_settings.html

kallithea/templates/admin/settings/settings_search.html

kallithea/templates/admin/settings/settings_vcs.html

kallithea/templates/data_table/_dt_elements.html

kallithea/tests/api/api_base.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/repo_groups.py

➞

Show inline comments

@@ @@ -275,25 +275,25 @@ class RepoGroupsController(BaseControlle @@
     def delete(self, group_name):
         """DELETE /repo_groups/group_name: Delete an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="DELETE" />
         # Or using helpers:
         #    h.form(url('repos_group', group_name=GROUP_NAME),
         #           method='delete')
         # url('repos_group', group_name=GROUP_NAME)
         gr = c.repo_group = RepoGroupModel()._get_repo_group(group_name)
         repos = gr.repositories.all()
         if repos:
-            h.flash(_('This group contains %s repositores and cannot be '
+            h.flash(_('This group contains %s repositories and cannot be '
                       'deleted') % len(repos), category='warning')
             return redirect(url('repos_groups'))
         children = gr.children.all()
         if children:
             h.flash(_('This group contains %s subgroups and cannot be deleted'
                       % (len(children))), category='warning')
             return redirect(url('repos_groups'))
         try:
             RepoGroupModel().delete(group_name)
             Session().commit()

kallithea/controllers/api/api.py

➞

Show inline comments

@@ @@ -1422,25 +1422,25 @@ class ApiController(JSONRPCController): @@
         :type private: bool
         :param clone_uri:
         :type clone_uri: str
         :param landing_rev: <rev_type>:<rev>
         :type landing_rev: str
         :param enable_locking:
         :type enable_locking: bool
         :param enable_downloads:
         :type enable_downloads: bool
         :param enable_statistics:
         :type enable_statistics: bool
         :param copy_permissions: Copy permission from group that repository is
-            beeing created.
+            being created.
         :type copy_permissions: bool
         OUTPUT::
             id : <id_given_in_input>
             result: {
                       "msg": "Created new repository `<reponame>`",
                       "success": true,
                       "task": "<celery task id or None if done sync>"
+                    }
             error:  null

kallithea/controllers/files.py

➞

Show inline comments

@@ @@ -294,25 +294,25 @@ class FilesController(BaseRepoController @@
             dispo = 'attachment; filename=%s' % \
                         safe_str(f_path.split(os.sep)[-1])
         response.content_disposition = dispo
         response.content_type = mimetype
         return file_node.content
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     def delete(self, repo_name, revision, f_path):
         repo = c.db_repo
         if repo.enable_locking and repo.locked[0]:
-            h.flash(_('This repository is has been locked by %s on %s')
             h.flash(_('This repository has been locked by %s on %s')
                 % (h.person_by_id(repo.locked[0]),
                    h.fmt_date(h.time_to_datetime(repo.locked[1]))),
                 'warning')
             return redirect(h.url('files_home',
                                   repo_name=repo_name, revision='tip'))
         # check if revision is a branch identifier- basically we cannot
         # create multiple heads via file editing
         _branches = repo.scm_instance.branches
         # check if revision is a branch name or branch hash
         if revision not in _branches.keys() + _branches.values():
             h.flash(_('You can only delete files with revision '
@@ @@ -354,25 +354,25 @@ class FilesController(BaseRepoController @@
                 log.error(traceback.format_exc())
                 h.flash(_('Error occurred during commit'), category='error')
             return redirect(url('changeset_home',
                                 repo_name=c.repo_name, revision='tip'))
         return render('files/files_delete.html')
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     def edit(self, repo_name, revision, f_path):
         repo = c.db_repo
         if repo.enable_locking and repo.locked[0]:
-            h.flash(_('This repository is has been locked by %s on %s')
             h.flash(_('This repository has been locked by %s on %s')
                 % (h.person_by_id(repo.locked[0]),
                    h.fmt_date(h.time_to_datetime(repo.locked[1]))),
                 'warning')
             return redirect(h.url('files_home',
                                   repo_name=repo_name, revision='tip'))
         # check if revision is a branch identifier- basically we cannot
         # create multiple heads via file editing
         _branches = repo.scm_instance.branches
         # check if revision is a branch name or branch hash
         if revision not in _branches.keys() + _branches.values():
             h.flash(_('You can only edit files with revision '
@@ @@ -421,25 +421,25 @@ class FilesController(BaseRepoController @@
                 h.flash(_('Error occurred during commit'), category='error')
             return redirect(url('changeset_home',
                                 repo_name=c.repo_name, revision='tip'))
         return render('files/files_edit.html')
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     def add(self, repo_name, revision, f_path):
         repo = Repository.get_by_repo_name(repo_name)
         if repo.enable_locking and repo.locked[0]:
-            h.flash(_('This repository is has been locked by %s on %s')
             h.flash(_('This repository has been locked by %s on %s')
                 % (h.person_by_id(repo.locked[0]),
                    h.fmt_date(h.time_to_datetime(repo.locked[1]))),
                   'warning')
             return redirect(h.url('files_home',
                                   repo_name=repo_name, revision='tip'))
         r_post = request.POST
         c.cs = self.__get_cs(revision, silent_empty=True)
         if c.cs is None:
             c.cs = EmptyChangeset(alias=c.db_repo_scm_instance.alias)
         c.default_message = (_('Added file via Kallithea'))
         c.f_path = f_path

kallithea/i18n/cs/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -123,25 +123,25 @@ msgstr "" @@
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr "Klikněte pro přidání nového souboru"
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
 msgid "This repository has been locked by %s on %s"
 msgstr ""
 #: kallithea/controllers/files.py:313
 msgid "You can only delete files with revision being a valid branch "
 msgstr ""
 #: kallithea/controllers/files.py:324
 #, python-format
 msgid "Deleted file %s via Kallithea"
 msgstr ""
 #: kallithea/controllers/files.py:346
@@ @@ -609,25 +609,25 @@ msgstr "" @@
 #: kallithea/controllers/admin/repo_groups.py:256
 #, python-format
 msgid "Updated repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:271
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:296
 #, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:302
 #, python-format
 msgid "Removed repository group %s"
 msgstr ""
@@ @@ -943,25 +943,25 @@ msgid "Removed ip address from user whit @@
 msgstr ""
 #: kallithea/lib/auth.py:748
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 #: kallithea/lib/auth.py:809
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
 msgid "You need to be signed in to view this page"
 msgstr ""
 #: kallithea/lib/diffs.py:66
 msgid "Binary file"
 msgstr ""
 #: kallithea/lib/diffs.py:82
 msgid ""
 "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 #: kallithea/lib/diffs.py:92
@@ @@ -1258,43 +1258,43 @@ msgstr "" @@
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664
 msgid "Repository admin access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400
 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408
 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572
@@ @@ -1840,25 +1840,25 @@ msgstr "" @@
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr ""
 #: kallithea/model/validators.py:493
 msgid "invalid clone url"
 msgstr ""
 #: kallithea/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr ""
 #: kallithea/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr ""
 #: kallithea/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr ""
 #: kallithea/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
@@ @@ -2150,25 +2150,25 @@ msgid "Email Address" @@
 msgstr ""
 #: kallithea/templates/password_reset.html:52
 #: kallithea/templates/register.html:95
 msgid "Captcha"
 msgstr ""
 #: kallithea/templates/password_reset.html:63
 msgid "Send password reset email"
 msgstr ""
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr ""
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
 #: kallithea/templates/register.html:106
 msgid "Sign Up"
 msgstr ""
 #: kallithea/templates/register.html:28
 #, python-format
 msgid "Sign Up to %s"
 msgstr ""
@@ @@ -3266,31 +3266,31 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_creating.html:9
 #, python-format
 msgid "%s Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:16
 msgid "Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected when "
+"Repository \"%(repo_name)s\" is being created, you will be redirected when "
 "this process is finished.repo_name"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:8
 #, python-format
 msgid "%s repository settings"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:52
 msgid "Extra fields"
 msgstr ""
@@ @@ -3360,25 +3360,25 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:66
 msgid "Lock repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:68
 msgid "Repository is not locked"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is disabled. "
-"Trigering a pull locks repository by user who pulled, only the same user can "
+"Triggering a pull locks repository by user who pulled, only the same user can "
 "unlock by doing a push"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:83
 #: kallithea/templates/data_table/_dt_elements.html:132
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:85
 msgid "Delete this repository"
 msgstr ""
@@ @@ -3392,25 +3392,25 @@ msgstr[1] "" @@
 msgstr[2] ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:89
 msgid "Detach forks"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:90
 msgid "Delete forks"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
-"This repository will be renamed in a special way in order to be unaccesible "
+"This repository will be renamed in a special way in order to be inaccessible "
 "for Kallithea and VCS systems. If you need to fully delete it from file "
 "system please do it manually"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Invalidate repository cache"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Confirm to invalidate repository cache"
 msgstr ""
@@ @@ -3504,26 +3504,26 @@ msgstr "" @@
 msgid "what is that ?"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:13
 msgid "URL by id"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:14
 msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
 "repository will allways be accessible under such url.\n"
 "                               Usefull for CI systems, or any other cases "
 "repository will always be accessible under such url.\n"
 "                               Useful for CI systems, or any other cases "
 "that you need to hardcode the url into 3rd party service."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:21
 msgid "Clone uri"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:27
 #: kallithea/templates/base/perms_summary.html:43
 #: kallithea/templates/base/perms_summary.html:79
 #: kallithea/templates/base/perms_summary.html:81
 #: kallithea/templates/data_table/_dt_elements.html:124
@@ @@ -3535,25 +3535,25 @@ msgstr "" @@
 msgid "edit"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:30
 msgid "new value"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:37
 msgid "http[s] url used for doing remote pulls."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
 #: kallithea/templates/forks/fork.html:65
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:65
 msgid "Change owner of this repository."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_statistics.html:6
@@ @@ -3758,25 +3758,25 @@ msgid "Rescan Repositories" @@
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:7
 msgid "Index build option"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:12
 msgid "Build from scratch"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:21
 msgid "Reindex"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_system.html:4
 msgid "Kallithea version"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_system.html:4
@@ @@ -3817,25 +3817,25 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
@@ @@ -4921,25 +4921,25 @@ msgstr "" @@
 msgid "Mercurial repository"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:72
 msgid "Public repository"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""

kallithea/i18n/de/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -127,25 +127,25 @@ msgstr "" @@
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr "Hier klicken, um eine neue Datei hinzuzufügen"
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr "Es gibt hier noch keine Dateien. %s"
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
 msgid "This repository has been locked by %s on %s"
 msgstr "Dieses Repository ist von %s am %s gesperrt worden"
 #: kallithea/controllers/files.py:313
 msgid "You can only delete files with revision being a valid branch "
 msgstr ""
 #: kallithea/controllers/files.py:324
 #, python-format
 msgid "Deleted file %s via Kallithea"
 msgstr "Datei %s via Kallithea gelöscht"
 #: kallithea/controllers/files.py:346
@@ @@ -617,25 +617,25 @@ msgstr "Fehler bei der Erstellung der Re @@
 #: kallithea/controllers/admin/repo_groups.py:256
 #, python-format
 msgid "Updated repository group %s"
 msgstr "Repositoriumsgruppe %s aktualisiert"
 #: kallithea/controllers/admin/repo_groups.py:271
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr "Fehler bei der Aktualisierung der Repositoriumsgruppe %s"
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr "Die Gruppe enthält %s Repositorys und kann nicht gelöscht werden"
 #: kallithea/controllers/admin/repo_groups.py:296
 #, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr "Diese Gruppe enthält %s Untergruppen und kann nicht gelöscht werden"
 #: kallithea/controllers/admin/repo_groups.py:302
 #, python-format
 msgid "Removed repository group %s"
 msgstr "Repositoriumsgruppe %s entfernt"
@@ @@ -957,25 +957,25 @@ msgid "Removed ip address from user whit @@
 msgstr ""
 #: kallithea/lib/auth.py:748
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 #: kallithea/lib/auth.py:809
 msgid "You need to be a registered user to perform this action"
 msgstr "Sie müssen ein Registrierter Nutzer sein um diese Aktion durchzuführen"
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
 msgid "You need to be signed in to view this page"
 msgstr "Sie müssen sich anmelden um diese Seite aufzurufen"
 #: kallithea/lib/diffs.py:66
 msgid "Binary file"
 msgstr ""
 #: kallithea/lib/diffs.py:82
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 "Der Änderungssatz war zu groß und wurde abgeschnitten, benutzen sie das "
 "Diff Menü um die Unterschiede anzuzeigen"
@@ @@ -1270,43 +1270,43 @@ msgstr "Schreibdender Zugriff auf Reposi @@
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664
 msgid "Repository admin access"
 msgstr "Administrativer Zugang zum Repository"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr "Repository Gruppe hat Keinen Zugriff"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr "Repository Gruppe hat lesenden Zugriff"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr "Repository Gruppe hat schreibenden Zugriff"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr "Repository Gruppe hat Administrativen Zugriff"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400
 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408
 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572
@@ @@ -1857,25 +1857,25 @@ msgstr "" @@
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr ""
 #: kallithea/model/validators.py:493
 msgid "invalid clone url"
 msgstr "ungültige Clone Adresse"
 #: kallithea/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr "Forke um den selben typ wie der Vorgesetze zu haben"
 #: kallithea/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr ""
 #: kallithea/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr ""
 #: kallithea/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
@@ @@ -2168,25 +2168,25 @@ msgid "Email Address" @@
 msgstr ""
 #: kallithea/templates/password_reset.html:52
 #: kallithea/templates/register.html:95
 msgid "Captcha"
 msgstr ""
 #: kallithea/templates/password_reset.html:63
 msgid "Send password reset email"
 msgstr ""
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr "Der Passwort Reset LInk wird an die passende EMail Addresse gesendet"
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
 #: kallithea/templates/register.html:106
 msgid "Sign Up"
 msgstr "Registrieren"
 #: kallithea/templates/register.html:28
 #, python-format
 msgid "Sign Up to %s"
 msgstr ""
@@ @@ -3282,31 +3282,31 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_creating.html:9
 #, python-format
 msgid "%s Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:16
 msgid "Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:8
 #, python-format
 msgid "%s repository settings"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:52
 msgid "Extra fields"
 msgstr ""
@@ @@ -3378,25 +3378,25 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:66
 msgid "Lock repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:68
 msgid "Repository is not locked"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:83
 #: kallithea/templates/data_table/_dt_elements.html:132
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:85
 msgid "Delete this repository"
 msgstr ""
@@ @@ -3410,25 +3410,25 @@ msgstr[1] "" @@
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:89
 msgid "Detach forks"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:90
 msgid "Delete forks"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Invalidate repository cache"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Confirm to invalidate repository cache"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:7
@@ @@ -3521,26 +3521,26 @@ msgstr "" @@
 msgid "what is that ?"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:13
 msgid "URL by id"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:14
 msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
 "repository will allways be accessible under such url.\n"
 "                               Usefull for CI systems, or any other cases"
 "repository will always be accessible under such url.\n"
 "                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:21
 msgid "Clone uri"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:27
 #: kallithea/templates/base/perms_summary.html:43
 #: kallithea/templates/base/perms_summary.html:79
 #: kallithea/templates/base/perms_summary.html:81
 #: kallithea/templates/data_table/_dt_elements.html:124
@@ @@ -3552,25 +3552,25 @@ msgstr "" @@
 msgid "edit"
 msgstr "bearbeiten"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:30
 msgid "new value"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:37
 msgid "http[s] url used for doing remote pulls."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
 #: kallithea/templates/forks/fork.html:65
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:65
 msgid "Change owner of this repository."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_statistics.html:6
@@ @@ -3776,25 +3776,25 @@ msgid "Rescan Repositories" @@
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:7
 msgid "Index build option"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:12
 msgid "Build from scratch"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:21
 msgid "Reindex"
 msgstr "Erneut Indizieren"
 #: kallithea/templates/admin/settings/settings_system.html:4
 msgid "Kallithea version"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_system.html:4
@@ @@ -3835,25 +3835,25 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr "Web"
 #: kallithea/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
@@ @@ -4932,25 +4932,25 @@ msgstr "" @@
 msgid "Mercurial repository"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:72
 msgid "Public repository"
 msgstr "Öffenentliches Repository"
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "Abonniere den %s RSS Feed"

kallithea/i18n/en/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -119,25 +119,25 @@ msgstr "" @@
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr ""
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
 msgid "This repository has been locked by %s on %s"
 msgstr ""
 #: kallithea/controllers/files.py:313
 msgid "You can only delete files with revision being a valid branch "
 msgstr ""
 #: kallithea/controllers/files.py:324
 #, python-format
 msgid "Deleted file %s via Kallithea"
 msgstr ""
 #: kallithea/controllers/files.py:346
@@ @@ -607,25 +607,25 @@ msgstr "" @@
 #: kallithea/controllers/admin/repo_groups.py:256
 #, python-format
 msgid "Updated repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:271
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:296
 #, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:302
 #, python-format
 msgid "Removed repository group %s"
 msgstr ""
@@ @@ -941,25 +941,25 @@ msgid "Removed ip address from user whit @@
 msgstr ""
 #: kallithea/lib/auth.py:748
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 #: kallithea/lib/auth.py:809
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
 msgid "You need to be signed in to view this page"
 msgstr ""
 #: kallithea/lib/diffs.py:66
 msgid "Binary file"
 msgstr ""
 #: kallithea/lib/diffs.py:82
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 #: kallithea/lib/diffs.py:92
 msgid "No changes detected"
@@ @@ -1249,43 +1249,43 @@ msgstr "" @@
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664
 msgid "Repository admin access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400
 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408
 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572
@@ @@ -1830,25 +1830,25 @@ msgstr "" @@
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr ""
 #: kallithea/model/validators.py:493
 msgid "invalid clone url"
 msgstr ""
 #: kallithea/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr ""
 #: kallithea/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr ""
 #: kallithea/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr ""
 #: kallithea/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
@@ @@ -2139,25 +2139,25 @@ msgid "Email Address" @@
 msgstr ""
 #: kallithea/templates/password_reset.html:52
 #: kallithea/templates/register.html:95
 msgid "Captcha"
 msgstr ""
 #: kallithea/templates/password_reset.html:63
 msgid "Send password reset email"
 msgstr ""
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr ""
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
 #: kallithea/templates/register.html:106
 msgid "Sign Up"
 msgstr ""
 #: kallithea/templates/register.html:28
 #, python-format
 msgid "Sign Up to %s"
 msgstr ""
@@ @@ -3254,31 +3254,31 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_creating.html:9
 #, python-format
 msgid "%s Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:16
 msgid "Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:8
 #, fuzzy, python-format
 msgid "%s repository settings"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:52
 msgid "Extra fields"
 msgstr ""
@@ @@ -3348,25 +3348,25 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:66
 msgid "Lock repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:68
 msgid "Repository is not locked"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:83
 #: kallithea/templates/data_table/_dt_elements.html:132
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:85
 #, fuzzy
 msgid "Delete this repository"
@@ @@ -3381,25 +3381,25 @@ msgstr[1] "" @@
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:89
 msgid "Detach forks"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:90
 msgid "Delete forks"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Invalidate repository cache"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Confirm to invalidate repository cache"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:7
@@ @@ -3492,26 +3492,26 @@ msgstr "" @@
 msgid "what is that ?"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:13
 msgid "URL by id"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:14
 msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
 "repository will allways be accessible under such url.\n"
 "                               Usefull for CI systems, or any other cases"
 "repository will always be accessible under such url.\n"
 "                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:21
 msgid "Clone uri"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:27
 #: kallithea/templates/base/perms_summary.html:43
 #: kallithea/templates/base/perms_summary.html:79
 #: kallithea/templates/base/perms_summary.html:81
 #: kallithea/templates/data_table/_dt_elements.html:124
@@ @@ -3523,25 +3523,25 @@ msgstr "" @@
 msgid "edit"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:30
 msgid "new value"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:37
 msgid "http[s] url used for doing remote pulls."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
 #: kallithea/templates/forks/fork.html:65
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:65
 msgid "Change owner of this repository."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_statistics.html:6
@@ @@ -3748,25 +3748,25 @@ msgid "Rescan Repositories" @@
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:7
 msgid "Index build option"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:12
 msgid "Build from scratch"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:21
 msgid "Reindex"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_system.html:4
 msgid "Kallithea version"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_system.html:4
@@ @@ -3807,25 +3807,25 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
@@ @@ -4907,25 +4907,25 @@ msgstr "" @@
 msgid "Mercurial repository"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:72
 msgid "Public repository"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -124,25 +124,25 @@ msgstr "%s a commité, le %s" @@
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr "Ajouter un nouveau fichier"
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr "Il n'y a actuellement pas de fichiers. %s"
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
 msgid "This repository has been locked by %s on %s"
 msgstr "Ce dépôt a été verrouillé par %s sur %s."
 #: kallithea/controllers/files.py:313
 msgid "You can only delete files with revision being a valid branch "
 msgstr ""
 #: kallithea/controllers/files.py:324
 #, python-format
 msgid "Deleted file %s via Kallithea"
 msgstr "Le fichier %s a été supprimé via Kallithea"
 #: kallithea/controllers/files.py:346
 #: kallithea/controllers/admin/repo_groups.py:256
 #, python-format
 msgid "Updated repository group %s"
 msgstr "Groupe de dépôts %s mis à jour"
 #: kallithea/controllers/admin/repo_groups.py:271
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr "Une erreur est survenue durant la mise à jour du groupe de dépôts %s"
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr "Ce groupe contient %s dépôts et ne peut être supprimé"
 #: kallithea/controllers/admin/repo_groups.py:296
 #, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr "Ce groupe contient %s sous-groupes et ne peut pas être supprimé"
 #: kallithea/controllers/admin/repo_groups.py:302
 #, python-format
 msgid "Removed repository group %s"
 msgstr "Groupe de dépôts %s supprimé"
@@ @@ -961,25 +961,25 @@ msgid "Removed ip address from user whit @@
 msgstr "L'adresse IP a été supprimée de la liste blanche"
 #: kallithea/lib/auth.py:748
 #, python-format
 msgid "IP %s not allowed"
 msgstr "IP %s non autorisée"
 #: kallithea/lib/auth.py:809
 msgid "You need to be a registered user to perform this action"
 msgstr "Vous devez être un utilisateur enregistré pour effectuer cette action"
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
 msgid "You need to be signed in to view this page"
 msgstr "Vous devez être connecté pour visualiser cette page"
 #: kallithea/lib/diffs.py:66
 msgid "Binary file"
 msgstr "Fichier binaire"
 #: kallithea/lib/diffs.py:82
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 "Cet ensemble de changements était trop gros pour être affiché et a été "
 "découpé, utilisez le menu « diff » pour afficher les différences"
@@ @@ -1274,43 +1274,43 @@ msgstr "Accès en écriture au dépôt" @@
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664
 msgid "Repository admin access"
 msgstr "Accès administrateur au dépôt"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr "Aucun accès au groupe de dépôts"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr "Accès en lecture au groupe de dépôts"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr "Accès en écriture au groupe de dépôts"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr "Accès administrateur au groupe de dépôts"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400
 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408
 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572
 #: kallithea/model/validators.py:493
 msgid "invalid clone url"
 msgstr "URL de clonage invalide"
 #: kallithea/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 "URL à cloner invalide. Veuillez fournir une URL valide en http(s) ou "
 "svn+http(s)"
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr "Le fork doit être du même type que le parent"
 #: kallithea/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr "Vous n’avez pas la permission de créer un dépôt dans ce"
 #: kallithea/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr "pas de permission de créer un dépôt dans la racine"
 #: kallithea/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
@@ @@ -2190,25 +2190,25 @@ msgid "Email Address" @@
 msgstr "Adresse e-mail"
 #: kallithea/templates/password_reset.html:52
 #: kallithea/templates/register.html:95
 msgid "Captcha"
 msgstr "Captcha"
 #: kallithea/templates/password_reset.html:63
 msgid "Send password reset email"
 msgstr "Envoyer le courriel de remise à zéro du mot de passe"
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr "Votre nouveau mot de passe sera envoyé à l’adresse correspondante"
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
 #: kallithea/templates/register.html:106
 msgid "Sign Up"
 msgstr "Inscription"
 #: kallithea/templates/register.html:28
 #, python-format
 msgid "Sign Up to %s"
 msgstr "S'inscrire sur %s"
@@ @@ -3315,31 +3315,31 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_creating.html:9
 #, python-format
 msgid "%s Creating repository"
 msgstr "%s Création du dépôt"
 #: kallithea/templates/admin/repos/repo_creating.html:16
 msgid "Creating repository"
 msgstr "Création du dépôt"
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:8
 #, python-format
 msgid "%s repository settings"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:52
 msgid "Extra fields"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:66
 msgid "Lock repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:68
 msgid "Repository is not locked"
 msgstr "Ce dépôt n’est pas verrouillé"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:83
 #: kallithea/templates/data_table/_dt_elements.html:132
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr "Voulez-vous vraiment supprimer le dépôt %s ?"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:85
 msgid "Delete this repository"
 msgstr ""
@@ @@ -3443,25 +3443,25 @@ msgstr[1] "" @@
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:89
 msgid "Detach forks"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:90
 msgid "Delete forks"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Invalidate repository cache"
 msgstr "Invalider le cache du dépôt"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Confirm to invalidate repository cache"
 msgstr "Voulez-vous vraiment invalider le cache du dépôt ?"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:7
@@ @@ -3556,26 +3556,26 @@ msgstr "" @@
 msgid "what is that ?"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:13
 msgid "URL by id"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:14
 msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
 "repository will allways be accessible under such url.\n"
 "                               Usefull for CI systems, or any other cases"
 "repository will always be accessible under such url.\n"
 "                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:21
 msgid "Clone uri"
 msgstr "URL de clone"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:27
 #: kallithea/templates/base/perms_summary.html:43
 #: kallithea/templates/base/perms_summary.html:79
 #: kallithea/templates/base/perms_summary.html:81
 #: kallithea/templates/data_table/_dt_elements.html:124
@@ @@ -3587,25 +3587,25 @@ msgstr "URL de clone" @@
 msgid "edit"
 msgstr "éditer"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:30
 msgid "new value"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:37
 msgid "http[s] url used for doing remote pulls."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt."
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
 #: kallithea/templates/forks/fork.html:65
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 "Révision par défaut pour les pages de fichiers, de téléchargements, de "
 "recherche et de documentation"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:65
 msgid "Change owner of this repository."
 msgstr "Changer le propriétaire de ce dépôt."
@@ @@ -3815,25 +3815,25 @@ msgid "Rescan Repositories" @@
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:7
 msgid "Index build option"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:12
 msgid "Build from scratch"
 msgstr "Construire ex nihilo"
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:21
 msgid "Reindex"
 msgstr "Mettre à jour l’index"
 #: kallithea/templates/admin/settings/settings_system.html:4
 msgid "Kallithea version"
 msgstr "Version de Kallithea"
 #: kallithea/templates/admin/settings/settings_system.html:4
@@ @@ -3874,25 +3874,25 @@ msgstr "Paquets Python" @@
 #: kallithea/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr "Web"
 #: kallithea/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr "Nécessiter SSL pour les opérations de VCS"
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 "Activez pour faire en sorte que Kallithea force l'utilisation de SSL pour "
 "pousser ou tirer. Si le certificate SSL est manquant, une erreur HTTP 406 "
 "Not Acceptable sera retournée."
 #: kallithea/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr "Afficher la taille du dépôt après un push"
 #: kallithea/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr "Journaliser les commandes de push"
@@ @@ -4982,25 +4982,25 @@ msgstr "" @@
 msgid "Mercurial repository"
 msgstr "Dépôt Mercurial"
 #: kallithea/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr "Dépôt Git"
 #: kallithea/templates/data_table/_dt_elements.html:72
 msgid "Public repository"
 msgstr "Dépôt public"
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr "Dépôt vide"
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "S’abonner au flux RSS de %s"

kallithea/i18n/hu/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -121,25 +121,25 @@ msgstr "" @@
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr ""
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
 msgid "This repository has been locked by %s on %s"
 msgstr ""
 #: kallithea/controllers/files.py:313
 msgid "You can only delete files with revision being a valid branch "
 msgstr ""
 #: kallithea/controllers/files.py:324
 #, python-format
 msgid "Deleted file %s via Kallithea"
 msgstr ""
 #: kallithea/controllers/files.py:346
@@ @@ -607,25 +607,25 @@ msgstr "" @@
 #: kallithea/controllers/admin/repo_groups.py:256
 #, python-format
 msgid "Updated repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:271
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:296
 #, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:302
 #, python-format
 msgid "Removed repository group %s"
 msgstr ""
@@ @@ -941,25 +941,25 @@ msgid "Removed ip address from user whit @@
 msgstr ""
 #: kallithea/lib/auth.py:748
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 #: kallithea/lib/auth.py:809
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
 msgid "You need to be signed in to view this page"
 msgstr ""
 #: kallithea/lib/diffs.py:66
 msgid "Binary file"
 msgstr ""
 #: kallithea/lib/diffs.py:82
 msgid ""
 "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 #: kallithea/lib/diffs.py:92
@@ @@ -1250,43 +1250,43 @@ msgstr "" @@
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664
 msgid "Repository admin access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400
 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408
 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572
@@ @@ -1832,25 +1832,25 @@ msgstr "" @@
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr ""
 #: kallithea/model/validators.py:493
 msgid "invalid clone url"
 msgstr ""
 #: kallithea/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr ""
 #: kallithea/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr ""
 #: kallithea/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr ""
 #: kallithea/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
@@ @@ -2142,25 +2142,25 @@ msgid "Email Address" @@
 msgstr ""
 #: kallithea/templates/password_reset.html:52
 #: kallithea/templates/register.html:95
 msgid "Captcha"
 msgstr ""
 #: kallithea/templates/password_reset.html:63
 msgid "Send password reset email"
 msgstr ""
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr ""
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
 #: kallithea/templates/register.html:106
 msgid "Sign Up"
 msgstr ""
 #: kallithea/templates/register.html:28
 #, python-format
 msgid "Sign Up to %s"
 msgstr ""
@@ @@ -3256,31 +3256,31 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_creating.html:9
 #, python-format
 msgid "%s Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:16
 msgid "Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected when "
+"Repository \"%(repo_name)s\" is being created, you will be redirected when "
 "this process is finished.repo_name"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:8
 #, python-format
 msgid "%s repository settings"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:52
 msgid "Extra fields"
 msgstr ""
@@ @@ -3350,25 +3350,25 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:66
 msgid "Lock repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:68
 msgid "Repository is not locked"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is disabled. "
-"Trigering a pull locks repository by user who pulled, only the same user can "
+"Triggering a pull locks repository by user who pulled, only the same user can "
 "unlock by doing a push"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:83
 #: kallithea/templates/data_table/_dt_elements.html:132
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:85
 msgid "Delete this repository"
 msgstr ""
@@ @@ -3381,25 +3381,25 @@ msgstr[0] "" @@
 msgstr[1] ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:89
 msgid "Detach forks"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:90
 msgid "Delete forks"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
-"This repository will be renamed in a special way in order to be unaccesible "
+"This repository will be renamed in a special way in order to be inaccessible "
 "for Kallithea and VCS systems. If you need to fully delete it from file "
 "system please do it manually"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Invalidate repository cache"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Confirm to invalidate repository cache"
 msgstr ""
@@ @@ -3493,26 +3493,26 @@ msgstr "" @@
 msgid "what is that ?"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:13
 msgid "URL by id"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:14
 msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
 "repository will allways be accessible under such url.\n"
 "                               Usefull for CI systems, or any other cases "
 "repository will always be accessible under such url.\n"
 "                               Useful for CI systems, or any other cases "
 "that you need to hardcode the url into 3rd party service."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:21
 msgid "Clone uri"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:27
 #: kallithea/templates/base/perms_summary.html:43
 #: kallithea/templates/base/perms_summary.html:79
 #: kallithea/templates/base/perms_summary.html:81
 #: kallithea/templates/data_table/_dt_elements.html:124
@@ @@ -3524,25 +3524,25 @@ msgstr "" @@
 msgid "edit"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:30
 msgid "new value"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:37
 msgid "http[s] url used for doing remote pulls."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
 #: kallithea/templates/forks/fork.html:65
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:65
 msgid "Change owner of this repository."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_statistics.html:6
@@ @@ -3747,25 +3747,25 @@ msgid "Rescan Repositories" @@
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:7
 msgid "Index build option"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:12
 msgid "Build from scratch"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:21
 msgid "Reindex"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_system.html:4
 msgid "Kallithea version"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_system.html:4
@@ @@ -3806,25 +3806,25 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
@@ @@ -4904,25 +4904,25 @@ msgstr "" @@
 msgid "Mercurial repository"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:72
 msgid "Public repository"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -124,25 +124,25 @@ msgstr "%s が %s にコミット" @@
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr "新しいファイルを追加"
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr "まだファイルがありません。 %s"
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
 msgid "This repository has been locked by %s on %s"
 msgstr "このリポジトリは %s によって %s にロックされました"
 #: kallithea/controllers/files.py:313
 msgid "You can only delete files with revision being a valid branch "
 msgstr "有効なブランチ上のリビジョンからしかファイルを削除できません"
 #: kallithea/controllers/files.py:324
 #, python-format
 msgid "Deleted file %s via Kallithea"
 msgstr "Kallithea経由で %s を削除"
 #: kallithea/controllers/files.py:346
 #: kallithea/controllers/admin/repo_groups.py:256
 #, python-format
 msgid "Updated repository group %s"
 msgstr "リポジトリグループ %s を更新しました"
 #: kallithea/controllers/admin/repo_groups.py:271
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr "リポジトリグループ %s の更新中にエラーが発生しました"
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr "このグループは %s 個のリポジトリを含んでいるため削除できません"
 #: kallithea/controllers/admin/repo_groups.py:296
 #, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr "このグループは %s 個のサブグループを含んでいるため削除できません"
 #: kallithea/controllers/admin/repo_groups.py:302
 #, python-format
 msgid "Removed repository group %s"
 msgstr "リポジトリグループ %s を削除しました"
@@ @@ -942,25 +942,25 @@ msgid "Removed ip address from user whit @@
 msgstr "ユーザーホワイトリストからIPアドレスを削除しました"
 #: kallithea/lib/auth.py:748
 #, python-format
 msgid "IP %s not allowed"
 msgstr "IPアドレス %s は許可されません"
 #: kallithea/lib/auth.py:809
 msgid "You need to be a registered user to perform this action"
 msgstr "このアクションを実行するためには登録済みのユーザーである必要があります"
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
 msgid "You need to be signed in to view this page"
 msgstr "このページを閲覧するためにはサインインが必要です"
 #: kallithea/lib/diffs.py:66
 msgid "Binary file"
 msgstr "バイナリファイル"
 #: kallithea/lib/diffs.py:82
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr "チェンジセットが大きすぎるため省略しました。差分を表示する場合は差分メニューを使用してください"
 #: kallithea/lib/diffs.py:92
 msgid "No changes detected"
@@ @@ -1246,43 +1246,43 @@ msgstr "リポジトリに書込権限でアクセス" @@
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664
 msgid "Repository admin access"
 msgstr "リポジトリに管理権限でアクセス"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr "リポジトリグループへのアクセス権限なし"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr "リポジトリグループに読込権限でアクセス"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr "リポジトリグループに書込権限でアクセス"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr "リポジトリグループに管理権限でアクセス"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400
 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408
 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr "リポジトリグループ名 \"%(repo)s\" はすでに存在します"
 #: kallithea/model/validators.py:493
 msgid "invalid clone url"
 msgstr "無効なクローンURIです"
 #: kallithea/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr "無効なクローンURIです。有効な http(s)/svn+http(s) のURIを指定してください"
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr "フォークは親と同じ種別の必要があります"
 #: kallithea/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr "このグループにリポジトリを作成する権限がありません"
 #: kallithea/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr "ルートにリポジトリを作成する権限がありません"
 #: kallithea/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
@@ @@ -2138,25 +2138,25 @@ msgid "Email Address" @@
 msgstr "メールアドレス"
 #: kallithea/templates/password_reset.html:52
 #: kallithea/templates/register.html:95
 msgid "Captcha"
 msgstr "キャプチャ"
 #: kallithea/templates/password_reset.html:63
 msgid "Send password reset email"
 msgstr "パスワードリセットのメールを送信"
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr "該当するメールアドレスにパスワードリセットのリンクを送信します"
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
 #: kallithea/templates/register.html:106
 msgid "Sign Up"
 msgstr "サインアップ"
 #: kallithea/templates/register.html:28
 #, python-format
 msgid "Sign Up to %s"
 msgstr "%s へサインアップ"
 #: kallithea/templates/admin/repos/repo_creating.html:9
 #, python-format
 msgid "%s Creating repository"
 msgstr "%s Creating repository"
 #: kallithea/templates/admin/repos/repo_creating.html:16
 msgid "Creating repository"
 msgstr "リポジトリを作成中"
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr "リポジトリ \"%(repo_name)s\" を作成中です。処理を完了したらリダイレクトします。"
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr "恐れいります。操作中にエラーが発生しました。 Kallithea サーバのログをチェックするか、管理者に問い合わせてください。"
 #: kallithea/templates/admin/repos/repo_edit.html:8
 #, python-format
 msgid "%s repository settings"
 msgstr "%s リポジトリ設定"
 #: kallithea/templates/admin/repos/repo_edit.html:52
 msgid "Extra fields"
 msgstr "拡張フィールド"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:66
 msgid "Lock repository"
 msgstr "リポジトリをロック"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:68
 msgid "Repository is not locked"
 msgstr "リポジトリはロックされていません"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr "リポジトリのロックを強制します。匿名アクセスが無効のときしか使えません。ユーザーがリポジトリをプルすると、そのユーザーでリポジトリをロックし、同じユーザーがプッシュするまでアンロックしません。"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:83
 #: kallithea/templates/data_table/_dt_elements.html:132
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr "このリポジトリを削除してもよろしいですか？ : %s"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:85
 msgid "Delete this repository"
 msgstr "このリポジトリを削除"
@@ @@ -3375,25 +3375,25 @@ msgstr[0] "%s 個のフォークがあります" @@
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:89
 msgid "Detach forks"
 msgstr "フォークの切り離し"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:90
 msgid "Delete forks"
 msgstr "フォークも削除"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 "このリポジトリはKallitheaとVCSシステムからアクセス出来ないようにするために特別な方法でリネームされます。\n"
 "完全な削除が必要な場合はファイルシステムから手動で削除してください"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Invalidate repository cache"
 msgstr "リポジトリのキャッシュを無効化"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Confirm to invalidate repository cache"
 msgstr "リポジトリのキャッシュを無効化してもよろしいですか？"
@@ @@ -3488,26 +3488,26 @@ msgstr "変更不能ID" @@
 msgid "what is that ?"
 msgstr "これは何？"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:13
 msgid "URL by id"
 msgstr "id を使ってURLを表現"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:14
 msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
 "repository will allways be accessible under such url.\n"
 "                               Usefull for CI systems, or any other cases"
 "repository will always be accessible under such url.\n"
 "                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 "通常、リポジトリの名前を変更したり、別のグループに移動すると、リポジトリのURLが変わります。\n"
 "上のURLを使えば、常にリポジトリにアクセスできます。\n"
 "この機能は、CIを使っている場合や、3rd pirtyのサービス向けにURLをハードコードしたいときに便利です。"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:21
 msgid "Clone uri"
 msgstr "クローンURI"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:27
 #: kallithea/templates/base/perms_summary.html:43
@@ @@ -3522,25 +3522,25 @@ msgstr "クローンURI" @@
 msgid "edit"
 msgstr "編集"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:30
 msgid "new value"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:37
 msgid "http[s] url used for doing remote pulls."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr "オプション：このリポジトリが属するグループを選択します"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
 #: kallithea/templates/forks/fork.html:65
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定します"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:65
 msgid "Change owner of this repository."
 msgstr "リポジトリの所有者を変更"
 #: kallithea/templates/admin/repos/repo_edit_statistics.html:6
@@ @@ -3746,25 +3746,25 @@ msgid "Rescan Repositories" @@
 msgstr "リポジトリを再スキャン"
 #: kallithea/templates/admin/settings/settings_search.html:7
 msgid "Index build option"
 msgstr "インデックス作成時の設定"
 #: kallithea/templates/admin/settings/settings_search.html:12
 msgid "Build from scratch"
 msgstr "一度削除してから再度インデックスを作成"
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr "このオプションを使うと、全文検索の機能が正しく発揮されるよう、 Kallithea 中の全てのファイルのインデックスを再生成します。"
 #: kallithea/templates/admin/settings/settings_search.html:21
 msgid "Reindex"
 msgstr "再インデックス"
 #: kallithea/templates/admin/settings/settings_system.html:4
 msgid "Kallithea version"
 msgstr "Kallithea バージョン"
 #: kallithea/templates/admin/settings/settings_system.html:4
@@ @@ -3805,25 +3805,25 @@ msgstr "Python パッケージ" @@
 #: kallithea/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr "Web"
 #: kallithea/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr "VCSの操作にSSLを必須とする"
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr "プッシュ、プル時にSSLを要求します。SSLでない場合はHTTP Error 406: Not Acceptableを返します。"
 #: kallithea/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr "プッシュ後にリポジトリのサイズを表示する"
 #: kallithea/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr "ユーザーのプッシュコマンドを記録する"
 #: kallithea/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
@@ @@ -4921,25 +4921,25 @@ msgstr "ファイルはありません" @@
 msgid "Mercurial repository"
 msgstr "Mercurialリポジトリ"
 #: kallithea/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr "Gitリポジトリ"
 #: kallithea/templates/data_table/_dt_elements.html:72
 msgid "Public repository"
 msgstr "公開リポジトリ"
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr "リポジトリを作成しています..."
 #: kallithea/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr "まだチェンジセットがありません"
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "%s の RSS フィードを購読"

kallithea/i18n/kallithea.pot

➞

Show inline comments

@@ @@ -113,25 +113,25 @@ msgstr "" @@
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr ""
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
 msgid "This repository has been locked by %s on %s"
 msgstr ""
 #: kallithea/controllers/files.py:313
 msgid "You can only delete files with revision being a valid branch "
 msgstr ""
 #: kallithea/controllers/files.py:324
 #, python-format
 msgid "Deleted file %s via Kallithea"
 msgstr ""
 #: kallithea/controllers/files.py:346
@@ @@ -595,25 +595,25 @@ msgstr "" @@
 #: kallithea/controllers/admin/repo_groups.py:256
 #, python-format
 msgid "Updated repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:271
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:296
 #, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:302
 #, python-format
 msgid "Removed repository group %s"
 msgstr ""
@@ @@ -927,25 +927,25 @@ msgid "Removed ip address from user whit @@
 msgstr ""
 #: kallithea/lib/auth.py:748
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 #: kallithea/lib/auth.py:809
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
 msgid "You need to be signed in to view this page"
 msgstr ""
 #: kallithea/lib/diffs.py:66
 msgid "Binary file"
 msgstr ""
 #: kallithea/lib/diffs.py:82
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 #: kallithea/lib/diffs.py:92
 msgid "No changes detected"
@@ @@ -1232,43 +1232,43 @@ msgstr "" @@
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664
 msgid "Repository admin access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400
 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408
 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572
@@ @@ -1807,25 +1807,25 @@ msgstr "" @@
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr ""
 #: kallithea/model/validators.py:493
 msgid "invalid clone url"
 msgstr ""
 #: kallithea/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr ""
 #: kallithea/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr ""
 #: kallithea/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr ""
 #: kallithea/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
@@ @@ -2114,25 +2114,25 @@ msgid "Email Address" @@
 msgstr ""
 #: kallithea/templates/password_reset.html:52
 #: kallithea/templates/register.html:95
 msgid "Captcha"
 msgstr ""
 #: kallithea/templates/password_reset.html:63
 msgid "Send password reset email"
 msgstr ""
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr ""
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
 #: kallithea/templates/register.html:106
 msgid "Sign Up"
 msgstr ""
 #: kallithea/templates/register.html:28
 #, python-format
 msgid "Sign Up to %s"
 msgstr ""
@@ @@ -3198,29 +3198,29 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_creating.html:9
 #, python-format
 msgid "%s Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:16
 msgid "Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
-msgid "Repository \"%(repo_name)s\" is beeing created, you will be redirected when this process is finished.repo_name"
+msgid "Repository \"%(repo_name)s\" is being created, you will be redirected when this process is finished.repo_name"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:42
-msgid "We're sorry but error occured during this operation. Please check your Kallithea server logs, or contact administrator."
+msgid "We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:8
 #, python-format
 msgid "%s repository settings"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:52
 msgid "Extra fields"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:55
@@ @@ -3285,25 +3285,25 @@ msgstr "" @@
 msgid "Confirm to lock repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:66
 msgid "Lock repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:68
 msgid "Repository is not locked"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
-msgid "Force locking on repository. Works only when anonymous access is disabled. Trigering a pull locks repository by user who pulled, only the same user can unlock by doing a push"
+msgid "Force locking on repository. Works only when anonymous access is disabled. Triggering a pull locks repository by user who pulled, only the same user can unlock by doing a push"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:83
 #: kallithea/templates/data_table/_dt_elements.html:132
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:85
 msgid "Delete this repository"
 msgstr ""
@@ @@ -3314,25 +3314,25 @@ msgid_plural "this repository has %s for @@
 msgstr[0] ""
 msgstr[1] ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:89
 msgid "Detach forks"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:90
 msgid "Delete forks"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
-msgid "This repository will be renamed in a special way in order to be unaccesible for Kallithea and VCS systems. If you need to fully delete it from file system please do it manually"
+msgid "This repository will be renamed in a special way in order to be inaccessible for Kallithea and VCS systems. If you need to fully delete it from file system please do it manually"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Invalidate repository cache"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Confirm to invalidate repository cache"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:7
 msgid "Manually invalidate cache for this repository. On first access repository will be cached again"
@@ @@ -3420,26 +3420,26 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_edit_settings.html:11
 msgid "what is that ?"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:13
 msgid "URL by id"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:14
 msgid ""
 "In case this repository is renamed or moved into another group the repository url changes.\n"
 "                               Using above url guarantees that this repository will allways be accessible under such url.\n"
 "                               Usefull for CI systems, or any other cases that you need to hardcode the url into 3rd party service."
 "                               Using above url guarantees that this repository will always be accessible under such url.\n"
 "                               Useful for CI systems, or any other cases that you need to hardcode the url into 3rd party service."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:21
 msgid "Clone uri"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:27
 #: kallithea/templates/base/perms_summary.html:43
 #: kallithea/templates/base/perms_summary.html:79
 #: kallithea/templates/base/perms_summary.html:81
 #: kallithea/templates/data_table/_dt_elements.html:124
 #: kallithea/templates/data_table/_dt_elements.html:125
@@ @@ -3450,25 +3450,25 @@ msgstr "" @@
 msgid "edit"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:30
 msgid "new value"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:37
 msgid "http[s] url used for doing remote pulls."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
 #: kallithea/templates/forks/fork.html:65
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:65
 msgid "Change owner of this repository."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_statistics.html:6
@@ @@ -3662,25 +3662,25 @@ msgstr "" @@
 msgid "Rescan Repositories"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:7
 msgid "Index build option"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:12
 msgid "Build from scratch"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:15
-msgid "This option completely reindex all the files within Kallithea for proper fulltext search capabilities."
+msgid "This option completely reindexes all the files within Kallithea for proper fulltext search capabilities."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:21
 msgid "Reindex"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_system.html:4
 msgid "Kallithea version"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_system.html:4
 msgid "check for updates"
@@ @@ -3718,25 +3718,25 @@ msgstr "" @@
 msgid "Python packages"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:13
-msgid "Activate to set Kallithea to require SSL for pushing or pulling. If SSL certificate is missing it will return a HTTP Error 406: Not Acceptable."
+msgid "Activate to set Kallithea to require SSL for pushing or pulling. If SSL certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
@@ @@ -4787,25 +4787,25 @@ msgstr "" @@
 msgid "Mercurial repository"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:72
 msgid "Public repository"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -132,25 +132,25 @@ msgstr "%s zakomitowal w %s" @@
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr "Kliknij tutaj, by dodać nowy plik"
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
 msgid "This repository has been locked by %s on %s"
 msgstr "Repozytorium zostało zablokowane przez %s na %s"
 #: kallithea/controllers/files.py:313
 msgid "You can only delete files with revision being a valid branch "
 msgstr ""
 #: kallithea/controllers/files.py:324
 #, python-format
 msgid "Deleted file %s via Kallithea"
 msgstr ""
 #: kallithea/controllers/files.py:346
 #: kallithea/controllers/admin/repo_groups.py:256
 #, python-format
 msgid "Updated repository group %s"
 msgstr "Zaktualizowano grupę repo %s"
 #: kallithea/controllers/admin/repo_groups.py:271
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr "Wystąpił błąd podczas aktualizacji grupy repo %s"
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta"
 #: kallithea/controllers/admin/repo_groups.py:296
 #, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta"
 #: kallithea/controllers/admin/repo_groups.py:302
 #, python-format
 msgid "Removed repository group %s"
 msgstr "Usunięto grupę repo %s"
@@ @@ -956,25 +956,25 @@ msgid "Removed ip address from user whit @@
 msgstr "Usunięto adres ip z listy dozwolonych adresów dla użytkownika"
 #: kallithea/lib/auth.py:748
 #, python-format
 msgid "IP %s not allowed"
 msgstr "Obserwatorzy %s"
 #: kallithea/lib/auth.py:809
 msgid "You need to be a registered user to perform this action"
 msgstr "Musisz być zarejestrowanym użytkownikiem, żeby wykonać to działanie"
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
 msgid "You need to be signed in to view this page"
 msgstr "Musisz być zalogowany, żeby oglądać stronę"
 #: kallithea/lib/diffs.py:66
 msgid "Binary file"
 msgstr "Plik binarny"
 #: kallithea/lib/diffs.py:82
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 "Lista zmian była zbyt duża i została obcięta, użyj menu porównań żeby "
 "wyświetlić różnice"
@@ @@ -1275,43 +1275,43 @@ msgstr "Repozytorium do zapisu" @@
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664
 msgid "Repository admin access"
 msgstr "Administracja dostępu do repozytorium"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr "Grupy repozytoriów brak dostępu"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr "Grupy repozytoriów dostęp do odczytu"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr "Grupy repozytoriów dostęp do zapisu"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr "Repozytoria Grupy dostęp administratora"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400
 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408
 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr "Grupa repozytoriów z nazwą \"%(repo)s\" już istnieje"
 #: kallithea/model/validators.py:493
 msgid "invalid clone url"
 msgstr "nieprawidłowe url klonowania"
 #: kallithea/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr "Nieprawidłowe url klonowania, wstaw prawidłowy url http(s)/svn+http(s)"
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr "Fork musi być tego samego typu, jak rodzic"
 #: kallithea/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr "Nie masz uprawnień do tworzenia repozytorium w tej grupie"
 #: kallithea/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr "nie masz uprawnień do tworzenia repozytorium w tej grupie"
 #: kallithea/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
@@ @@ -2180,25 +2180,25 @@ msgid "Email Address" @@
 msgstr "Adres Email"
 #: kallithea/templates/password_reset.html:52
 #: kallithea/templates/register.html:95
 msgid "Captcha"
 msgstr ""
 #: kallithea/templates/password_reset.html:63
 msgid "Send password reset email"
 msgstr ""
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr "Link do zresetowania hasła zostanie wysłany na adres e-mail"
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
 #: kallithea/templates/register.html:106
 msgid "Sign Up"
 msgstr "Zarejestruj się"
 #: kallithea/templates/register.html:28
 #, python-format
 msgid "Sign Up to %s"
 msgstr ""
@@ @@ -3308,31 +3308,31 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_creating.html:9
 #, python-format
 msgid "%s Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:16
 msgid "Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:8
 #, python-format
 msgid "%s repository settings"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:52
 msgid "Extra fields"
 msgstr "Dodatkowe pola"
@@ @@ -3404,25 +3404,25 @@ msgstr "Potwierdź blokowanie repozytorium" @@
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:66
 msgid "Lock repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:68
 msgid "Repository is not locked"
 msgstr "Repozytorium nie jest zablokowane"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:83
 #: kallithea/templates/data_table/_dt_elements.html:132
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr "Potwierdź usunięcie repozytorium: %s"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:85
 msgid "Delete this repository"
 msgstr ""
@@ @@ -3437,25 +3437,25 @@ msgstr[2] "to repozytorium ma %s forków" @@
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:89
 msgid "Detach forks"
 msgstr "Ustaw jako rozwidlenie"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:90
 msgid "Delete forks"
 msgstr "Usuń rozwidlenie"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 "To repozytorium zostanie zmienione w sposób szczególny, żeby było "
 "niedostępne dla strony i systemów VCS. Jeśli chcesz całkowicie usunąć go "
 "z systemu plików prosimy zrobić to ręcznie"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Invalidate repository cache"
 msgstr "Unieważnij pamięć podręczną repozytorium"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Confirm to invalidate repository cache"
@@ @@ -3553,26 +3553,26 @@ msgstr "Brak zmiennej id" @@
 msgid "what is that ?"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:13
 msgid "URL by id"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:14
 msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
 "repository will allways be accessible under such url.\n"
 "                               Usefull for CI systems, or any other cases"
 "repository will always be accessible under such url.\n"
 "                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:21
 msgid "Clone uri"
 msgstr "Klonowane uri"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:27
 #: kallithea/templates/base/perms_summary.html:43
 #: kallithea/templates/base/perms_summary.html:79
 #: kallithea/templates/base/perms_summary.html:81
 #: kallithea/templates/data_table/_dt_elements.html:124
@@ @@ -3584,25 +3584,25 @@ msgstr "Klonowane uri" @@
 msgid "edit"
 msgstr "edycja"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:30
 msgid "new value"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:37
 msgid "http[s] url used for doing remote pulls."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium."
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
 #: kallithea/templates/forks/fork.html:65
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr "Wersja domyślna dla plików stronicowania, pobierania plików, readme"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:65
 msgid "Change owner of this repository."
 msgstr "Zmiana właściciela tego repozytorium."
 #: kallithea/templates/admin/repos/repo_edit_statistics.html:6
@@ @@ -3808,25 +3808,25 @@ msgid "Rescan Repositories" @@
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:7
 msgid "Index build option"
 msgstr "Opcja odbudowy indeksowania"
 #: kallithea/templates/admin/settings/settings_search.html:12
 msgid "Build from scratch"
 msgstr "Buduj od podstaw"
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:21
 msgid "Reindex"
 msgstr "Indeksuj ponownie"
 #: kallithea/templates/admin/settings/settings_system.html:4
 msgid "Kallithea version"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_system.html:4
@@ @@ -3867,25 +3867,25 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr "www"
 #: kallithea/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr "Wymagaj ssl dla operacji vcs"
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr "Pokaż rozmiar repozytorium po wysłaniu zmian"
 #: kallithea/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr "Logi poleceń wysłania zmian użytkowników"
 #: kallithea/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
@@ @@ -4980,25 +4980,25 @@ msgstr "Brak plików" @@
 msgid "Mercurial repository"
 msgstr "Repozytorium mercurial"
 #: kallithea/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr "Repozytorium git"
 #: kallithea/templates/data_table/_dt_elements.html:72
 msgid "Public repository"
 msgstr "Publiczne repozytorium"
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr "Nie ma jeszcze zestawienia zmian"
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "Subskrybuj %s kanał rss"

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -124,25 +124,25 @@ msgstr "%s commitados em %s" @@
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr "Clique aqui para adicionar um novo arquivo"
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
 msgid "This repository has been locked by %s on %s"
 msgstr "Este repositório foi travado por %s em %s"
 #: kallithea/controllers/files.py:313
 msgid "You can only delete files with revision being a valid branch "
 msgstr ""
 #: kallithea/controllers/files.py:324
 #, python-format
 msgid "Deleted file %s via Kallithea"
 msgstr ""
 #: kallithea/controllers/files.py:346
 #: kallithea/controllers/admin/repo_groups.py:256
 #, python-format
 msgid "Updated repository group %s"
 msgstr "Grupo de repositórios %s atualizado"
 #: kallithea/controllers/admin/repo_groups.py:271
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr "Ocorreu um erro durante a atualização do grupo de repositórios %s"
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr "Esse grupo contém %s repositórios e não pode ser excluído"
 #: kallithea/controllers/admin/repo_groups.py:296
 #, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr "Este grupo contém %s subgrupos e não pode ser excluído"
 #: kallithea/controllers/admin/repo_groups.py:302
 #, python-format
 msgid "Removed repository group %s"
 msgstr "Grupo de repositórios %s excluído"
@@ @@ -946,25 +946,25 @@ msgid "Removed ip address from user whit @@
 msgstr ""
 #: kallithea/lib/auth.py:748
 #, python-format
 msgid "IP %s not allowed"
 msgstr "IP %s não permitido"
 #: kallithea/lib/auth.py:809
 msgid "You need to be a registered user to perform this action"
 msgstr "Você precisa ser um usuário registrado para realizar essa ação"
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
 msgid "You need to be signed in to view this page"
 msgstr "Você precisa estar logado para ver essa página"
 #: kallithea/lib/diffs.py:66
 msgid "Binary file"
 msgstr "Arquivo binário"
 #: kallithea/lib/diffs.py:82
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 "Conjunto de mudanças é grande demais e foi cortado, use o menu de "
 "diferenças para ver as diferenças"
@@ @@ -1259,43 +1259,43 @@ msgstr "Acesso de escrita ao repositório" @@
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664
 msgid "Repository admin access"
 msgstr "Acesso administrativo ao repositório"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr "Nenhum acesso ao Grupo de Repositórios"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr "Acesso de leitura ao Grupo de Repositórios"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr "Acesso de escrita ao Grupo de Repositórios"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr "Acesso administrativo ao Grupo de Repositórios"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400
 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408
 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr "Um Grupo de Repositórios chamado \"%(repo)s\" já existe"
 #: kallithea/model/validators.py:493
 msgid "invalid clone url"
 msgstr "URL de clonagem inválida"
 #: kallithea/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr "URL inválida, por favor, forneça uma URL de clone http(s)/svn+http(s)"
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr "A bifurcação deve ser do mesmo tipo que o pai"
 #: kallithea/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr "Você não tem permissão para criar um repositório neste grupo"
 #: kallithea/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr "você não tem permissão para criar um repositório na raiz"
 #: kallithea/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
@@ @@ -2164,25 +2164,25 @@ msgid "Email Address" @@
 msgstr ""
 #: kallithea/templates/password_reset.html:52
 #: kallithea/templates/register.html:95
 msgid "Captcha"
 msgstr ""
 #: kallithea/templates/password_reset.html:63
 msgid "Send password reset email"
 msgstr ""
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr ""
 "Link de reinicialização de senha será enviado ao endereço de e-mail "
 "correspondente"
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
 #: kallithea/templates/register.html:106
 msgid "Sign Up"
 msgstr "Inscrever-se"
 #: kallithea/templates/register.html:28
 #, python-format
 msgid "Sign Up to %s"
@@ @@ -3293,31 +3293,31 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_creating.html:9
 #, python-format
 msgid "%s Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:16
 msgid "Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:8
 #, python-format
 msgid "%s repository settings"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:52
 msgid "Extra fields"
 msgstr "Campos extras"
@@ @@ -3391,25 +3391,25 @@ msgstr "Confirme para travar repositório" @@
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:66
 msgid "Lock repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:68
 msgid "Repository is not locked"
 msgstr "Repositório não está travado"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:83
 #: kallithea/templates/data_table/_dt_elements.html:132
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr "Confirma excluir esse repositório: %s"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:85
 msgid "Delete this repository"
 msgstr ""
@@ @@ -3423,25 +3423,25 @@ msgstr[1] "este repositório tem %s bifurcações" @@
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:89
 msgid "Detach forks"
 msgstr "Desassociar bifurcações"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:90
 msgid "Delete forks"
 msgstr "Excluir bifurcações"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 "Este repositório será renomeado de um modo especial para não ser mais "
 "acessívei pelo Kallithea ou outros sistemas VCS. Se você precisa "
 "excluí-lo totalmente do sistema de arquivos, por favor, faça-o "
 "manualmente"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Invalidate repository cache"
 msgstr "Invalidar cache do repositório"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
@@ @@ -3540,26 +3540,26 @@ msgstr "ID inalterável" @@
 msgid "what is that ?"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:13
 msgid "URL by id"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:14
 msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
 "repository will allways be accessible under such url.\n"
 "                               Usefull for CI systems, or any other cases"
 "repository will always be accessible under such url.\n"
 "                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:21
 msgid "Clone uri"
 msgstr "URI de clonagem"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:27
 #: kallithea/templates/base/perms_summary.html:43
 #: kallithea/templates/base/perms_summary.html:79
 #: kallithea/templates/base/perms_summary.html:81
 #: kallithea/templates/data_table/_dt_elements.html:124
@@ @@ -3571,25 +3571,25 @@ msgstr "URI de clonagem" @@
 msgid "edit"
 msgstr "editar"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:30
 msgid "new value"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:37
 msgid "http[s] url used for doing remote pulls."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório."
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
 #: kallithea/templates/forks/fork.html:65
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr "Revisão padrão para página de arquivos, downloads, whoosh e readme"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:65
 msgid "Change owner of this repository."
 msgstr "Mudar o dono desse repositório."
 #: kallithea/templates/admin/repos/repo_edit_statistics.html:6
@@ @@ -3795,25 +3795,25 @@ msgid "Rescan Repositories" @@
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:7
 msgid "Index build option"
 msgstr "Opção de construção do índice"
 #: kallithea/templates/admin/settings/settings_search.html:12
 msgid "Build from scratch"
 msgstr "Construir do zero"
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:21
 msgid "Reindex"
 msgstr "Reindexar"
 #: kallithea/templates/admin/settings/settings_system.html:4
 msgid "Kallithea version"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_system.html:4
@@ @@ -3854,25 +3854,25 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr "Web"
 #: kallithea/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr "Requer SSL para operações de VCS"
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr "Mostrar tamanho do repositório após o push"
 #: kallithea/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr "Armazenar registro de comandos de push dos usuários"
 #: kallithea/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
@@ @@ -4965,25 +4965,25 @@ msgstr "Nenhum arquivo" @@
 msgid "Mercurial repository"
 msgstr "Repositório Mercurial"
 #: kallithea/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr "Repositório Git"
 #: kallithea/templates/data_table/_dt_elements.html:72
 msgid "Public repository"
 msgstr "Repositório público"
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr "Nenhum conjunto de alterações ainda."
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "Assinar o feed rss de %s"

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -133,25 +133,25 @@ msgstr "%s выполнил коммит в %s" @@
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr "Нажмите чтобы добавить новый файл"
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr "Нет файлов. %s"
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
 msgid "This repository has been locked by %s on %s"
 msgstr "Репозиторий заблокировал %s в %s"
 #: kallithea/controllers/files.py:313
 msgid "You can only delete files with revision being a valid branch "
 msgstr ""
 "Вы можете удалять файлы только в ревизии, связанной с существующей веткой "
 #: kallithea/controllers/files.py:324
 #, python-format
 msgid "Deleted file %s via Kallithea"
 msgstr "Файл %s удалён с помощью Kallithea"
 #: kallithea/controllers/admin/repo_groups.py:256
 #, python-format
 msgid "Updated repository group %s"
 msgstr "Группа репозиториев %s обновлена"
 #: kallithea/controllers/admin/repo_groups.py:271
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr "Произошла ошибка при обновлении группы репозиториев %s"
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr "Данная группа содержит %s репозитариев и не может быть удалена"
 #: kallithea/controllers/admin/repo_groups.py:296
 #, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr "Группа содержит в себе %s подгрупп и не может быть удалён"
 #: kallithea/controllers/admin/repo_groups.py:302
 #, python-format
 msgid "Removed repository group %s"
 msgstr "Группа репозиториев %s удалена"
 #: kallithea/lib/auth.py:748
 #, python-format
 msgid "IP %s not allowed"
 msgstr "IP %s заблокирован"
 #: kallithea/lib/auth.py:809
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 "Вы должны быть зарегистрированным пользователем, чтобы выполнить это "
 "действие"
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
 msgid "You need to be signed in to view this page"
 msgstr "Страница доступна только авторизованным пользователям"
 #: kallithea/lib/diffs.py:66
 msgid "Binary file"
 msgstr "Двоичный файл"
 #: kallithea/lib/diffs.py:82
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 "Набор изменения оказался слишком большими и был урезан, используйте меню "
 "сравнения для показа результата сравнения"
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664
 msgid "Repository admin access"
 msgstr "Репозитарий - администрирование"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr "Группа Репозиториев - нет доступа"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr "Группа Репозиториев - доступ на чтение"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr "Группа Репозиториев - доступ на запись"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr "Группа Репозиториев - администрирование"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400
 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408
 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572
 #: kallithea/model/validators.py:493
 msgid "invalid clone url"
 msgstr "неверный URL"
 #: kallithea/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 "Неверная ссылка клонирования, предоставьте действительную ссылку для "
 "клонирования - http(s)/svn+http(s)."
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr "Тип форка будет совпадать с родительским"
 #: kallithea/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr "У вас недостаточно прав для создания репозиториев в этой группе"
 #: kallithea/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr "недостаточно прав для создания репозитория в корневом каталоге"
 #: kallithea/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
@@ @@ -2194,25 +2194,25 @@ msgid "Email Address" @@
 msgstr "Почтовый адрес"
 #: kallithea/templates/password_reset.html:52
 #: kallithea/templates/register.html:95
 msgid "Captcha"
 msgstr ""
 #: kallithea/templates/password_reset.html:63
 msgid "Send password reset email"
 msgstr ""
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr "Ссылка для сброса пароля была отправлена на соответствующий E-mail"
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
 #: kallithea/templates/register.html:106
 msgid "Sign Up"
 msgstr "Вступить"
 #: kallithea/templates/register.html:28
 #, python-format
 msgid "Sign Up to %s"
 msgstr ""
@@ @@ -3321,31 +3321,31 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_creating.html:9
 #, python-format
 msgid "%s Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:16
 msgid "Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:8
 #, python-format
 msgid "%s repository settings"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:52
 msgid "Extra fields"
 msgstr "Дополнительные поля"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:66
 msgid "Lock repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:68
 msgid "Repository is not locked"
 msgstr "Репозиторий не заблокирован"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:83
 #: kallithea/templates/data_table/_dt_elements.html:132
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr "Подтвердите удаление этого репозитория: %s"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:85
 msgid "Delete this repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:89
 msgid "Detach forks"
 msgstr "Отсоединить fork'и"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:90
 msgid "Delete forks"
 msgstr "Удалить fork'и"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 "Этот репозитарий будет переименован таким образом, чтобы сделать его "
 "недоступным для Kallithea и систем управления версиями. Если вам "
 "необходимо полностью удалить его из файловой системы, пожалуйста, "
 "сделайте это вручную"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Invalidate repository cache"
 msgstr "Сбросить кэш репозитория"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
@@ @@ -3565,26 +3565,26 @@ msgstr "Неизменяемый id" @@
 msgid "what is that ?"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:13
 msgid "URL by id"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:14
 msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
 "repository will allways be accessible under such url.\n"
 "                               Usefull for CI systems, or any other cases"
 "repository will always be accessible under such url.\n"
 "                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:21
 msgid "Clone uri"
 msgstr "URI для клонирования"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:27
 #: kallithea/templates/base/perms_summary.html:43
 #: kallithea/templates/base/perms_summary.html:79
 #: kallithea/templates/base/perms_summary.html:81
 #: kallithea/templates/data_table/_dt_elements.html:124
@@ @@ -3596,25 +3596,25 @@ msgstr "URI для клонирования" @@
 msgid "edit"
 msgstr "редактировать"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:30
 msgid "new value"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:37
 msgid "http[s] url used for doing remote pulls."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr "Опционально выбрать группу, в которую поместить данный репозиторий."
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
 #: kallithea/templates/forks/fork.html:65
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 "Ревизия по умолчанию, из которой будет производиться выгрузка файлов при "
 "скачивании"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:65
 msgid "Change owner of this repository."
 msgstr "Изменить владельца репозитория"
@@ @@ -3822,25 +3822,25 @@ msgid "Rescan Repositories" @@
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:7
 msgid "Index build option"
 msgstr "Опции создания индекса"
 #: kallithea/templates/admin/settings/settings_search.html:12
 msgid "Build from scratch"
 msgstr "Сборка с нуля"
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:21
 msgid "Reindex"
 msgstr "Перестроить индекс"
 #: kallithea/templates/admin/settings/settings_system.html:4
 msgid "Kallithea version"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_system.html:4
@@ @@ -3881,25 +3881,25 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr "Веб"
 #: kallithea/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr "Запрашивать SSL для операций с VCS"
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr "Показывать размер репозитория после отправки"
 #: kallithea/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr "Логировать пользовательские команды отправки"
 #: kallithea/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
@@ @@ -4994,25 +4994,25 @@ msgstr "Нет файлов" @@
 msgid "Mercurial repository"
 msgstr "Репозиторий Mercurial"
 #: kallithea/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr "Git репозиторий"
 #: kallithea/templates/data_table/_dt_elements.html:72
 msgid "Public repository"
 msgstr "Публичный репозиторий"
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr "Изменений ещё не было"
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "Подписаться на ленту RSS %s"

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -123,25 +123,25 @@ msgstr "" @@
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr ""
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
 msgid "This repository has been locked by %s on %s"
 msgstr "版本库由%s于%s锁定"
 #: kallithea/controllers/files.py:313
 msgid "You can only delete files with revision being a valid branch "
 msgstr ""
 #: kallithea/controllers/files.py:324
 #, python-format
 msgid "Deleted file %s via Kallithea"
 msgstr ""
 #: kallithea/controllers/files.py:346
@@ @@ -607,25 +607,25 @@ msgstr "" @@
 #: kallithea/controllers/admin/repo_groups.py:256
 #, python-format
 msgid "Updated repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:271
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr "这个组内有%s个版本库因而无法删除"
 #: kallithea/controllers/admin/repo_groups.py:296
 #, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:302
 #, python-format
 msgid "Removed repository group %s"
 msgstr ""
@@ @@ -941,25 +941,25 @@ msgid "Removed ip address from user whit @@
 msgstr ""
 #: kallithea/lib/auth.py:748
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 #: kallithea/lib/auth.py:809
 msgid "You need to be a registered user to perform this action"
 msgstr "必须是注册用户才能进行此操作"
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
 msgid "You need to be signed in to view this page"
 msgstr "必须登录才能访问该页面"
 #: kallithea/lib/diffs.py:66
 msgid "Binary file"
 msgstr ""
 #: kallithea/lib/diffs.py:82
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr "修订集因过大而被截断，可查看原始修订集作为替代"
 #: kallithea/lib/diffs.py:92
 msgid "No changes detected"
@@ @@ -1243,43 +1243,43 @@ msgstr "版本库写入权限" @@
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664
 msgid "Repository admin access"
 msgstr "版本库管理权限"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr "无版本库组访问权限"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr "版本库组读取权限"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr "版本库组写入"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr "版本库组管理权限"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400
 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408
 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr ""
 #: kallithea/model/validators.py:493
 msgid "invalid clone url"
 msgstr "无效的克隆地址"
 #: kallithea/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr "无效的克隆地址，提供一个有效的克隆 http(s)或svn+http(s)地址"
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr "复刻版本库必须和父版本库类型相同"
 #: kallithea/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr "没有在该版本库组中创建版本库的权限"
 #: kallithea/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr ""
 #: kallithea/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
@@ @@ -2133,25 +2133,25 @@ msgid "Email Address" @@
 msgstr ""
 #: kallithea/templates/password_reset.html:52
 #: kallithea/templates/register.html:95
 msgid "Captcha"
 msgstr ""
 #: kallithea/templates/password_reset.html:63
 msgid "Send password reset email"
 msgstr ""
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr "密码重置地址已经发送到邮件"
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
 #: kallithea/templates/register.html:106
 msgid "Sign Up"
 msgstr "注册"
 #: kallithea/templates/register.html:28
 #, python-format
 msgid "Sign Up to %s"
 msgstr ""
@@ @@ -3243,31 +3243,31 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_creating.html:9
 #, python-format
 msgid "%s Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:16
 msgid "Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:8
 #, python-format
 msgid "%s repository settings"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:52
 msgid "Extra fields"
 msgstr ""
@@ @@ -3337,25 +3337,25 @@ msgstr "确认锁定版本库" @@
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:66
 msgid "Lock repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:68
 msgid "Repository is not locked"
 msgstr "版本库未锁定"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:83
 #: kallithea/templates/data_table/_dt_elements.html:132
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr "确认删除版本库：%s"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:85
 msgid "Delete this repository"
 msgstr ""
@@ @@ -3368,25 +3368,25 @@ msgstr[0] "" @@
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:89
 msgid "Detach forks"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:90
 msgid "Delete forks"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Invalidate repository cache"
 msgstr "清除版本库缓存"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Confirm to invalidate repository cache"
 msgstr "确认清除版本库缓存"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:7
@@ @@ -3479,26 +3479,26 @@ msgstr "" @@
 msgid "what is that ?"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:13
 msgid "URL by id"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:14
 msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
 "repository will allways be accessible under such url.\n"
 "                               Usefull for CI systems, or any other cases"
 "repository will always be accessible under such url.\n"
 "                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:21
 msgid "Clone uri"
 msgstr "克隆地址"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:27
 #: kallithea/templates/base/perms_summary.html:43
 #: kallithea/templates/base/perms_summary.html:79
 #: kallithea/templates/base/perms_summary.html:81
 #: kallithea/templates/data_table/_dt_elements.html:124
@@ @@ -3510,25 +3510,25 @@ msgstr "克隆地址" @@
 msgid "edit"
 msgstr "编辑"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:30
 msgid "new value"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:37
 msgid "http[s] url used for doing remote pulls."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr "可选的，选择一个组将版本库放到其中"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
 #: kallithea/templates/forks/fork.html:65
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr "文件浏览、下载、whoosh和README的默认修订版本"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:65
 msgid "Change owner of this repository."
 msgstr "修改这个版本库的所有者"
 #: kallithea/templates/admin/repos/repo_edit_statistics.html:6
@@ @@ -3734,25 +3734,25 @@ msgid "Rescan Repositories" @@
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:7
 msgid "Index build option"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:12
 msgid "Build from scratch"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:21
 msgid "Reindex"
 msgstr "重新索引"
 #: kallithea/templates/admin/settings/settings_system.html:4
 msgid "Kallithea version"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_system.html:4
@@ @@ -3793,25 +3793,25 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr "网络"
 #: kallithea/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr "推送后显示版本库大小"
 #: kallithea/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr "记录用户推送命令"
 #: kallithea/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
@@ @@ -4884,25 +4884,25 @@ msgstr "无文件" @@
 msgid "Mercurial repository"
 msgstr "Mercurial版本库"
 #: kallithea/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr "Git版本库"
 #: kallithea/templates/data_table/_dt_elements.html:72
 msgid "Public repository"
 msgstr "公共版本库"
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr "无修订"
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "订阅%s的RSS"

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -119,25 +119,25 @@ msgstr "" @@
 #: kallithea/controllers/files.py:92
 msgid "Click here to add new file"
 msgstr ""
 #: kallithea/controllers/files.py:93
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
 msgid "This repository has been locked by %s on %s"
 msgstr ""
 #: kallithea/controllers/files.py:313
 msgid "You can only delete files with revision being a valid branch "
 msgstr ""
 #: kallithea/controllers/files.py:324
 #, python-format
 msgid "Deleted file %s via Kallithea"
 msgstr ""
 #: kallithea/controllers/files.py:346
@@ @@ -603,25 +603,25 @@ msgstr "" @@
 #: kallithea/controllers/admin/repo_groups.py:256
 #, python-format
 msgid "Updated repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:271
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:296
 #, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr ""
 #: kallithea/controllers/admin/repo_groups.py:302
 #, python-format
 msgid "Removed repository group %s"
 msgstr ""
@@ @@ -937,25 +937,25 @@ msgid "Removed ip address from user whit @@
 msgstr ""
 #: kallithea/lib/auth.py:748
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 #: kallithea/lib/auth.py:809
 msgid "You need to be a registered user to perform this action"
 msgstr "您必須是註冊使用者才能執行這個動作"
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
 msgid "You need to be signed in to view this page"
 msgstr "您必須登入後才能瀏覽這個頁面"
 #: kallithea/lib/diffs.py:66
 msgid "Binary file"
 msgstr ""
 #: kallithea/lib/diffs.py:82
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 #: kallithea/lib/diffs.py:92
 msgid "No changes detected"
@@ @@ -1239,43 +1239,43 @@ msgstr "" @@
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 kallithea/model/db.py:1664
 msgid "Repository admin access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400
 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408
 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572
@@ @@ -1820,25 +1820,25 @@ msgstr "" @@
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr ""
 #: kallithea/model/validators.py:493
 msgid "invalid clone url"
 msgstr "無效的複製URL"
 #: kallithea/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr ""
 #: kallithea/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr ""
 #: kallithea/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr ""
 #: kallithea/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
@@ @@ -2129,25 +2129,25 @@ msgid "Email Address" @@
 msgstr ""
 #: kallithea/templates/password_reset.html:52
 #: kallithea/templates/register.html:95
 msgid "Captcha"
 msgstr ""
 #: kallithea/templates/password_reset.html:63
 msgid "Send password reset email"
 msgstr ""
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr "密碼重設連結已郵寄至您的信箱"
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
 #: kallithea/templates/register.html:106
 msgid "Sign Up"
 msgstr "登入"
 #: kallithea/templates/register.html:28
 #, python-format
 msgid "Sign Up to %s"
 msgstr ""
@@ @@ -3239,31 +3239,31 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_creating.html:9
 #, python-format
 msgid "%s Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:16
 msgid "Creating repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:8
 #, python-format
 msgid "%s repository settings"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit.html:52
 msgid "Extra fields"
 msgstr ""
@@ @@ -3333,25 +3333,25 @@ msgstr "" @@
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:66
 msgid "Lock repository"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:68
 msgid "Repository is not locked"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:83
 #: kallithea/templates/data_table/_dt_elements.html:132
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:85
 msgid "Delete this repository"
 msgstr ""
@@ @@ -3364,25 +3364,25 @@ msgstr[0] "" @@
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:89
 msgid "Detach forks"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:90
 msgid "Delete forks"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Invalidate repository cache"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 msgid "Confirm to invalidate repository cache"
 msgstr "確認廢止版本庫快取"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:7
@@ @@ -3475,26 +3475,26 @@ msgstr "" @@
 msgid "what is that ?"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:13
 msgid "URL by id"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:14
 msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
 "repository will allways be accessible under such url.\n"
 "                               Usefull for CI systems, or any other cases"
 "repository will always be accessible under such url.\n"
 "                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:21
 msgid "Clone uri"
 msgstr "複製URL"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:27
 #: kallithea/templates/base/perms_summary.html:43
 #: kallithea/templates/base/perms_summary.html:79
 #: kallithea/templates/base/perms_summary.html:81
 #: kallithea/templates/data_table/_dt_elements.html:124
@@ @@ -3506,25 +3506,25 @@ msgstr "複製URL" @@
 msgid "edit"
 msgstr "編輯"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:30
 msgid "new value"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:37
 msgid "http[s] url used for doing remote pulls."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
 #: kallithea/templates/forks/fork.html:65
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:65
 msgid "Change owner of this repository."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_statistics.html:6
@@ @@ -3730,25 +3730,25 @@ msgid "Rescan Repositories" @@
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:7
 msgid "Index build option"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:12
 msgid "Build from scratch"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_search.html:21
 msgid "Reindex"
 msgstr "重新索引"
 #: kallithea/templates/admin/settings/settings_system.html:4
 msgid "Kallithea version"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_system.html:4
@@ @@ -3789,25 +3789,25 @@ msgstr "" @@
 #: kallithea/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr "push 後顯示版本庫大小"
 #: kallithea/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr "紀錄使用者推送命令"
 #: kallithea/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
@@ @@ -4880,25 +4880,25 @@ msgstr "" @@
 msgid "Mercurial repository"
 msgstr "Mercurial 版本庫"
 #: kallithea/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr "Git 版本庫"
 #: kallithea/templates/data_table/_dt_elements.html:72
 msgid "Public repository"
 msgstr "公開的版本庫"
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 #: kallithea/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr "尚未有任何變更"
 #: kallithea/templates/data_table/_dt_elements.html:103
 #: kallithea/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "訂閱 %s rss"

kallithea/lib/auth.py

➞

Show inline comments

@@ @@ -831,25 +831,25 @@ class PermsDecorator(object): @@
         if self.check_permissions():
             log.debug('Permission granted for %s %s' % (cls, self.user))
             return func(*fargs, **fkwargs)
         else:
             log.debug('Permission denied for %s %s' % (cls, self.user))
             anonymous = self.user.username == User.DEFAULT_USER
             if anonymous:
                 p = url.current()
                 import kallithea.lib.helpers as h
-                h.flash(_('You need to be a signed in to '
                 h.flash(_('You need to be signed in to '
                           'view this page'),
                         category='warning')
                 return redirect(url('login_home', came_from=p))
             else:
                 # redirect with forbidden ret code
                 return abort(403)
     def check_permissions(self):
         """Dummy function for overriding"""
         raise Exception('You have to write this function in child class')

kallithea/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -363,25 +363,25 @@ def create_repo(form_data, cur_user): @@
             clone_uri=clone_uri,
+        )
         repo = Repository.get_by_repo_name(repo_name_full)
         log_create_repository(repo.get_dict(), created_by=owner.username)
         # update repo changeset caches initially
         repo.update_changeset_cache()
         # set new created state
         repo.set_state(Repository.STATE_CREATED)
         DBS.commit()
     except Exception, e:
-        log.warning('Exception %s occured when forking repository, '
+        log.warning('Exception %s occurred when forking repository, '
                     'doing cleanup...' % e)
         # rollback things manually !
         repo = Repository.get_by_repo_name(repo_name_full)
         if repo:
             Repository.delete(repo.repo_id)
             DBS.commit()
             RepoModel(DBS)._delete_filesystem_repo(repo)
         raise
     # it's an odd fix to make celery fail task when exception occurs
     def on_failure(self, *args, **kwargs):
         pass
@@ @@ -448,25 +448,25 @@ def create_repo_fork(form_data, cur_user @@
             clone_uri=source_repo_path,
+        )
         repo = Repository.get_by_repo_name(repo_name_full)
         log_create_repository(repo.get_dict(), created_by=owner.username)
         # update repo changeset caches initially
         repo.update_changeset_cache()
         # set new created state
         repo.set_state(Repository.STATE_CREATED)
         DBS.commit()
     except Exception, e:
-        log.warning('Exception %s occured when forking repository, '
+        log.warning('Exception %s occurred when forking repository, '
                     'doing cleanup...' % e)
         #rollback things manually !
         repo = Repository.get_by_repo_name(repo_name_full)
         if repo:
             Repository.delete(repo.repo_id)
             DBS.commit()
             RepoModel(DBS)._delete_filesystem_repo(repo)
         raise
     # it's an odd fix to make celery fail task when exception occurs
     def on_failure(self, *args, **kwargs):
         pass

kallithea/lib/dbmigrate/schema/db_1_4_0.py

➞

Show inline comments

@@ @@ -1156,28 +1156,28 @@ class Permission(Base, BaseModel): @@
     __tablename__ = 'permissions'
     __table_args__ = (
         Index('p_perm_name_idx', 'permission_name'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'},
+    )
     PERMS = [
         ('repository.none', _('Repository no access')),
         ('repository.read', _('Repository read access')),
         ('repository.write', _('Repository write access')),
         ('repository.admin', _('Repository admin access')),
         ('group.none', _('Repositories Group no access')),
         ('group.read', _('Repositories Group read access')),
         ('group.write', _('Repositories Group write access')),
         ('group.admin', _('Repositories Group admin access')),
         ('group.none', _('Repository Group no access')),
         ('group.read', _('Repository Group read access')),
         ('group.write', _('Repository Group write access')),
         ('group.admin', _('Repository Group admin access')),
         ('hg.admin', _('Kallithea Administrator')),
         ('hg.create.none', _('Repository creation disabled')),
         ('hg.create.repository', _('Repository creation enabled')),
         ('hg.fork.none', _('Repository forking disabled')),
         ('hg.fork.repository', _('Repository forking enabled')),
         ('hg.register.none', _('Register disabled')),
         ('hg.register.manual_activate', _('Register new user with Kallithea '
                                           'with manual activation')),
         ('hg.register.auto_activate', _('Register new user with Kallithea '
                                         'with auto activation')),

kallithea/lib/dbmigrate/schema/db_1_5_0.py

➞

Show inline comments

@@ @@ -1175,28 +1175,28 @@ class Permission(Base, BaseModel): @@
     __tablename__ = 'permissions'
     __table_args__ = (
         Index('p_perm_name_idx', 'permission_name'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'},
+    )
     PERMS = [
         ('repository.none', _('Repository no access')),
         ('repository.read', _('Repository read access')),
         ('repository.write', _('Repository write access')),
         ('repository.admin', _('Repository admin access')),
         ('group.none', _('Repositories Group no access')),
         ('group.read', _('Repositories Group read access')),
         ('group.write', _('Repositories Group write access')),
         ('group.admin', _('Repositories Group admin access')),
         ('group.none', _('Repository Group no access')),
         ('group.read', _('Repository Group read access')),
         ('group.write', _('Repository Group write access')),
         ('group.admin', _('Repository Group admin access')),
         ('hg.admin', _('Kallithea Administrator')),
         ('hg.create.none', _('Repository creation disabled')),
         ('hg.create.repository', _('Repository creation enabled')),
         ('hg.fork.none', _('Repository forking disabled')),
         ('hg.fork.repository', _('Repository forking enabled')),
         ('hg.register.none', _('Register disabled')),
         ('hg.register.manual_activate', _('Register new user with Kallithea '
                                           'with manual activation')),
         ('hg.register.auto_activate', _('Register new user with Kallithea '
                                         'with auto activation')),

kallithea/lib/dbmigrate/schema/db_1_5_2.py

➞

Show inline comments

@@ @@ -1296,28 +1296,28 @@ class Permission(Base, BaseModel): @@
     __tablename__ = 'permissions'
     __table_args__ = (
         Index('p_perm_name_idx', 'permission_name'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'},
+    )
     PERMS = [
         ('repository.none', _('Repository no access')),
         ('repository.read', _('Repository read access')),
         ('repository.write', _('Repository write access')),
         ('repository.admin', _('Repository admin access')),
         ('group.none', _('Repositories Group no access')),
         ('group.read', _('Repositories Group read access')),
         ('group.write', _('Repositories Group write access')),
         ('group.admin', _('Repositories Group admin access')),
         ('group.none', _('Repository Group no access')),
         ('group.read', _('Repository Group read access')),
         ('group.write', _('Repository Group write access')),
         ('group.admin', _('Repository Group admin access')),
         ('hg.admin', _('Kallithea Administrator')),
         ('hg.create.none', _('Repository creation disabled')),
         ('hg.create.repository', _('Repository creation enabled')),
         ('hg.fork.none', _('Repository forking disabled')),
         ('hg.fork.repository', _('Repository forking enabled')),
         ('hg.register.none', _('Register disabled')),
         ('hg.register.manual_activate', _('Register new user with Kallithea '
                                           'with manual activation')),
         ('hg.register.auto_activate', _('Register new user with Kallithea '
                                         'with auto activation')),

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -1429,25 +1429,25 @@ def get_permission_name(key): @@
 def journal_filter_help():
     return _(textwrap.dedent('''
         Example filter terms:
             repository:vcs
             username:developer
             action:*push*
             ip:127.0.0.1
             date:20120101
             date:[20120101100000 TO 20120102]
         Generate wildcards using '*' character:
-            "repositroy:vcs*" - search everything starting with 'vcs'
+            "repository:vcs*" - search everything starting with 'vcs'
             "repository:*vcs*" - search for repository containing 'vcs'
         Optional AND / OR operators in queries
             "repository:vcs OR repository:test"
             "username:test AND repository:test*"
     '''))
 def not_mapped_error(repo_name):
     flash(_('%s repository is not mapped to db perhaps'
             ' it was created or renamed from the filesystem'
             ' please run the application again'

kallithea/lib/paster_commands/make_index.py

➞

Show inline comments

@@ @@ -86,28 +86,28 @@ class Command(BasePasterCommand): @@
         except LockHeld:
             sys.exit(1)
     def update_parser(self):
         self.parser.add_option('--repo-location',
                           action='store',
                           dest='repo_location',
                           help="Specifies repositories location to index OPTIONAL",
+                          )
         self.parser.add_option('--index-only',
                           action='store',
                           dest='repo_list',
-                          help="Specifies a comma separated list of repositores "
+                          help="Specifies a comma separated list of repositories "
                                 "to build index on. If not given all repositories "
                                 "are scanned for indexing. OPTIONAL",
+                          )
         self.parser.add_option('--update-only',
                           action='store',
                           dest='repo_update_list',
-                          help="Specifies a comma separated list of repositores "
+                          help="Specifies a comma separated list of repositories "
                                 "to re-build index on. OPTIONAL",
+                          )
         self.parser.add_option('-f',
                           action='store_true',
                           dest='full_index',
                           help="Specifies that index should be made full i.e"
                                 " destroy old and build from scratch",
                           default=False)

kallithea/lib/paster_commands/update_repoinfo.py

➞

Show inline comments

@@ @@ -72,19 +72,19 @@ class Command(BasePasterCommand): @@
         RepoModel.update_repoinfo(repositories=repo_list)
         Session().commit()
         if self.options.invalidate_cache:
             for r in repo_list:
                 r.set_invalidate()
         print 'Updated cache for %s repositories' % (len(repo_list))
     def update_parser(self):
         self.parser.add_option('--update-only',
                            action='store',
                            dest='repo_update_list',
-                           help="Specifies a comma separated list of repositores "
+                           help="Specifies a comma separated list of repositories "
                                 "to update last commit info for. OPTIONAL")
         self.parser.add_option('--invalidate-cache',
                            action='store_true',
                            dest='invalidate_cache',
                            help="Trigger cache invalidation event for repos. "
                                 "OPTIONAL")

kallithea/lib/vcs/utils/hgcompat.py

➞

Show inline comments

 """
 Mercurial libs compatibility
 """
 import mercurial
 import mercurial.demandimport
-## patch demandimport, due to bug in mercurial when it allways triggers demandimport.enable()
+## patch demandimport, due to bug in mercurial when it always triggers demandimport.enable()
 mercurial.demandimport.enable = lambda *args, **kwargs: 1
 from mercurial import archival, merge as hg_merge, patch, ui
 from mercurial import discovery
 from mercurial import localrepo
 from mercurial import unionrepo
 from mercurial import scmutil
 from mercurial import config
 from mercurial.commands import clone, nullid, pull
 from mercurial.context import memctx, memfilectx
 from mercurial.error import RepoError, RepoLookupError, Abort
 from mercurial.hgweb import hgweb_mod
 from mercurial.hgweb.common import get_contact

kallithea/model/validators.py

➞

Show inline comments

@@ @@ -488,25 +488,25 @@ def ValidCloneUri(): @@
                 except Exception:
                     log.exception('Url validation failed')
                     msg = M(self, 'clone_uri')
                     raise formencode.Invalid(msg, value, state,
                         error_dict=dict(clone_uri=msg)
+                    )
     return _validator
 def ValidForkType(old_data={}):
     class _validator(formencode.validators.FancyValidator):
         messages = {
-            'invalid_fork_type': _(u'Fork have to be the same type as parent')
+            'invalid_fork_type': _(u'Fork has to be the same type as parent')
+        }
         def validate_python(self, value, state):
             if old_data['repo_type'] != value:
                 msg = M(self, 'invalid_fork_type', state)
                 raise formencode.Invalid(msg, value, state,
                     error_dict=dict(repo_type=msg)
+                )
     return _validator
 def CanWriteGroup(old_data=None):

kallithea/templates/admin/repos/repo_creating.html

➞

Show inline comments

@@ @@ -18,37 +18,37 @@ @@
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div style="display:table; padding: 10px 0px; font-size: 14px;font-weight: bold;margin-right: auto;margin-left: auto">
-        ${_('Repository "%(repo_name)s" is beeing created, you will be redirected when this process is finished.' % {'repo_name':c.repo_name})}
+        ${_('Repository "%(repo_name)s" is being created, you will be redirected when this process is finished.' % {'repo_name':c.repo_name})}
     </div>
     <div id="progress" style="width: 500px;margin-left: auto; margin-right: auto">
         <div class="progress progress-striped active">
           <div class="progress-bar progress-bar" role="progressbar"
                aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">
           </div>
         </div>
     </div>
     <div id="progress_error" style="display: none;">
         <div style="font-weight: bold; color:#aa1111">
-        ${_("We're sorry but error occured during this operation. Please check your Kallithea server logs, or contact administrator.")}
+        ${_("We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator.")}
         </div>
     </div>
 </div>
 </%def>
 <script>
 (function worker() {
   $.ajax({
     url: '${h.url('repo_check_home', repo_name=c.repo_name, repo=c.repo, task_id=c.task_id)}',
     success: function(data) {
       if(data.result === true){
           //redirect to created fork if our ajax loop tells us to do so.

kallithea/templates/admin/repos/repo_edit_settings.html

➞

Show inline comments

@@ @@ -3,26 +3,26 @@ ${h.form(url('repo', repo_name=c.repo_in @@
         <!-- fields -->
         <div class="fields">
             <div class="field">
                 <div class="label">
                     <label for="repo_name">${_('Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('repo_name',class_="medium")}
                     <span class="help-block">${_('Non-changeable id')}: `_${c.repo_info.repo_id}` <span><a id="show_more_clone_id" href="#">${_('What is that?')}</a></span></span>
                     <span id="clone_id" class="help-block" style="display: none">
                         ${_('URL by id')}: `${c.repo_info.clone_url(with_id=True)}` </br>
                         ${_('''In case this repository is renamed or moved into another group the repository url changes.
                                Using the above url guarantees that this repository will allways be accessible under such url.
                                Usefull for CI systems, or any other cases that you need to hardcode the url into 3rd party service.''')}</span>
                                Using the above url guarantees that this repository will always be accessible under such url.
                                Useful for CI systems, or any other cases that you need to hardcode the url into 3rd party service.''')}</span>
                 </div>
            </div>
            <div class="field">
                <div class="label">
                    <label for="clone_uri">${_('Clone uri')}:</label>
                </div>
                <div class="input">
                    %if c.repo_info.clone_uri:
                     <div id="clone_uri_hidden" style="font-size: 14px">
                         <span id="clone_uri_hidden_value">${c.repo_info.clone_uri_hidden}</span>
                         <span style="cursor: pointer; padding: 0px 0px 5px 0px" id="edit_clone_uri"><i class="icon-edit"></i>${_('edit')}</span>
                     </div>

kallithea/templates/admin/settings/settings_search.html

➞

Show inline comments

@@ @@ -3,23 +3,23 @@ ${h.form(url('admin_settings_search'), m @@
         <div class="fields">
             <div class="field">
                 <div class="label label-checkbox">
                     <label>${_('Index build option')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('full_index',True)}
                         <label for="full_index">${_('Build from scratch')}</label>
                     </div>
-                    <span class="help-block">${_('This option completely reindexes all of the repositories for proper fulltext search capabilities.')}</span>
+                    <span class="help-block">${_('This option completely reindexeses all of the repositories for proper fulltext search capabilities.')}</span>
                 </div>
             </div>
             <div class="buttons">
             ${h.submit('reindex',_('Reindex'),class_="btn")}
             </div>
         </div>
     </div>
 ${h.end_form()}

kallithea/templates/admin/settings/settings_vcs.html

➞

Show inline comments

 ${h.form(url('admin_settings'), method='post')}
     <div class="form">
         <div class="fields">
             <div class="field">
                 <div class="label label-checkbox">
                     <label>${_('Web')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('web_push_ssl', 'True')}
                         <label for="web_push_ssl">${_('Require SSL for vcs operations')}</label>
                     </div>
-                    <span class="help-block">${_('Activate to require SSL both pushing and pulling. If SSL certificate is missing, it will return a HTTP Error 406: Not Acceptable.')}</span>
+                    <span class="help-block">${_('Activate to require SSL both pushing and pulling. If SSL certificate is missing, it will return an HTTP Error 406: Not Acceptable.')}</span>
                 </div>
              </div>
              <div class="field">
                 <div class="label label-checkbox">
                     <label>${_('Hooks')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('hooks_changegroup_repo_size','True')}
                         <label for="hooks_changegroup_repo_size">${_('Show repository size after push')}</label>
                     </div>

kallithea/templates/data_table/_dt_elements.html

➞

Show inline comments

@@ @@ -78,25 +78,25 @@ @@
       <i class="icon-keyhole-circled" title="${_('Private repository')}" style="font-size: 16px; vertical-align: -2px; margin: 0px 1px 0px 3px"></i>
     %elif not private and c.visual.show_public_icon:
       <i class="icon-globe" title="${_('Public repository')}" style="font-size: 16px; vertical-align: -2px; margin: 0px 1px 0px 3px"></i>
     %else:
       <span style="margin: 0px 8px 0px 8px"></span>
     %endif
     ${get_name(name)}
     </a>
     %if fork_of:
       <a href="${h.url('summary_home',repo_name=fork_of.repo_name)}"><i class="icon-fork"></i></a>
     %endif
     %if rstate == 'repo_state_pending':
-      <i class="icon-wrench" style="color: #036185;" title="${_('Repository creating in progress...')}"></i>
+      <i class="icon-wrench" style="color: #036185;" title="${_('Repository creation in progress...')}"></i>
     %endif
   </div>
 </%def>
 <%def name="last_change(last_change)">
   <span class="tooltip" date="${last_change}" title="${h.tooltip(h.fmt_date(last_change))}">${h.age(last_change)}</span>
 </%def>
 <%def name="revision(name,rev,tip,author,last_msg)">
   <div>
   %if rev >= 0:
       <pre><a title="${h.tooltip('%s:\n\n%s' % (author,last_msg))}" class="tooltip" href="${h.url('changeset_home',repo_name=name,revision=tip)}">${'r%s:%s' % (rev,h.short_id(tip))}</a></pre>

kallithea/tests/api/api_base.py

➞

Show inline comments

@@ @@ -1157,25 +1157,25 @@ class BaseTestApi(object): @@
         fixture.create_repo(repo_name)
         updates = {'active': False}
         id_, params = _build_data(self.apikey_regular, 'update_repo',
                                   repoid=repo_name, **updates)
         response = api_call(self, params)
         try:
             expected = 'repository `%s` does not exist' % repo_name
             self._compare_error(id_, expected, given=response.body)
         finally:
             fixture.destroy_repo(repo_name)
     @mock.patch.object(RepoModel, 'update', crash)
-    def test_api_update_repo_exception_occured(self):
+    def test_api_update_repo_exception_occurred(self):
         repo_name = 'api_update_me'
         fixture.create_repo(repo_name, repo_type=self.REPO_TYPE)
         id_, params = _build_data(self.apikey, 'update_repo',
                                   repoid=repo_name, owner=TEST_USER_ADMIN_LOGIN,)
         response = api_call(self, params)
         try:
             expected = 'failed to update repo `%s`' % repo_name
             self._compare_error(id_, expected, given=response.body)
         finally:
             fixture.destroy_repo(repo_name)
     def test_api_delete_repo(self):
@@ @@ -1445,25 +1445,25 @@ class BaseTestApi(object): @@
                'msg': 'updated user group ID:%s %s' % (user_group.users_group_id,
                                                      user_group.users_group_name),
                'user_group': user_group.get_api_data()
+            }
             self._compare_ok(id_, expected, given=response.body)
         finally:
             if changing_attr == 'group_name':
                 # switch to updated name for proper cleanup
                 gr_name = updates['group_name']
             fixture.destroy_user_group(gr_name)
     @mock.patch.object(UserGroupModel, 'update', crash)
-    def test_api_update_user_group_exception_occured(self):
+    def test_api_update_user_group_exception_occurred(self):
         gr_name = 'test_group'
         fixture.create_user_group(gr_name)
         id_, params = _build_data(self.apikey, 'update_user_group',
                                   usergroupid=gr_name)
         response = api_call(self, params)
         try:
             expected = 'failed to update user group `%s`' % gr_name
             self._compare_error(id_, expected, given=response.body)
         finally:
             fixture.destroy_user_group(gr_name)
     def test_api_add_user_to_user_group(self):
@@ @@ -1573,25 +1573,25 @@ class BaseTestApi(object): @@
         id_, params = _build_data(self.apikey, 'delete_user_group',
                                   usergroupid=gr_name,
                                   userid=TEST_USER_ADMIN_LOGIN)
         response = api_call(self, params)
         try:
             expected = msg
             self._compare_error(id_, expected, given=response.body)
         finally:
             if UserGroupModel().get_by_name(gr_name):
                 fixture.destroy_user_group(gr_name)
-    def test_api_delete_user_group_exception_occured(self):
+    def test_api_delete_user_group_exception_occurred(self):
         gr_name = 'test_group'
         ugroup = fixture.create_user_group(gr_name)
         gr_id = ugroup.users_group_id
         id_, params = _build_data(self.apikey, 'delete_user_group',
                                   usergroupid=gr_name,
                                   userid=TEST_USER_ADMIN_LOGIN)
         try:
             with mock.patch.object(UserGroupModel, 'delete', crash):
                 response = api_call(self, params)
                 expected = 'failed to delete user group ID:%s %s' % (gr_id, gr_name)
                 self._compare_error(id_, expected, given=response.body)
@@ @@ -2230,25 +2230,25 @@ class BaseTestApi(object): @@
                 'created_on': response_json['result']['gist']['created_on'],
                 'description': 'foobar-gist',
                 'expires': response_json['result']['gist']['expires'],
                 'gist_id': response_json['result']['gist']['gist_id'],
                 'type': 'public',
                 'url': response_json['result']['gist']['url']
             },
             'msg': 'created new gist'
+        }
         self._compare_ok(id_, expected, given=response.body)
     @mock.patch.object(GistModel, 'create', crash)
-    def test_api_create_gist_exception_occured(self):
+    def test_api_create_gist_exception_occurred(self):
         id_, params = _build_data(self.apikey_regular, 'create_gist',
                                   files={})
         response = api_call(self, params)
         expected = 'failed to create gist'
         self._compare_error(id_, expected, given=response.body)
     def test_api_delete_gist(self):
         gist_id = fixture.create_gist().gist_access_id
         id_, params = _build_data(self.apikey, 'delete_gist',
                                   gistid=gist_id)
         response = api_call(self, params)
         expected = {'gist': None, 'msg': 'deleted gist ID:%s' % gist_id}
@@ @@ -2262,25 +2262,25 @@ class BaseTestApi(object): @@
         expected = {'gist': None, 'msg': 'deleted gist ID:%s' % gist_id}
         self._compare_ok(id_, expected, given=response.body)
     def test_api_delete_gist_regular_user_no_permission(self):
         gist_id = fixture.create_gist().gist_access_id
         id_, params = _build_data(self.apikey_regular, 'delete_gist',
                                   gistid=gist_id)
         response = api_call(self, params)
         expected = 'gist `%s` does not exist' % (gist_id,)
         self._compare_error(id_, expected, given=response.body)
     @mock.patch.object(GistModel, 'delete', crash)
-    def test_api_delete_gist_exception_occured(self):
+    def test_api_delete_gist_exception_occurred(self):
         gist_id = fixture.create_gist().gist_access_id
         id_, params = _build_data(self.apikey, 'delete_gist',
                                   gistid=gist_id)
         response = api_call(self, params)
         expected = 'failed to delete gist ID:%s' % (gist_id,)
         self._compare_error(id_, expected, given=response.body)
     def test_api_get_ip(self):
         id_, params = _build_data(self.apikey, 'get_ip')
         response = api_call(self, params)
         expected = {
             'server_ip_addr': '0.0.0.0',

0 comments (0 inline, 0 general)