diff --git a/.release.cfg b/.release.cfg --- a/.release.cfg +++ b/.release.cfg @@ -17,6 +17,7 @@ done = true done = true [task:updated_translation] +done = true [release] state = in_progress diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix --- a/pkgs/python-packages.nix +++ b/pkgs/python-packages.nix @@ -1872,7 +1872,7 @@ self: super: { }; }; "rhodecode-enterprise-ce" = super.buildPythonPackage { - name = "rhodecode-enterprise-ce-4.20.0"; + name = "rhodecode-enterprise-ce-4.21.0"; buildInputs = [ self."pytest" self."py" diff --git a/rhodecode/public/js/rhodecode/i18n/be.js b/rhodecode/public/js/rhodecode/i18n/be.js --- a/rhodecode/public/js/rhodecode/i18n/be.js +++ b/rhodecode/public/js/rhodecode/i18n/be.js @@ -6,6 +6,8 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + ', and {0} file changed.': ', and {0} file changed.', + ', and {0} files changed.': ', and {0} files changed.', '{0} file changed, ': '{0} file changed, ', '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Add another comment', @@ -27,6 +29,8 @@ var _TM = { 'Comment body was not changed.': 'Comment body was not changed.', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', + 'Compare summary: {0} commit': 'Compare summary: {0} commit', + 'Compare summary: {0} commits': 'Compare summary: {0} commits', 'Context file: ': 'Context file: ', 'Delete': 'Delete', 'Delete this comment?': 'Delete this comment?', @@ -64,6 +68,7 @@ var _TM = { 'No repository groups available yet.': 'No repository groups available yet.', 'No repository groups present.': 'No repository groups present.', 'No results': 'No results', + 'No review rules set.': 'No review rules set.', 'No ssh keys available yet.': 'No ssh keys available yet.', 'No tags available yet.': 'No tags available yet.', 'No user groups available yet.': 'No user groups available yet.', @@ -101,11 +106,13 @@ var _TM = { 'Stop following this repository': 'Stop following this repository', 'Stopped watching this repository': 'Stopped watching this repository', 'Submitting...': 'Submitting...', + 'Switch target repository with the source.': 'Switch target repository with the source.', 'Switch to chat': 'Switch to chat', 'Switch to comment': 'Switch to comment', 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There are no commits to merge.': 'There are no commits to merge.', 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', diff --git a/rhodecode/public/js/rhodecode/i18n/de.js b/rhodecode/public/js/rhodecode/i18n/de.js --- a/rhodecode/public/js/rhodecode/i18n/de.js +++ b/rhodecode/public/js/rhodecode/i18n/de.js @@ -6,6 +6,8 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + ', and {0} file changed.': ', and {0} file changed.', + ', and {0} files changed.': ', and {0} files changed.', '{0} file changed, ': '{0} file changed, ', '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Add another comment', @@ -27,6 +29,8 @@ var _TM = { 'Comment body was not changed.': 'Comment body was not changed.', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', + 'Compare summary: {0} commit': 'Compare summary: {0} commit', + 'Compare summary: {0} commits': 'Compare summary: {0} commits', 'Context file: ': 'Context file: ', 'Delete': 'Löschen', 'Delete this comment?': 'Delete this comment?', @@ -64,6 +68,7 @@ var _TM = { 'No repository groups available yet.': 'No repository groups available yet.', 'No repository groups present.': 'No repository groups present.', 'No results': 'No results', + 'No review rules set.': 'No review rules set.', 'No ssh keys available yet.': 'No ssh keys available yet.', 'No tags available yet.': 'No tags available yet.', 'No user groups available yet.': 'No user groups available yet.', @@ -101,11 +106,13 @@ var _TM = { 'Stop following this repository': 'Stop following this repository', 'Stopped watching this repository': 'Stopped watching this repository', 'Submitting...': 'Submitting...', + 'Switch target repository with the source.': 'Switch target repository with the source.', 'Switch to chat': 'Switch to chat', 'Switch to comment': 'Switch to comment', 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There are no commits to merge.': 'There are no commits to merge.', 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', diff --git a/rhodecode/public/js/rhodecode/i18n/en.js b/rhodecode/public/js/rhodecode/i18n/en.js --- a/rhodecode/public/js/rhodecode/i18n/en.js +++ b/rhodecode/public/js/rhodecode/i18n/en.js @@ -6,6 +6,8 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + ', and {0} file changed.': ', and {0} file changed.', + ', and {0} files changed.': ', and {0} files changed.', '{0} file changed, ': '{0} file changed, ', '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Add another comment', @@ -27,6 +29,8 @@ var _TM = { 'Comment body was not changed.': 'Comment body was not changed.', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', + 'Compare summary: {0} commit': 'Compare summary: {0} commit', + 'Compare summary: {0} commits': 'Compare summary: {0} commits', 'Context file: ': 'Context file: ', 'Delete': 'Delete', 'Delete this comment?': 'Delete this comment?', @@ -64,6 +68,7 @@ var _TM = { 'No repository groups available yet.': 'No repository groups available yet.', 'No repository groups present.': 'No repository groups present.', 'No results': 'No results', + 'No review rules set.': 'No review rules set.', 'No ssh keys available yet.': 'No ssh keys available yet.', 'No tags available yet.': 'No tags available yet.', 'No user groups available yet.': 'No user groups available yet.', @@ -101,11 +106,13 @@ var _TM = { 'Stop following this repository': 'Stop following this repository', 'Stopped watching this repository': 'Stopped watching this repository', 'Submitting...': 'Submitting...', + 'Switch target repository with the source.': 'Switch target repository with the source.', 'Switch to chat': 'Switch to chat', 'Switch to comment': 'Switch to comment', 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There are no commits to merge.': 'There are no commits to merge.', 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', diff --git a/rhodecode/public/js/rhodecode/i18n/es.js b/rhodecode/public/js/rhodecode/i18n/es.js --- a/rhodecode/public/js/rhodecode/i18n/es.js +++ b/rhodecode/public/js/rhodecode/i18n/es.js @@ -6,6 +6,8 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + ', and {0} file changed.': ', and {0} file changed.', + ', and {0} files changed.': ', and {0} files changed.', '{0} file changed, ': '{0} file changed, ', '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Add another comment', @@ -27,6 +29,8 @@ var _TM = { 'Comment body was not changed.': 'Comment body was not changed.', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', + 'Compare summary: {0} commit': 'Compare summary: {0} commit', + 'Compare summary: {0} commits': 'Compare summary: {0} commits', 'Context file: ': 'Context file: ', 'Delete': 'Delete', 'Delete this comment?': 'Delete this comment?', @@ -64,6 +68,7 @@ var _TM = { 'No repository groups available yet.': 'No repository groups available yet.', 'No repository groups present.': 'No repository groups present.', 'No results': 'No results', + 'No review rules set.': 'No review rules set.', 'No ssh keys available yet.': 'No ssh keys available yet.', 'No tags available yet.': 'No tags available yet.', 'No user groups available yet.': 'No user groups available yet.', @@ -101,11 +106,13 @@ var _TM = { 'Stop following this repository': 'Stop following this repository', 'Stopped watching this repository': 'Stopped watching this repository', 'Submitting...': 'Submitting...', + 'Switch target repository with the source.': 'Switch target repository with the source.', 'Switch to chat': 'Switch to chat', 'Switch to comment': 'Switch to comment', 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There are no commits to merge.': 'There are no commits to merge.', 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', diff --git a/rhodecode/public/js/rhodecode/i18n/fr.js b/rhodecode/public/js/rhodecode/i18n/fr.js --- a/rhodecode/public/js/rhodecode/i18n/fr.js +++ b/rhodecode/public/js/rhodecode/i18n/fr.js @@ -6,6 +6,8 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + ', and {0} file changed.': ', and {0} file changed.', + ', and {0} files changed.': ', and {0} files changed.', '{0} file changed, ': '{0} file changed, ', '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Add another comment', @@ -27,6 +29,8 @@ var _TM = { 'Comment body was not changed.': 'Comment body was not changed.', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', + 'Compare summary: {0} commit': 'Compare summary: {0} commit', + 'Compare summary: {0} commits': 'Compare summary: {0} commits', 'Context file: ': 'Context file: ', 'Delete': 'Supprimer', 'Delete this comment?': 'Delete this comment?', @@ -64,6 +68,7 @@ var _TM = { 'No repository groups available yet.': 'No repository groups available yet.', 'No repository groups present.': 'No repository groups present.', 'No results': 'No results', + 'No review rules set.': 'No review rules set.', 'No ssh keys available yet.': 'No ssh keys available yet.', 'No tags available yet.': 'No tags available yet.', 'No user groups available yet.': 'No user groups available yet.', @@ -101,11 +106,13 @@ var _TM = { 'Stop following this repository': 'Arrêter de suivre ce dépôt', 'Stopped watching this repository': 'Stopped watching this repository', 'Submitting...': 'Envoi…', + 'Switch target repository with the source.': 'Switch target repository with the source.', 'Switch to chat': 'Switch to chat', 'Switch to comment': 'Switch to comment', 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There are no commits to merge.': 'There are no commits to merge.', 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', diff --git a/rhodecode/public/js/rhodecode/i18n/it.js b/rhodecode/public/js/rhodecode/i18n/it.js --- a/rhodecode/public/js/rhodecode/i18n/it.js +++ b/rhodecode/public/js/rhodecode/i18n/it.js @@ -6,6 +6,8 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + ', and {0} file changed.': ', and {0} file changed.', + ', and {0} files changed.': ', and {0} files changed.', '{0} file changed, ': '{0} file changed, ', '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Aggiungi un altro commento', @@ -27,6 +29,8 @@ var _TM = { 'Comment body was not changed.': 'Comment body was not changed.', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', + 'Compare summary: {0} commit': 'Compare summary: {0} commit', + 'Compare summary: {0} commits': 'Compare summary: {0} commits', 'Context file: ': 'Context file: ', 'Delete': 'Elimina', 'Delete this comment?': 'Delete this comment?', @@ -64,6 +68,7 @@ var _TM = { 'No repository groups available yet.': 'No repository groups available yet.', 'No repository groups present.': 'No repository groups present.', 'No results': 'Nessun risultato', + 'No review rules set.': 'No review rules set.', 'No ssh keys available yet.': 'No ssh keys available yet.', 'No tags available yet.': 'No tags available yet.', 'No user groups available yet.': 'No user groups available yet.', @@ -101,11 +106,13 @@ var _TM = { 'Stop following this repository': 'Smetti di seguire il repository', 'Stopped watching this repository': 'Stopped watching this repository', 'Submitting...': 'Inoltro...', + 'Switch target repository with the source.': 'Switch target repository with the source.', 'Switch to chat': 'Switch to chat', 'Switch to comment': 'Switch to comment', 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'Al momento non ci sono richieste di PULL che richiedono il tuo intervento', + 'There are no commits to merge.': 'There are no commits to merge.', 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', diff --git a/rhodecode/public/js/rhodecode/i18n/ja.js b/rhodecode/public/js/rhodecode/i18n/ja.js --- a/rhodecode/public/js/rhodecode/i18n/ja.js +++ b/rhodecode/public/js/rhodecode/i18n/ja.js @@ -6,6 +6,8 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + ', and {0} file changed.': ', and {0} file changed.', + ', and {0} files changed.': ', and {0} files changed.', '{0} file changed, ': '{0} file changed, ', '{0} files changed, ': '{0} files changed, ', 'Add another comment': '別のコメントを追加', @@ -27,6 +29,8 @@ var _TM = { 'Comment body was not changed.': 'Comment body was not changed.', 'Comment text will be set automatically based on currently selected status ({0}) ...': '選択したステータス ({0}) を元にコメントが自動的に設定されます...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', + 'Compare summary: {0} commit': 'Compare summary: {0} commit', + 'Compare summary: {0} commits': 'Compare summary: {0} commits', 'Context file: ': 'Context file: ', 'Delete': '削除', 'Delete this comment?': 'Delete this comment?', @@ -64,6 +68,7 @@ var _TM = { 'No repository groups available yet.': 'まだリポジトリグループがありません。', 'No repository groups present.': 'No repository groups present.', 'No results': '結果がありません', + 'No review rules set.': 'No review rules set.', 'No ssh keys available yet.': 'No ssh keys available yet.', 'No tags available yet.': 'まだタグがありません。', 'No user groups available yet.': 'まだユーザーグループがありません。', @@ -101,11 +106,13 @@ var _TM = { 'Stop following this repository': 'このリポジトリのフォローをやめる', 'Stopped watching this repository': 'Stopped watching this repository', 'Submitting...': '送信中...', + 'Switch target repository with the source.': 'Switch target repository with the source.', 'Switch to chat': 'Switch to chat', 'Switch to comment': 'Switch to comment', 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There are no commits to merge.': 'There are no commits to merge.', 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', diff --git a/rhodecode/public/js/rhodecode/i18n/js_translations.js b/rhodecode/public/js/rhodecode/i18n/js_translations.js --- a/rhodecode/public/js/rhodecode/i18n/js_translations.js +++ b/rhodecode/public/js/rhodecode/i18n/js_translations.js @@ -1,5 +1,7 @@ // AUTO GENERATED FILE FOR Babel JS-GETTEXT EXTRACTORS, DO NOT CHANGE _gettext('(from usergroup {0})'); +_gettext(', and {0} file changed.'); +_gettext(', and {0} files changed.'); _gettext('{0} file changed, '); _gettext('{0} files changed, '); _gettext('Add another comment'); @@ -21,6 +23,8 @@ _gettext('Comment body was not changed.'); _gettext('Comment text will be set automatically based on currently selected status ({0}) ...'); _gettext('Commit Authors are not allowed to be a reviewer.'); +_gettext('Compare summary: {0} commit'); +_gettext('Compare summary: {0} commits'); _gettext('Context file: '); _gettext('Delete'); _gettext('Delete this comment?'); @@ -58,6 +62,7 @@ _gettext('No repository groups available yet.'); _gettext('No repository groups present.'); _gettext('No results'); +_gettext('No review rules set.'); _gettext('No ssh keys available yet.'); _gettext('No tags available yet.'); _gettext('No user groups available yet.'); @@ -95,11 +100,13 @@ _gettext('Stop following this repository'); _gettext('Stopped watching this repository'); _gettext('Submitting...'); +_gettext('Switch target repository with the source.'); _gettext('Switch to chat'); _gettext('Switch to comment'); _gettext('TODO comment'); _gettext('TODO from comment {0} was fixed.'); _gettext('There are currently no open pull requests requiring your participation.'); +_gettext('There are no commits to merge.'); _gettext('There is a later version of file tree available. Click {0} to create a file at the latest tree.'); _gettext('There is an existing path `{0}` at this commit.'); _gettext('This pull requests will consist of {0} commit.'); diff --git a/rhodecode/public/js/rhodecode/i18n/pl.js b/rhodecode/public/js/rhodecode/i18n/pl.js --- a/rhodecode/public/js/rhodecode/i18n/pl.js +++ b/rhodecode/public/js/rhodecode/i18n/pl.js @@ -6,6 +6,8 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + ', and {0} file changed.': ', and {0} file changed.', + ', and {0} files changed.': ', and {0} files changed.', '{0} file changed, ': '{0} file changed, ', '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Dodaj kolejny komentarz', @@ -27,6 +29,8 @@ var _TM = { 'Comment body was not changed.': 'Comment body was not changed.', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', + 'Compare summary: {0} commit': 'Compare summary: {0} commit', + 'Compare summary: {0} commits': 'Compare summary: {0} commits', 'Context file: ': 'Context file: ', 'Delete': 'Usuń', 'Delete this comment?': 'Delete this comment?', @@ -64,6 +68,7 @@ var _TM = { 'No repository groups available yet.': 'No repository groups available yet.', 'No repository groups present.': 'No repository groups present.', 'No results': 'No results', + 'No review rules set.': 'No review rules set.', 'No ssh keys available yet.': 'No ssh keys available yet.', 'No tags available yet.': 'No tags available yet.', 'No user groups available yet.': 'No user groups available yet.', @@ -101,11 +106,13 @@ var _TM = { 'Stop following this repository': 'Zakończyć obserwację tego repozytorium', 'Stopped watching this repository': 'Stopped watching this repository', 'Submitting...': 'Przesyłanie...', + 'Switch target repository with the source.': 'Switch target repository with the source.', 'Switch to chat': 'Switch to chat', 'Switch to comment': 'Switch to comment', 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There are no commits to merge.': 'There are no commits to merge.', 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', diff --git a/rhodecode/public/js/rhodecode/i18n/pt.js b/rhodecode/public/js/rhodecode/i18n/pt.js --- a/rhodecode/public/js/rhodecode/i18n/pt.js +++ b/rhodecode/public/js/rhodecode/i18n/pt.js @@ -6,6 +6,8 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + ', and {0} file changed.': ', and {0} file changed.', + ', and {0} files changed.': ', and {0} files changed.', '{0} file changed, ': '{0} file changed, ', '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Adicionar outro comentário', @@ -27,6 +29,8 @@ var _TM = { 'Comment body was not changed.': 'Comment body was not changed.', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', + 'Compare summary: {0} commit': 'Compare summary: {0} commit', + 'Compare summary: {0} commits': 'Compare summary: {0} commits', 'Context file: ': 'Context file: ', 'Delete': 'Excluir', 'Delete this comment?': 'Delete this comment?', @@ -64,6 +68,7 @@ var _TM = { 'No repository groups available yet.': 'No repository groups available yet.', 'No repository groups present.': 'No repository groups present.', 'No results': 'No results', + 'No review rules set.': 'No review rules set.', 'No ssh keys available yet.': 'No ssh keys available yet.', 'No tags available yet.': 'No tags available yet.', 'No user groups available yet.': 'No user groups available yet.', @@ -101,11 +106,13 @@ var _TM = { 'Stop following this repository': 'Parar de seguir este repositório', 'Stopped watching this repository': 'Stopped watching this repository', 'Submitting...': 'Enviando...', + 'Switch target repository with the source.': 'Switch target repository with the source.', 'Switch to chat': 'Switch to chat', 'Switch to comment': 'Switch to comment', 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There are no commits to merge.': 'There are no commits to merge.', 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', diff --git a/rhodecode/public/js/rhodecode/i18n/ru.js b/rhodecode/public/js/rhodecode/i18n/ru.js --- a/rhodecode/public/js/rhodecode/i18n/ru.js +++ b/rhodecode/public/js/rhodecode/i18n/ru.js @@ -6,6 +6,8 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + ', and {0} file changed.': ', and {0} file changed.', + ', and {0} files changed.': ', and {0} files changed.', '{0} file changed, ': '{0} file changed, ', '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Добавить другой комментарий', @@ -27,6 +29,8 @@ var _TM = { 'Comment body was not changed.': 'Comment body was not changed.', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', + 'Compare summary: {0} commit': 'Compare summary: {0} commit', + 'Compare summary: {0} commits': 'Compare summary: {0} commits', 'Context file: ': 'Context file: ', 'Delete': 'Удалить', 'Delete this comment?': 'Delete this comment?', @@ -64,6 +68,7 @@ var _TM = { 'No repository groups available yet.': 'No repository groups available yet.', 'No repository groups present.': 'No repository groups present.', 'No results': 'No results', + 'No review rules set.': 'No review rules set.', 'No ssh keys available yet.': 'No ssh keys available yet.', 'No tags available yet.': 'No tags available yet.', 'No user groups available yet.': 'No user groups available yet.', @@ -101,11 +106,13 @@ var _TM = { 'Stop following this repository': 'Отменить наблюдение за репозиторием', 'Stopped watching this repository': 'Stopped watching this repository', 'Submitting...': 'Применение...', + 'Switch target repository with the source.': 'Switch target repository with the source.', 'Switch to chat': 'Switch to chat', 'Switch to comment': 'Switch to comment', 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There are no commits to merge.': 'There are no commits to merge.', 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', diff --git a/rhodecode/public/js/rhodecode/i18n/zh.js b/rhodecode/public/js/rhodecode/i18n/zh.js --- a/rhodecode/public/js/rhodecode/i18n/zh.js +++ b/rhodecode/public/js/rhodecode/i18n/zh.js @@ -6,6 +6,8 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + ', and {0} file changed.': ', and {0} file changed.', + ', and {0} files changed.': ', and {0} files changed.', '{0} file changed, ': '{0} file changed, ', '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Add another comment', @@ -27,6 +29,8 @@ var _TM = { 'Comment body was not changed.': 'Comment body was not changed.', 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', + 'Compare summary: {0} commit': 'Compare summary: {0} commit', + 'Compare summary: {0} commits': 'Compare summary: {0} commits', 'Context file: ': 'Context file: ', 'Delete': '删除', 'Delete this comment?': 'Delete this comment?', @@ -64,6 +68,7 @@ var _TM = { 'No repository groups available yet.': 'No repository groups available yet.', 'No repository groups present.': 'No repository groups present.', 'No results': 'No results', + 'No review rules set.': 'No review rules set.', 'No ssh keys available yet.': 'No ssh keys available yet.', 'No tags available yet.': 'No tags available yet.', 'No user groups available yet.': 'No user groups available yet.', @@ -101,11 +106,13 @@ var _TM = { 'Stop following this repository': '停止关注该版本库', 'Stopped watching this repository': 'Stopped watching this repository', 'Submitting...': '提交中……', + 'Switch target repository with the source.': 'Switch target repository with the source.', 'Switch to chat': 'Switch to chat', 'Switch to comment': 'Switch to comment', 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There are no commits to merge.': 'There are no commits to merge.', 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.',