{% load i18n %} {% load translations %} {% load permissions %} {% with object.needs_commit as needs_commit %} {% perm 'vcs.commit' project as user_can_commit_translation %} {% perm 'vcs.update' project as user_can_update_translation %} {% perm 'vcs.push' project as user_can_push_translation %} {% perm 'vcs.reset' project as user_can_reset_translation %} {% perm 'component.lock' project as user_can_lock_component %}
{% trans "There has been a merge failure in the repository" %}
{{ changes.0.target }}
{% trans "Check the FAQ for info on how to resolve this." %}
{{ status.1 }}{% endfor %}
{{ change.timestamp|naturaltime }} | {{ change.get_user_display }} | {{ change.get_action_display }} | {% if change.translation %} {{ change.translation.language }} {% endif %} |
{{ change.target }} |
{% trans "Commit pending changes to the local repository" %} |
|
{% trans "Pull changes from the remote repository" %} |
|
{% trans "Push changes to the remote repository" %} |
|
{% trans "Rebase local changes onto the remote repository" %} |
|
{% trans "Reset all changes in the local repository" %} |
|
{% trans "Cleanup all untracked files in the local repository" %} |
|
{% trans "Allow changes to the local repository" %} |
|
{% trans "Prevent any changes in the local repository" %} |