release: merge back stable branch into default
marcink -
r3206:1632552e merge default
Not Reviewed
Show More
Add another comment
TODOs: 0 unresolved 0 Resolved
COMMENTS: 0 General 0 Inline
@@ -44,3 +44,4
44 5468fc89e708bd90e413cd0d54350017abbdbc0e v4.13.1
44 5468fc89e708bd90e413cd0d54350017abbdbc0e v4.13.1
45 610d621550521c314ee97b3d43473ac0bcf06fb8 v4.13.2
45 610d621550521c314ee97b3d43473ac0bcf06fb8 v4.13.2
46 7dc62c090881fb5d03268141e71e0940d7c3295d v4.13.3
46 7dc62c090881fb5d03268141e71e0940d7c3295d v4.13.3
47 9151328c1c46b72ba6f00d7640d9141e75aa1ca2 v4.14.0
This diff has been collapsed as it changes many lines, (1445 lines changed) Show them Hide them
@@ -6,9 +6,9
6 #, fuzzy
6 #, fuzzy
7 msgid ""
7 msgid ""
8 msgstr ""
8 msgstr ""
9 "Project-Id-Version: rhodecode-enterprise-ce 4.13.0\n"
9 "Project-Id-Version: rhodecode-enterprise-ce 4.14.0\n"
10 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
10 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
11 "POT-Creation-Date: 2018-09-04 13:42+0200\n"
11 "POT-Creation-Date: 2018-11-03 10:41+0100\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -42,7 +42,7
42 msgstr ""
42 msgstr ""
43
43
44 #: rhodecode/apps/admin/navigation.py:82
44 #: rhodecode/apps/admin/navigation.py:82
45 #: rhodecode/integrations/types/email.py:176
45 #: rhodecode/integrations/types/email.py:174
46 #: rhodecode/templates/register.mako:91
46 #: rhodecode/templates/register.mako:91
47 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48
47 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48
48 #: rhodecode/templates/admin/users/user_add.mako:86
48 #: rhodecode/templates/admin/users/user_add.mako:86
@@ -117,11 +117,11
117 msgid "Error occurred during update of default values"
117 msgid "Error occurred during update of default values"
118 msgstr ""
118 msgstr ""
119
119
120 #: rhodecode/apps/admin/views/exception_tracker.py:136
120 #: rhodecode/apps/admin/views/exception_tracker.py:142
121 msgid "Removed {} Exceptions"
121 msgid "Removed {} Exceptions"
122 msgstr ""
122 msgstr ""
123
123
124 #: rhodecode/apps/admin/views/exception_tracker.py:153
124 #: rhodecode/apps/admin/views/exception_tracker.py:159
125 msgid "Removed Exception {}"
125 msgid "Removed Exception {}"
126 msgstr ""
126 msgstr ""
127
127
@@ -148,16 +148,16
148 #: rhodecode/templates/admin/integrations/list.mako:174
148 #: rhodecode/templates/admin/integrations/list.mako:174
149 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5
149 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5
150 #: rhodecode/templates/base/issue_tracker_settings.mako:60
150 #: rhodecode/templates/base/issue_tracker_settings.mako:60
151 #: rhodecode/templates/data_table/_dt_elements.mako:166
151 #: rhodecode/templates/data_table/_dt_elements.mako:167
152 #: rhodecode/templates/data_table/_dt_elements.mako:240
152 #: rhodecode/templates/data_table/_dt_elements.mako:241
153 #: rhodecode/templates/data_table/_dt_elements.mako:253
154 #: rhodecode/templates/data_table/_dt_elements.mako:254
153 #: rhodecode/templates/data_table/_dt_elements.mako:254
155 #: rhodecode/templates/data_table/_dt_elements.mako:266
154 #: rhodecode/templates/data_table/_dt_elements.mako:255
155 #: rhodecode/templates/data_table/_dt_elements.mako:267
156 #: rhodecode/templates/debug_style/buttons.html:128
156 #: rhodecode/templates/debug_style/buttons.html:128
157 #: rhodecode/templates/files/files_add.mako:208
157 #: rhodecode/templates/files/files_add.mako:208
158 #: rhodecode/templates/files/files_edit.mako:168
158 #: rhodecode/templates/files/files_edit.mako:168
159 #: rhodecode/templates/files/files_source.mako:54
159 #: rhodecode/templates/files/files_source.mako:58
160 #: rhodecode/templates/files/files_source.mako:57
160 #: rhodecode/templates/files/files_source.mako:61
161 #: rhodecode/templates/pullrequests/pullrequest_show.mako:64
161 #: rhodecode/templates/pullrequests/pullrequest_show.mako:64
162 #: rhodecode/templates/pullrequests/pullrequest_show.mako:347
162 #: rhodecode/templates/pullrequests/pullrequest_show.mako:347
163 #: rhodecode/templates/user_group/profile.mako:7
163 #: rhodecode/templates/user_group/profile.mako:7
@@ -517,7 +517,7
517 msgstr ""
517 msgstr ""
518
518
519 #: rhodecode/apps/admin/views/users.py:594
519 #: rhodecode/apps/admin/views/users.py:594
520 #: rhodecode/apps/user_group/views/__init__.py:474
520 #: rhodecode/apps/user_group/views/__init__.py:479
521 msgid "An error occurred during permissions saving"
521 msgid "An error occurred during permissions saving"
522 msgstr ""
522 msgstr ""
523
523
@@ -649,11 +649,9
649 msgid "1 month"
649 msgid "1 month"
650 msgstr ""
650 msgstr ""
651
651
652 #: rhodecode/apps/gist/views.py:64
652 #: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:41413
653 #: rhodecode/public/js/rhodecode-components.js:54572
654 #: rhodecode/public/js/scripts.js:41322
655 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
653 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
656 #: rhodecode/public/js/src/rhodecode.js:502
654 #: rhodecode/public/js/src/rhodecode.js:508
657 msgid "Lifetime"
655 msgid "Lifetime"
658 msgstr ""
656 msgstr ""
659
657
@@ -678,7 +676,7
678 #: rhodecode/templates/admin/gists/show.mako:74
676 #: rhodecode/templates/admin/gists/show.mako:74
679 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35
677 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:35
680 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31
678 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31
681 #: rhodecode/templates/data_table/_dt_elements.mako:323
679 #: rhodecode/templates/data_table/_dt_elements.mako:324
682 msgid "never"
680 msgid "never"
683 msgstr ""
681 msgstr ""
684
682
@@ -704,15 +702,15
704 msgid "Error occurred during update of gist %s"
702 msgid "Error occurred during update of gist %s"
705 msgstr ""
703 msgstr ""
706
704
707 #: rhodecode/apps/home/views.py:295
705 #: rhodecode/apps/home/views.py:296
708 #: rhodecode/apps/repository/views/repo_pull_requests.py:784
706 #: rhodecode/apps/repository/views/repo_pull_requests.py:859
709 #: rhodecode/templates/admin/my_account/my_account.mako:41
707 #: rhodecode/templates/admin/my_account/my_account.mako:41
710 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:197
708 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:197
711 #: rhodecode/templates/admin/repos/repo_add.mako:15
709 #: rhodecode/templates/admin/repos/repo_add.mako:15
712 #: rhodecode/templates/admin/repos/repo_add.mako:19
710 #: rhodecode/templates/admin/repos/repo_add.mako:19
713 #: rhodecode/templates/admin/users/user_edit_advanced.mako:11
711 #: rhodecode/templates/admin/users/user_edit_advanced.mako:11
714 #: rhodecode/templates/base/base.mako:78 rhodecode/templates/base/base.mako:150
712 #: rhodecode/templates/base/base.mako:78 rhodecode/templates/base/base.mako:150
715 #: rhodecode/templates/base/base.mako:655
713 #: rhodecode/templates/base/base.mako:660
716 msgid "Repositories"
714 msgid "Repositories"
717 msgstr ""
715 msgstr ""
718
716
@@ -786,12 +784,12
786 msgid "Error occurred during deletion of repository group %s"
784 msgid "Error occurred during deletion of repository group %s"
787 msgstr ""
785 msgstr ""
788
786
789 #: rhodecode/apps/repo_group/views/repo_group_permissions.py:74
787 #: rhodecode/apps/repo_group/views/repo_group_permissions.py:76
790 #: rhodecode/apps/user_group/views/__init__.py:346
788 #: rhodecode/apps/user_group/views/__init__.py:346
791 msgid "Cannot change permission for yourself as admin"
789 msgid "Cannot change permission for yourself as admin"
792 msgstr ""
790 msgstr ""
793
791
794 #: rhodecode/apps/repo_group/views/repo_group_permissions.py:98
792 #: rhodecode/apps/repo_group/views/repo_group_permissions.py:100
795 msgid "Repository Group permissions updated"
793 msgid "Repository Group permissions updated"
796 msgstr ""
794 msgstr ""
797
795
@@ -813,13 +811,13
813 msgstr ""
811 msgstr ""
814
812
815 #: rhodecode/apps/repository/views/repo_changelog.py:66
813 #: rhodecode/apps/repository/views/repo_changelog.py:66
816 #: rhodecode/apps/repository/views/repo_compare.py:66
814 #: rhodecode/apps/repository/views/repo_compare.py:63
817 #: rhodecode/apps/repository/views/repo_pull_requests.py:647
815 #: rhodecode/apps/repository/views/repo_pull_requests.py:722
818 msgid "There are no commits yet"
816 msgid "There are no commits yet"
819 msgstr ""
817 msgstr ""
820
818
821 #: rhodecode/apps/repository/views/repo_changelog.py:71
819 #: rhodecode/apps/repository/views/repo_changelog.py:71
822 #: rhodecode/apps/repository/views/repo_commits.py:199
820 #: rhodecode/apps/repository/views/repo_commits.py:111
823 #: rhodecode/apps/repository/views/repo_files.py:162
821 #: rhodecode/apps/repository/views/repo_files.py:162
824 #: rhodecode/apps/repository/views/repo_files.py:182
822 #: rhodecode/apps/repository/views/repo_files.py:182
825 msgid "No such commit exists for this repository"
823 msgid "No such commit exists for this repository"
@@ -840,61 +838,37
840 msgid "Created repository %s"
838 msgid "Created repository %s"
841 msgstr ""
839 msgstr ""
842
840
843 #: rhodecode/apps/repository/views/repo_commits.py:74
841 #: rhodecode/apps/repository/views/repo_commits.py:327
844 msgid "Show whitespace"
842 #: rhodecode/apps/repository/views/repo_pull_requests.py:1287
845 msgstr ""
846
847 #: rhodecode/apps/repository/views/repo_commits.py:75
848 msgid "Show whitespace for all diffs"
849 msgstr ""
850
851 #: rhodecode/apps/repository/views/repo_commits.py:81
852 msgid "Ignore whitespace"
853 msgstr ""
854
855 #: rhodecode/apps/repository/views/repo_commits.py:82
856 msgid "Ignore whitespace for all diffs"
857 msgstr ""
858
859 #: rhodecode/apps/repository/views/repo_commits.py:140
860 msgid "Increase context"
861 msgstr ""
862
863 #: rhodecode/apps/repository/views/repo_commits.py:141
864 msgid "Increase context for all diffs"
865 msgstr ""
866
867 #: rhodecode/apps/repository/views/repo_commits.py:415
868 #: rhodecode/apps/repository/views/repo_pull_requests.py:1211
869 #, python-format
843 #, python-format
870 msgid "Status change %(transition_icon)s %(status)s"
844 msgid "Status change %(transition_icon)s %(status)s"
871 msgstr ""
845 msgstr ""
872
846
873 #: rhodecode/apps/repository/views/repo_commits.py:460
847 #: rhodecode/apps/repository/views/repo_commits.py:372
874 msgid "Changing the status of a commit associated with a closed pull request is not allowed"
848 msgid "Changing the status of a commit associated with a closed pull request is not allowed"
875 msgstr ""
849 msgstr ""
876
850
877 #: rhodecode/apps/repository/views/repo_compare.py:104
851 #: rhodecode/apps/repository/views/repo_compare.py:101
878 msgid "Select commit"
852 msgid "Select commit"
879 msgstr ""
853 msgstr ""
880
854
881 #: rhodecode/apps/repository/views/repo_compare.py:171
855 #: rhodecode/apps/repository/views/repo_compare.py:172
882 msgid "Could not find the source repo: `{}`"
856 msgid "Could not find the source repo: `{}`"
883 msgstr ""
857 msgstr ""
884
858
885 #: rhodecode/apps/repository/views/repo_compare.py:179
859 #: rhodecode/apps/repository/views/repo_compare.py:180
886 msgid "Could not find the target repo: `{}`"
860 msgid "Could not find the target repo: `{}`"
887 msgstr ""
861 msgstr ""
888
862
889 #: rhodecode/apps/repository/views/repo_compare.py:190
863 #: rhodecode/apps/repository/views/repo_compare.py:191
890 msgid "The comparison of two different kinds of remote repos is not available"
864 msgid "The comparison of two different kinds of remote repos is not available"
891 msgstr ""
865 msgstr ""
892
866
893 #: rhodecode/apps/repository/views/repo_compare.py:229
867 #: rhodecode/apps/repository/views/repo_compare.py:230
894 msgid "Could not compare repos with different large file settings"
868 msgid "Could not compare repos with different large file settings"
895 msgstr ""
869 msgstr ""
896
870
897 #: rhodecode/apps/repository/views/repo_compare.py:275
871 #: rhodecode/apps/repository/views/repo_compare.py:276
898 #, python-format
872 #, python-format
899 msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s."
873 msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s."
900 msgstr ""
874 msgstr ""
@@ -953,12 +927,12
953
927
954 #: rhodecode/apps/repository/views/repo_files.py:927
928 #: rhodecode/apps/repository/views/repo_files.py:927
955 #: rhodecode/apps/repository/views/repo_summary.py:340
929 #: rhodecode/apps/repository/views/repo_summary.py:340
956 #: rhodecode/model/pull_request.py:1445 rhodecode/model/scm.py:795
930 #: rhodecode/model/pull_request.py:1452 rhodecode/model/scm.py:811
957 #: rhodecode/templates/base/vcs_settings.mako:235
931 #: rhodecode/templates/base/vcs_settings.mako:235
958 msgid "Branches"
932 msgid "Branches"
959 msgstr ""
933 msgstr ""
960
934
961 #: rhodecode/apps/repository/views/repo_files.py:931 rhodecode/model/scm.py:810
935 #: rhodecode/apps/repository/views/repo_files.py:931 rhodecode/model/scm.py:826
962 #: rhodecode/templates/base/vcs_settings.mako:260
936 #: rhodecode/templates/base/vcs_settings.mako:260
963 msgid "Tags"
937 msgid "Tags"
964 msgstr ""
938 msgstr ""
@@ -1033,60 +1007,60
1033 msgid "An error occurred during repository forking %s"
1007 msgid "An error occurred during repository forking %s"
1034 msgstr ""
1008 msgstr ""
1035
1009
1036 #: rhodecode/apps/repository/views/repo_permissions.py:85
1010 #: rhodecode/apps/repository/views/repo_permissions.py:87
1037 msgid "Repository permissions updated"
1011 msgid "Repository permissions updated"
1038 msgstr ""
1012 msgstr ""
1039
1013
1040 #: rhodecode/apps/repository/views/repo_pull_requests.py:677
1014 #: rhodecode/apps/repository/views/repo_pull_requests.py:752
1041 msgid "Commit does not exist"
1015 msgid "Commit does not exist"
1042 msgstr ""
1016 msgstr ""
1043
1017
1044 #: rhodecode/apps/repository/views/repo_pull_requests.py:815
1018 #: rhodecode/apps/repository/views/repo_pull_requests.py:890
1045 msgid "Error creating pull request: {}"
1019 msgid "Error creating pull request: {}"
1046 msgstr ""
1020 msgstr ""
1047
1021
1048 #: rhodecode/apps/repository/views/repo_pull_requests.py:840
1022 #: rhodecode/apps/repository/views/repo_pull_requests.py:915
1049 msgid "Not Enough permissions to source repo `{}`."
1023 msgid "Not Enough permissions to source repo `{}`."
1050 msgstr ""
1024 msgstr ""
1051
1025
1052 #: rhodecode/apps/repository/views/repo_pull_requests.py:855
1026 #: rhodecode/apps/repository/views/repo_pull_requests.py:930
1053 msgid "Not Enough permissions to target repo `{}`."
1027 msgid "Not Enough permissions to target repo `{}`."
1054 msgstr ""
1028 msgstr ""
1055
1029
1056 #: rhodecode/apps/repository/views/repo_pull_requests.py:918
1030 #: rhodecode/apps/repository/views/repo_pull_requests.py:993
1057 msgid "Successfully opened new pull request"
1031 msgid "Successfully opened new pull request"
1058 msgstr ""
1032 msgstr ""
1059
1033
1060 #: rhodecode/apps/repository/views/repo_pull_requests.py:921
1034 #: rhodecode/apps/repository/views/repo_pull_requests.py:996
1061 msgid "Error occurred during creation of this pull request."
1035 msgid "Error occurred during creation of this pull request."
1062 msgstr ""
1036 msgstr ""
1063
1037
1064 #: rhodecode/apps/repository/views/repo_pull_requests.py:952
1065 #: rhodecode/apps/repository/views/repo_pull_requests.py:986
1066 msgid "Cannot update closed pull requests."
1067 msgstr ""
1068
1069 #: rhodecode/apps/repository/views/repo_pull_requests.py:992
1070 msgid "Pull request title & description updated."
1071 msgstr ""
1072
1073 #: rhodecode/apps/repository/views/repo_pull_requests.py:1011
1074 msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits. Source of changes: {change_source}"
1075 msgstr ""
1076
1077 #: rhodecode/apps/repository/views/repo_pull_requests.py:1027
1038 #: rhodecode/apps/repository/views/repo_pull_requests.py:1027
1039 #: rhodecode/apps/repository/views/repo_pull_requests.py:1061
1040 msgid "Cannot update closed pull requests."
1041 msgstr ""
1042
1043 #: rhodecode/apps/repository/views/repo_pull_requests.py:1067
1044 msgid "Pull request title & description updated."
1045 msgstr ""
1046
1047 #: rhodecode/apps/repository/views/repo_pull_requests.py:1086
1048 msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits. Source of changes: {change_source}"
1049 msgstr ""
1050
1051 #: rhodecode/apps/repository/views/repo_pull_requests.py:1102
1078 msgid "Reload page"
1052 msgid "Reload page"
1079 msgstr ""
1053 msgstr ""
1080
1054
1081 #: rhodecode/apps/repository/views/repo_pull_requests.py:1092
1055 #: rhodecode/apps/repository/views/repo_pull_requests.py:1167
1082 msgid "Pull request was successfully merged and closed."
1056 msgid "Pull request was successfully merged and closed."
1083 msgstr ""
1057 msgstr ""
1084
1058
1085 #: rhodecode/apps/repository/views/repo_pull_requests.py:1116
1059 #: rhodecode/apps/repository/views/repo_pull_requests.py:1191
1086 msgid "Pull request reviewers updated."
1060 msgid "Pull request reviewers updated."
1087 msgstr ""
1061 msgstr ""
1088
1062
1089 #: rhodecode/apps/repository/views/repo_pull_requests.py:1142
1063 #: rhodecode/apps/repository/views/repo_pull_requests.py:1217
1090 msgid "Successfully deleted pull request"
1064 msgid "Successfully deleted pull request"
1091 msgstr ""
1065 msgstr ""
1092
1066
@@ -1112,7 +1086,7
1112 msgstr ""
1086 msgstr ""
1113
1087
1114 #: rhodecode/apps/repository/views/repo_settings.py:215
1088 #: rhodecode/apps/repository/views/repo_settings.py:215
1115 #: rhodecode/apps/repository/views/repo_settings_advanced.py:228
1089 #: rhodecode/apps/repository/views/repo_settings_advanced.py:294
1116 msgid "An error occurred during unlocking"
1090 msgid "An error occurred during unlocking"
1117 msgstr ""
1091 msgstr ""
1118
1092
@@ -1120,64 +1094,78
1120 msgid "An error occurred during deletion of repository stats"
1094 msgid "An error occurred during deletion of repository stats"
1121 msgstr ""
1095 msgstr ""
1122
1096
1123 #: rhodecode/apps/repository/views/repo_settings_advanced.py:89
1097 #: rhodecode/apps/repository/views/repo_settings_advanced.py:103
1098 #, python-format
1099 msgid "Archived repository `%s`"
1100 msgstr ""
1101
1102 #: rhodecode/apps/repository/views/repo_settings_advanced.py:108
1103 #, python-format
1104 msgid "An error occurred during archiving of `%s`"
1105 msgstr ""
1106
1107 #: rhodecode/apps/repository/views/repo_settings_advanced.py:146
1124 #, python-format
1108 #, python-format
1125 msgid "Detached %s forks"
1109 msgid "Detached %s forks"
1126 msgstr ""
1110 msgstr ""
1127
1111
1128 #: rhodecode/apps/repository/views/repo_settings_advanced.py:92
1129 #, python-format
1130 msgid "Deleted %s forks"
1131 msgstr ""
1132
1133 #: rhodecode/apps/repository/views/repo_settings_advanced.py:105
1134 #, python-format
1135 msgid "Deleted repository `%s`"
1136 msgstr ""
1137
1138 #: rhodecode/apps/repository/views/repo_settings_advanced.py:112
1139 msgid "detach or delete"
1140 msgstr ""
1141
1142 #: rhodecode/apps/repository/views/repo_settings_advanced.py:113
1143 msgid "Cannot delete `{repo}` it still contains attached forks. Try using {delete_or_detach} option."
1144 msgstr ""
1145
1146 #: rhodecode/apps/repository/views/repo_settings_advanced.py:123
1147 #, python-format
1148 msgid "An error occurred during deletion of `%s`"
1149 msgstr ""
1150
1151 #: rhodecode/apps/repository/views/repo_settings_advanced.py:148
1112 #: rhodecode/apps/repository/views/repo_settings_advanced.py:148
1113 #, python-format
1114 msgid "Deleted %s forks"
1115 msgstr ""
1116
1117 #: rhodecode/apps/repository/views/repo_settings_advanced.py:157
1118 #, python-format
1119 msgid "Deleted repository `%s`"
1120 msgstr ""
1121
1122 #: rhodecode/apps/repository/views/repo_settings_advanced.py:164
1123 msgid "detach or delete"
1124 msgstr ""
1125
1126 #: rhodecode/apps/repository/views/repo_settings_advanced.py:165
1127 msgid "Cannot delete `{repo}` it still contains attached forks. Try using {delete_or_detach} option."
1128 msgstr ""
1129
1130 #: rhodecode/apps/repository/views/repo_settings_advanced.py:180
1131 msgid "Cannot delete `{repo}` it still contains {num} attached pull requests. Consider archiving the repository instead."
1132 msgstr ""
1133
1134 #: rhodecode/apps/repository/views/repo_settings_advanced.py:189
1135 #, python-format
1136 msgid "An error occurred during deletion of `%s`"
1137 msgstr ""
1138
1139 #: rhodecode/apps/repository/views/repo_settings_advanced.py:214
1152 msgid "Updated repository visibility in public journal"
1140 msgid "Updated repository visibility in public journal"
1153 msgstr ""
1141 msgstr ""
1154
1142
1155 #: rhodecode/apps/repository/views/repo_settings_advanced.py:152
1143 #: rhodecode/apps/repository/views/repo_settings_advanced.py:218
1156 msgid "An error occurred during setting this repository in public journal"
1144 msgid "An error occurred during setting this repository in public journal"
1157 msgstr ""
1145 msgstr ""
1158
1146
1159 #: rhodecode/apps/repository/views/repo_settings_advanced.py:188
1147 #: rhodecode/apps/repository/views/repo_settings_advanced.py:254
1160 msgid "Nothing"
1148 msgid "Nothing"
1161 msgstr ""
1149 msgstr ""
1162
1150
1163 #: rhodecode/apps/repository/views/repo_settings_advanced.py:191
1151 #: rhodecode/apps/repository/views/repo_settings_advanced.py:257
1164 #, python-format
1152 #, python-format
1165 msgid "Marked repo %s as fork of %s"
1153 msgid "Marked repo %s as fork of %s"
1166 msgstr ""
1154 msgstr ""
1167
1155
1168 #: rhodecode/apps/repository/views/repo_settings_advanced.py:198
1156 #: rhodecode/apps/repository/views/repo_settings_advanced.py:264
1169 msgid "An error occurred during this operation"
1157 msgid "An error occurred during this operation"
1170 msgstr ""
1158 msgstr ""
1171
1159
1172 #: rhodecode/apps/repository/views/repo_settings_advanced.py:222
1160 #: rhodecode/apps/repository/views/repo_settings_advanced.py:288
1173 msgid "Locked repository"
1161 msgid "Locked repository"
1174 msgstr ""
1162 msgstr ""
1175
1163
1176 #: rhodecode/apps/repository/views/repo_settings_advanced.py:225
1164 #: rhodecode/apps/repository/views/repo_settings_advanced.py:291
1177 msgid "Unlocked repository"
1165 msgid "Unlocked repository"
1178 msgstr ""
1166 msgstr ""
1179
1167
1180 #: rhodecode/apps/repository/views/repo_settings_advanced.py:245
1168 #: rhodecode/apps/repository/views/repo_settings_advanced.py:311
1181 msgid "installed updated hooks into this repository"
1169 msgid "installed updated hooks into this repository"
1182 msgstr ""
1170 msgstr ""
1183
1171
@@ -1257,15 +1245,15
1257 msgid "User Group permissions updated"
1245 msgid "User Group permissions updated"
1258 msgstr ""
1246 msgstr ""
1259
1247
1260 #: rhodecode/apps/user_group/views/__init__.py:454
1248 #: rhodecode/apps/user_group/views/__init__.py:459
1261 msgid "User Group global permissions updated successfully"
1249 msgid "User Group global permissions updated successfully"
1262 msgstr ""
1250 msgstr ""
1263
1251
1264 #: rhodecode/apps/user_group/views/__init__.py:536
1252 #: rhodecode/apps/user_group/views/__init__.py:541
1265 msgid "User Group synchronization updated successfully"
1253 msgid "User Group synchronization updated successfully"
1266 msgstr ""
1254 msgstr ""
1267
1255
1268 #: rhodecode/apps/user_group/views/__init__.py:540
1256 #: rhodecode/apps/user_group/views/__init__.py:545
1269 msgid "An error occurred during synchronization update"
1257 msgid "An error occurred during synchronization update"
1270 msgstr ""
1258 msgstr ""
1271
1259
@@ -1431,11 +1419,11
1431 msgstr ""
1419 msgstr ""
1432
1420
1433 #: rhodecode/authentication/plugins/auth_ldap.py:118
1421 #: rhodecode/authentication/plugins/auth_ldap.py:118
1434 #: rhodecode/integrations/types/webhook.py:92 rhodecode/templates/login.mako:50
1422 #: rhodecode/integrations/types/webhook.py:89 rhodecode/templates/login.mako:50
1435 #: rhodecode/templates/register.mako:58
1423 #: rhodecode/templates/register.mako:58
1436 #: rhodecode/templates/admin/my_account/my_account.mako:30
1424 #: rhodecode/templates/admin/my_account/my_account.mako:30
1437 #: rhodecode/templates/admin/users/user_add.mako:44
1425 #: rhodecode/templates/admin/users/user_add.mako:44
1438 #: rhodecode/templates/base/base.mako:326
1426 #: rhodecode/templates/base/base.mako:331
1439 #: rhodecode/templates/debug_style/login.html:45
1427 #: rhodecode/templates/debug_style/login.html:45
1440 msgid "Password"
1428 msgid "Password"
1441 msgstr ""
1429 msgstr ""
@@ -1694,14 +1682,14
1694 #: rhodecode/templates/changeset/changeset_file_comment.mako:144
1682 #: rhodecode/templates/changeset/changeset_file_comment.mako:144
1695 #: rhodecode/templates/changeset/changeset_file_comment.mako:146
1683 #: rhodecode/templates/changeset/changeset_file_comment.mako:146
1696 #: rhodecode/templates/changeset/changeset_file_comment.mako:149
1684 #: rhodecode/templates/changeset/changeset_file_comment.mako:149
1697 #: rhodecode/templates/data_table/_dt_elements.mako:171
1685 #: rhodecode/templates/data_table/_dt_elements.mako:172
1698 #: rhodecode/templates/data_table/_dt_elements.mako:244
1686 #: rhodecode/templates/data_table/_dt_elements.mako:245
1699 #: rhodecode/templates/data_table/_dt_elements.mako:258
1687 #: rhodecode/templates/data_table/_dt_elements.mako:259
1700 #: rhodecode/templates/data_table/_dt_elements.mako:270
1688 #: rhodecode/templates/data_table/_dt_elements.mako:271
1701 #: rhodecode/templates/debug_style/buttons.html:132
1689 #: rhodecode/templates/debug_style/buttons.html:132
1702 #: rhodecode/templates/files/files_source.mako:51
1703 #: rhodecode/templates/files/files_source.mako:55
1690 #: rhodecode/templates/files/files_source.mako:55
1704 #: rhodecode/templates/files/files_source.mako:58
1691 #: rhodecode/templates/files/files_source.mako:59
1692 #: rhodecode/templates/files/files_source.mako:62
1705 #: rhodecode/templates/pullrequests/pullrequest_show.mako:57
1693 #: rhodecode/templates/pullrequests/pullrequest_show.mako:57
1706 #: rhodecode/templates/pullrequests/pullrequest_show.mako:61
1694 #: rhodecode/templates/pullrequests/pullrequest_show.mako:61
1707 msgid "Delete"
1695 msgid "Delete"
@@ -1762,85 +1750,85
1762 msgid "Integration {integration_name} updated successfully."
1750 msgid "Integration {integration_name} updated successfully."
1763 msgstr ""
1751 msgstr ""
1764
1752
1765 #: rhodecode/integrations/types/email.py:158
1753 #: rhodecode/integrations/types/email.py:156
1766 msgid "Recipients"
1754 msgid "Recipients"
1767 msgstr ""
1755 msgstr ""
1768
1756
1769 #: rhodecode/integrations/types/email.py:159
1757 #: rhodecode/integrations/types/email.py:157
1770 msgid "Email addresses to send push events to"
1758 msgid "Email addresses to send push events to"
1771 msgstr ""
1759 msgstr ""
1772
1760
1773 #: rhodecode/integrations/types/email.py:164
1761 #: rhodecode/integrations/types/email.py:162
1774 #: rhodecode/integrations/types/email.py:165
1762 #: rhodecode/integrations/types/email.py:163
1775 msgid "Email address"
1763 msgid "Email address"
1776 msgstr ""
1764 msgstr ""
1777
1765
1778 #: rhodecode/integrations/types/email.py:177
1766 #: rhodecode/integrations/types/email.py:175
1779 msgid "Send repo push summaries to a list of recipients via email"
1767 msgid "Send repo push summaries to a list of recipients via email"
1780 msgstr ""
1768 msgstr ""
1781
1769
1782 #: rhodecode/integrations/types/hipchat.py:41
1783 msgid "Yellow"
1784 msgstr ""
1785
1786 #: rhodecode/integrations/types/hipchat.py:42
1770 #: rhodecode/integrations/types/hipchat.py:42
1787 msgid "Red"
1771 msgid "Yellow"
1788 msgstr ""
1772 msgstr ""
1789
1773
1790 #: rhodecode/integrations/types/hipchat.py:43
1774 #: rhodecode/integrations/types/hipchat.py:43
1791 msgid "Green"
1775 msgid "Red"
1792 msgstr ""
1776 msgstr ""
1793
1777
1794 #: rhodecode/integrations/types/hipchat.py:44
1778 #: rhodecode/integrations/types/hipchat.py:44
1795 msgid "Purple"
1779 msgid "Green"
1796 msgstr ""
1780 msgstr ""
1797
1781
1798 #: rhodecode/integrations/types/hipchat.py:45
1782 #: rhodecode/integrations/types/hipchat.py:45
1783 msgid "Purple"
1784 msgstr ""
1785
1786 #: rhodecode/integrations/types/hipchat.py:46
1799 msgid "Gray"
1787 msgid "Gray"
1800 msgstr ""
1788 msgstr ""
1801
1789
1802 #: rhodecode/integrations/types/hipchat.py:50
1803 msgid "Hipchat server URL"
1804 msgstr ""
1805
1806 #: rhodecode/integrations/types/hipchat.py:51
1790 #: rhodecode/integrations/types/hipchat.py:51
1791 msgid "Hipchat server URL"
1792 msgstr ""
1793
1794 #: rhodecode/integrations/types/hipchat.py:52
1807 msgid "Hipchat integration url."
1795 msgid "Hipchat integration url."
1808 msgstr ""
1796 msgstr ""
1809
1797
1810 #: rhodecode/integrations/types/hipchat.py:61
1811 msgid "Notify"
1812 msgstr ""
1813
1814 #: rhodecode/integrations/types/hipchat.py:62
1798 #: rhodecode/integrations/types/hipchat.py:62
1799 msgid "Notify"
1800 msgstr ""
1801
1802 #: rhodecode/integrations/types/hipchat.py:63
1815 msgid "Make a notification to the users in room."
1803 msgid "Make a notification to the users in room."
1816 msgstr ""
1804 msgstr ""
1817
1805
1818 #: rhodecode/integrations/types/hipchat.py:68
1819 msgid "Color"
1820 msgstr ""
1821
1822 #: rhodecode/integrations/types/hipchat.py:69
1806 #: rhodecode/integrations/types/hipchat.py:69
1807 msgid "Color"
1808 msgstr ""
1809
1810 #: rhodecode/integrations/types/hipchat.py:70
1823 msgid "Background color of message."
1811 msgid "Background color of message."
1824 msgstr ""
1812 msgstr ""
1825
1813
1826 #: rhodecode/integrations/types/hipchat.py:101
1827 msgid "Hipchat"
1828 msgstr ""
1829
1830 #: rhodecode/integrations/types/hipchat.py:102
1814 #: rhodecode/integrations/types/hipchat.py:102
1815 msgid "Hipchat"
1816 msgstr ""
1817
1818 #: rhodecode/integrations/types/hipchat.py:103
1831 msgid "Send events such as repo pushes and pull requests to your hipchat channel."
1819 msgid "Send events such as repo pushes and pull requests to your hipchat channel."
1832 msgstr ""
1820 msgstr ""
1833
1821
1834 #: rhodecode/integrations/types/slack.py:46
1835 msgid "Slack service URL"
1836 msgstr ""
1837
1838 #: rhodecode/integrations/types/slack.py:47
1822 #: rhodecode/integrations/types/slack.py:47
1823 msgid "Slack service URL"
1824 msgstr ""
1825
1826 #: rhodecode/integrations/types/slack.py:48
1839 msgid "This can be setup at the <a href=\"https://my.slack.com/services/new/incoming-webhook/\">slack app manager</a>"
1827 msgid "This can be setup at the <a href=\"https://my.slack.com/services/new/incoming-webhook/\">slack app manager</a>"
1840 msgstr ""
1828 msgstr ""
1841
1829
1842 #: rhodecode/integrations/types/slack.py:60
1830 #: rhodecode/integrations/types/slack.py:61
1843 #: rhodecode/integrations/types/webhook.py:82 rhodecode/templates/login.mako:43
1831 #: rhodecode/integrations/types/webhook.py:79 rhodecode/templates/login.mako:43
1844 #: rhodecode/templates/register.mako:46
1832 #: rhodecode/templates/register.mako:46
1845 #: rhodecode/templates/admin/admin_log_base.mako:7
1833 #: rhodecode/templates/admin/admin_log_base.mako:7
1846 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24
1834 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24
@@ -1850,7 +1838,7
1850 #: rhodecode/templates/admin/users/user_add.mako:35
1838 #: rhodecode/templates/admin/users/user_add.mako:35
1851 #: rhodecode/templates/admin/users/user_edit_profile.mako:39
1839 #: rhodecode/templates/admin/users/user_edit_profile.mako:39
1852 #: rhodecode/templates/admin/users/users.mako:71
1840 #: rhodecode/templates/admin/users/users.mako:71
1853 #: rhodecode/templates/base/base.mako:317
1841 #: rhodecode/templates/base/base.mako:322
1854 #: rhodecode/templates/debug_style/login.html:36
1842 #: rhodecode/templates/debug_style/login.html:36
1855 #: rhodecode/templates/email_templates/user_registration.mako:23
1843 #: rhodecode/templates/email_templates/user_registration.mako:23
1856 #: rhodecode/templates/user_group/profile.mako:46
1844 #: rhodecode/templates/user_group/profile.mako:46
@@ -1858,87 +1846,87
1858 msgid "Username"
1846 msgid "Username"
1859 msgstr ""
1847 msgstr ""
1860
1848
1861 #: rhodecode/integrations/types/slack.py:61
1849 #: rhodecode/integrations/types/slack.py:62
1862 msgid "Username to show notifications coming from."
1850 msgid "Username to show notifications coming from."
1863 msgstr ""
1851 msgstr ""
1864
1852
1865 #: rhodecode/integrations/types/slack.py:70
1866 msgid "Channel"
1867 msgstr ""
1868
1869 #: rhodecode/integrations/types/slack.py:71
1853 #: rhodecode/integrations/types/slack.py:71
1854 msgid "Channel"
1855 msgstr ""
1856
1857 #: rhodecode/integrations/types/slack.py:72
1870 msgid "Channel to send notifications to."
1858 msgid "Channel to send notifications to."
1871 msgstr ""
1859 msgstr ""
1872
1860
1873 #: rhodecode/integrations/types/slack.py:80
1874 msgid "Emoji"
1875 msgstr ""
1876
1877 #: rhodecode/integrations/types/slack.py:81
1861 #: rhodecode/integrations/types/slack.py:81
1862 msgid "Emoji"
1863 msgstr ""
1864
1865 #: rhodecode/integrations/types/slack.py:82
1878 msgid "Emoji to use eg. :studio_microphone:"
1866 msgid "Emoji to use eg. :studio_microphone:"
1879 msgstr ""
1867 msgstr ""
1880
1868
1881 #: rhodecode/integrations/types/slack.py:92
1882 msgid "Slack"
1883 msgstr ""
1884
1885 #: rhodecode/integrations/types/slack.py:93
1869 #: rhodecode/integrations/types/slack.py:93
1870 msgid "Slack"
1871 msgstr ""
1872
1873 #: rhodecode/integrations/types/slack.py:94
1886 msgid "Send events such as repo pushes and pull requests to your slack channel."
1874 msgid "Send events such as repo pushes and pull requests to your slack channel."
1887 msgstr ""
1875 msgstr ""
1888
1876
1889 #: rhodecode/integrations/types/webhook.py:51
1877 #: rhodecode/integrations/types/webhook.py:48
1890 msgid "Webhook URL"
1878 msgid "Webhook URL"
1891 msgstr ""
1879 msgstr ""
1892
1880
1893 #: rhodecode/integrations/types/webhook.py:53
1881 #: rhodecode/integrations/types/webhook.py:50
1894 msgid "URL to which Webhook should submit data. If used some of the variables would trigger multiple calls, like ${branch} or ${commit_id}. Webhook will be called as many times as unique objects in data in such cases."
1882 msgid "URL to which Webhook should submit data. If used some of the variables would trigger multiple calls, like ${branch} or ${commit_id}. Webhook will be called as many times as unique objects in data in such cases."
1895 msgstr ""
1883 msgstr ""
1896
1884
1897 #: rhodecode/integrations/types/webhook.py:71
1885 #: rhodecode/integrations/types/webhook.py:68
1898 msgid "Secret Token"
1886 msgid "Secret Token"
1899 msgstr ""
1887 msgstr ""
1900
1888
1901 #: rhodecode/integrations/types/webhook.py:72
1889 #: rhodecode/integrations/types/webhook.py:69
1902 msgid "Optional string used to validate received payloads. It will be sent together with event data in JSON"
1890 msgid "Optional string used to validate received payloads. It will be sent together with event data in JSON"
1903 msgstr &qu