diff --git a/kallithea/controllers/admin/repo_groups.py b/kallithea/controllers/admin/repo_groups.py --- a/kallithea/controllers/admin/repo_groups.py +++ b/kallithea/controllers/admin/repo_groups.py @@ -417,7 +417,7 @@ class RepoGroupsController(BaseControlle #action_logger(self.authuser, 'admin_changed_repo_permissions', # repo_name, self.ip_addr, self.sa) Session().commit() - h.flash(_('Repository Group permissions updated'), category='success') + h.flash(_('Repository group permissions updated'), category='success') return redirect(url('edit_repo_group_perms', group_name=group_name)) @HasRepoGroupPermissionAnyDecorator('group.admin') diff --git a/kallithea/controllers/admin/user_groups.py b/kallithea/controllers/admin/user_groups.py --- a/kallithea/controllers/admin/user_groups.py +++ b/kallithea/controllers/admin/user_groups.py @@ -317,7 +317,7 @@ class UserGroupsController(BaseControlle #action_logger(self.authuser, 'admin_changed_repo_permissions', # repo_name, self.ip_addr, self.sa) Session().commit() - h.flash(_('User Group permissions updated'), category='success') + h.flash(_('User group permissions updated'), category='success') return redirect(url('edit_user_group_perms', id=id)) @HasUserGroupPermissionAnyDecorator('usergroup.admin') diff --git a/kallithea/i18n/be/LC_MESSAGES/kallithea.po b/kallithea/i18n/be/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po @@ -717,7 +717,7 @@ msgid "Cannot revoke permission for your msgstr "Адміністратар не можа адклікаць свае прывелеі" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "Прывілеі групы рэпазітароў абноўлены" #: kallithea/controllers/admin/repo_groups.py:472 @@ -959,7 +959,7 @@ msgid "Target group cannot be the same" msgstr "Мэтавая група не можа быць такі ж" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "Прывілеі групы карыстачоў абноўлены" #: kallithea/controllers/admin/user_groups.py:440 @@ -1825,7 +1825,7 @@ msgid "New user registration" msgstr "Рэгістрацыя новага карыстача" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Вы не можаце рэдагаваць карыстача, паколькі гэта крытычна для працы ўсяго " "прыкладання" @@ -2926,7 +2926,7 @@ msgstr "бягучы IP-адрас" #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be managed " +"Your user is in an external source of record; some details cannot be managed " "here" msgstr "" @@ -4226,7 +4226,7 @@ msgid "Last Login" msgstr "Апошні ўваход" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4255,7 +4255,7 @@ msgstr "Не паказаны email. Калі ласка, абнавіце email карыстальніка." #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be " +"This user is in an external source of record (%s); some details cannot be " "managed here." msgstr "" diff --git a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po @@ -710,7 +710,7 @@ msgid "Cannot revoke permission for your msgstr "" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "" #: kallithea/controllers/admin/repo_groups.py:472 @@ -950,7 +950,7 @@ msgid "Target group cannot be the same" msgstr "" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "" #: kallithea/controllers/admin/user_groups.py:440 @@ -1809,7 +1809,7 @@ msgid "New user registration" msgstr "" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" #: kallithea/model/user.py:255 @@ -2885,7 +2885,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4177,7 +4177,7 @@ msgid "Last Login" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4206,7 +4206,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff --git a/kallithea/i18n/de/LC_MESSAGES/kallithea.po b/kallithea/i18n/de/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po @@ -725,7 +725,7 @@ msgid "Cannot revoke permission for your msgstr "Als Administrator kann man sich keine Berechtigungen entziehen" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "Berechtigungen der Repositoriumsgruppe aktualisiert" #: kallithea/controllers/admin/repo_groups.py:472 @@ -976,7 +976,7 @@ msgid "Target group cannot be the same" msgstr "Zielgruppe kann nicht die gleiche Gruppe sein" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "Berechtigungen der Benutzergruppe wurden aktualisiert" #: kallithea/controllers/admin/user_groups.py:440 @@ -1843,7 +1843,7 @@ msgid "New user registration" msgstr "Neue Benutzerregistrierung" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Sie können diesen Benutzer nicht editieren, da er von entscheidender " "Bedeutung für die gesamte Applikation ist" @@ -2961,7 +2961,7 @@ msgstr "Aktuelle IP-Adresse" #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4259,7 +4259,7 @@ msgid "Last Login" msgstr "Letzter Login" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "Mitglieder der Benutzergruppe" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4288,7 +4288,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff --git a/kallithea/i18n/en/LC_MESSAGES/kallithea.mo b/kallithea/i18n/en/LC_MESSAGES/kallithea.mo index dcd4d6cefda3d9e63281fda0398027c30805584b..1c0f22c4e5f9ca6147dc394a594d3398f6c11805 GIT binary patch literal 76366 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 z zEa{)G1s=QBVqA{?0`aGPfpzcVFVJ4}3(VVxB>vqmFfacS*z`-#yW5wThw(2lpQe6^ zb@8n)f!DS#p`V}r71H~Bh4_@fC%;1ar(dC+#5o86S)?u8F{~Ge6{@0kNZN3KGFZmkds(&r|%GdB$sE~X| zuSfY4*JE5yU61z8lK6kFhrdFH^`QIq^`P$&8-Pcn4e0+F8<4;22K1+J1M*+B0rd{w zAnU~j;B$xMyKe)=?coiW56^A@U0#&*e@iTq2JMBv z5kHe}P|wtF(67h8fxp6{Z)Bge5p-I(5%gFm@W+i9haDSH-(MTWFX21c4}Ax`T7HN4 zd@qL@2zveYBl=fs6XZ^tO$c}21b&Ka0v;1LfliYp-(#Cl z{^d>Lcf1Mf^ZHHDUt4a*Ib_~u;1%7Be%!Pf{k(NE#_^%epy%w(pv&CN;+L=)cm>uo{3Ew%u^^R}RT_bqZRz6JWu;4K)BsaqgdrfBBeggh`eiDC^pOL@m zp}pMh@&f&G6*yCZ%E-Xnh&{aoP7KZ}3h&uD+o&!FoOThX7Bw<5jiR?sPbE7C8O z^j=$0@6fHFLvSnfv+!1|lM^KU$*rL0+^wL?;;q2@!>#DgcT(RD2_Nwb+B@+V;D6>X z;Qv;?p#84Dp!|SekiYyFv~!)58~+RB+@xP%w|emx^kdC0;y*9tcKiZ-eA|$I(l+qf z>D$D9whef<--i0H+=lTg-Ud8IY!iEg65m@?mc5W{1vuum-B;P(XRe0)`!Yp#ZK@m>?iYo z#kt|OUorm8cA);NcZmP{4)K5Afq6T62j<&DJFstjOwxDlKz|SHKzp@!g04+=!e8OS zo#^MaJ3-f5cM9GTp0N|{J-1Wr&pXBbyc6|*zf;b`cS24axeM!R<6X$tWf$bnHM_(g zXcy$fQxe{?3-$lH3;jFtH^Ae613gau4dbN!20gFcZ}3-`^c%+ihu=_suY`}^jq+#g z2ENUAqn>kjgWucl20gA47~GBeD|Ukq@7ay|=IsU@-jedGcVnKc-;MG0{SN)0-tW+J zF8CeeQ1mtnxz9t$P^H@`zJAGJr$-S%KyF5QE1DcXa2f|5RN59Zswdw}nZ zJu*M{0FT9cK=%*!$aw4l{=Z1QzP%Wq27AH3=j;XlwUKb)UeQnYg3p3`q5nOy7ybTp zFY5VrFX*~wFWT|#L;J_=13stj!+18|2foSMhyGl&4}8#LAIb;!iGS`s>~n6}hyK2> zPy7M*0l&}pL2mxO4|3rj`w@TMexdVz;1v}(VL$90Q}<&$J{S1ge&BQRA2=^N;}7^N zT=fU`5$_1x^oRJ(AHY5(P;n1qfy_z1etzQk4FC%9*z1xkbGYd zkC6Xf|;<5;wNB0+U;;aJe6#j)sLdxAWk1CK?&!vt9$x{)B; zdBziDe}x6dqW`UG%D50@yF|~LsDBJW=C5%z(axlrzmKjS#it>tkjcOgOMmqLOpha$&;52hT4{=Gqv`D>M=Z#@qD(XbZi*s2!rxv&=a zsJn!t1X=GHOOWNpleIwauWNz-_S8Z>^^UKh=52F=${+T4;9qh)#^GjyJl`f07F{Q7Zi&}%J0 zo|hY?+zEA%PpgCeoKH~c*L5%tj5?s__&UI2W*yLZZXNV{WgXCSqd;HX8cMF5URU^~ zF7O#x7yV92`lEGG|G(>^{tb1(9|!89ANeN$UU&lfd)WyXpH3%W{Cl1Nz8iP~=rBa` z1x`SFA%bitxa|bc|Hu=;Uo8l-e7cMv>+?6Ci2SPwvOfFkiJ(JaJ>Wm09{M?<9>(+0 zdPsj&;HULa?{@5rS+#nRF7y{r!``Uq_yd`p+iF`?*dhgAUJ} zjQR8xLH1Xu^^Y3LU*R=^tUsMxAN}u8ALHAlKKT2}`oQDr`k1HJO8ofxpwFcGp!XCh zzpy^&`YJ)z+up7ZdYs$<^Xj|?n8%kl0Dl)W0KW`v0J_H;V1A?|-|doqe*=uuQw@N} ziw!UjmrFg{8-QPqZV0|=(h%j^Gz6VH6J)*Onueg~Jq^JxPe}NkhN%Cmh8V{m8)7`p zJq6`^o`U*A62AEql%IKu$bnN(eicEsQ>;4$bU(2X=1GS}kPkf?L4H*<0)BTj0{$}_ zfzB^W`iG5B-w%y|$BstepE{?4E-eJMITho6@u}d8YY6hXI)NbjD?D{7#`E09Xy>BF z2={D^@hWPJ@f$#p{S}gpf!B|XF&_IHqu)oI2EID;G|Z!m2wu+PNRa&%#-4`y_MV3N z4xEN|8lMinJBuLe)rF^n-)5hV^-4k0 zhp(Rn`LdcI`z!1u$o>kKHvymD*97A-tqJ&iVH4E%Srd%+A5B2_=1oDzOPYdTu4;<- zU{lchdI{gt6!^}T_>~e~-xPd(WHZ2e&4A~b0xxTZ@`rv*~~D+JkJ;Vmh@ zOxk;2!fRWgU+Y_dAAW6taq#7eK9&o*)E9VKF4}3D3%uIoqMnYqz^i*M@aiM^2T468 zxzPWDQf^i*)}@7#f1AYb%>~}ax2&Q36&es^e}%Cvf%j2o1HTi`M!VYCz`Oa`Xy<~n zF`n%ty*ojlrbhx=j;WPLXeD z8IhJ|HF;yna9E2Q*Cq|Kn(Ul66pc{!R5Y16OEhM1dc>$ajQZk6Fk~i-I28y*v@7*+ zIFu+e^vsz}YMd}IO+9F2&QYmH5~e~e5v95-Lg`2}&B=|$hlK(y&32mlnFuAq23HZV zNa6aaq62zLfC`pHlW_~Gi1JV*nJ}DRh>S)OW%dsh1$2zK`?pFk4SzHeaDJ)Cl%dBh zND(HFa;aei_-BXW-aYL=$7pm!xgH;(GIfmW5r3JXes@v>AC3l{0C9mQfP8U7PlO^t zLMj$DLy2fS#nD|uVM8-R0VA&@mB&yEgi1?QN;Djf0(lNd(}hgtzBZYw#HonBMMXB^ zeeLG7U_6?PQSTFshss!#Ae_uZ$d6F6oVuvcD%O!f4@MOL|4Ycj%sMC7+@D`1-NP46 za?B=Hj!;5!pc7O8P4kZsXj{s}LEQl>Y^Fz8VXcyQnvn@bh)a3;*mwtwu%RNVRC2h5 zF!SwMr+d3q8jZV#RTF|`nk7OgMJ88?kf}wYH0ktMjB2Osff6ld#LM&;VV0np2w~yenSrQIKjF#Tt{&3VZ0xf-cd0H>(lg`u`q2=ZIIusUYBMh3} zYGMtii5=0y;8PV7OO_C>X$d9KWWv|M&mB;pf{4JVv!r$8nCi>5$xz(Tii&!u@rWhO zGM;YgC*_L-^Rv{`bV!YAf-oS&yB8N1YF*-Ss^a`M7q(N~ z>EQPpv4ma{Hu8aw;p-3x@IRXGp>RO!#&lERUNqi3y;Z=OhG{`pfqq0_`-dx@x~UN} zLR4}D34IHyu~z}b80FCl!xno?mP8r#(9Nv*R_0_Z9MuCd9Rfr;eaxRg95e#>s~P2bD9jUzid%UNAYBzzUfp7@%vxnxC}D(2 zz)338tBeFW1!)n%Ul%$YiqWFSbIvGdQdf|iXIx54i8_W73yNO84nZP%IL!Z?)qn#9 zg_<4+(8MyS8lCu2S5iEn5_LZ$Ou0^SJ{ke3Tm)6@S3+fo$%rS3$+#;V3g{~aDwH9;$&`s>Na$LS(U-ETZk)Fg(~-#(QJ*l3b$fOMD3Q*%Fm4FPnro5 zGgVvRM$+py?FL8)B>o%p{=Y(uMB0CclS}yh-xEuQmz6cePSHx?1#aCDcf4qkTqJ(R zYC+luF-N}EArg(G%A-lhYV}vM1h=cNsM%Wl^dzB7D}b)B=4>Ty{4TtjD)%5<2eAg~TMrzQQW%MVd#>J=2IJ{JkV zLuGMu{UP(R99Mbkx|s034zUnxOPZNf;Zhoi zl%)h_PE-t4U80gs0=|x+h|WC4nvv_bmYZX?^jRA@`v>!!v%BjUr41!kbO9>eTH-qM;>ZvS8@dJ|;mDikB7I;wDJnC(ZTRkCv9UQY$$d2G}yB_LIcy zv9O*3J(bDeuxiTB&-c0P66&Xtl?r$4=Ut{O2XUwh8a8*{Zph}jkH@rMP{-@4Hhyp0;Ot4!eYn-jug)-j!8rBC%!8sDM1Q|%B#?b7(TV(qG=%N z6or*~hB;zMh)%R2=51@(z$OwyQ)a}KZmqj_QTC{r(KvVBZ$tu$hduEDqiO;KdcHQ0 zHv8qI@vyihW_52--TQ9phheQ5vPN-?p|%;+dG4JOGV+t8iv26hzla-@QI7ZbN}yx+ zH(c#fS|Ue4fU`g0u)U~TqsLO15R3~8&}1TQHey%C72A!_AeDq@Cl#@);?eYViiX2_ zOgNN6<>fkcj3kue9NvGaB^yFKU+b;N;KVQk>0vV}^dUmgzK!IrTi+#w6C}oY#GGZu zfQHpc42l9h)>wCB)ww5WF>GJ0uu?H18k;k;>)MXax8jx1Wr8M6s4AM7A{jfCu!6fcLx+7|E<$&vzVn3@(!*M)e^ zoI%ZT&R`SYE&TuMG9jbdmfT!ZT^^_HgW=4~nx1Ye0)|^dRXZPdHkK~c^ibg^tmVBw+quIEjr6d$lv?pJoMLnmj&de7tRPAY z_I1|HvXZDy(e^JfuXQGU4jZI={%!a=i`j(su(st+DF$p>Q5Fq5i+k*?I7>vSA~0*R zHLsPegOJ4Ht&NtTJ%_bh3q=CPNTnsQvR-azK_g=A-~OA5E2+0;nX4kZ^uc#oR<3j# zjYiWjuH>fV;C`|!5de+F`mHqk&S|oyN`zP#5DjCdt6)F`yJ8C~O6{8{qu17Ir7~~3 zb9L&!+d0z zV3c^5V|PflJgzR%W{CENtnoWbQfJnvNnrK0Teh~4ouiQ!yhR{cNXn44FKJKl7;*cD zI_xo3cWq7A)cWd`p75wp%n2(k$qIS5u8PCbmK0Z3dxzVF`wIIQ_uhK|bqDou<29^u@T7U!v{>tt5;E9Dst@zG7buS+15P=6o@)vrRw7^A{f4mVV+ zVp#QynuiM0j>yI_)iN3DVw%UOM>z9IJ(-j$2j2no6rj4CmN zRD=jo9gzYSw2ez$BE0|0$t@2>T83ENiR;9@aiw^wvsq-&HBzUNMy8CkeF~=K4mfg# zwK_>GMl>9exbTVmmNIQ@_*=3mLhPNIS)~DHAeJ9lv3-8)l@ZkSi3k>9uxa?uMVF% zD;8%)GhnT^hstQJeuv8E)>RIbHxr{AR_;Sk)G2fD@lDJ3-_>d>fCtH~>^Cl_1lynB z5M@YICuyf-rk5JY0>v}K+EZjqEnePzw#2H{mwtyx%oDVX&ur|@aIi%g;vyGJPrz$& z?h56?*+8jNW_N6wwbj>^y&IJC4;yOLbXOsTp86GXjChW{4@oSSke`3i`m9X4C5DJ? zl4Ll~=QXOUIhpA1wSL|m-2rSU~gNofcqThsIF1A z56aq;wlZl0qRKd7YXExMDT@|zlqy;^Q@UrYO&|AF(BNYvvY=3LX7X8rp1aQQ5dxbU;98VR*HuY%#! z-*5CflXd{*#%TWCqAZb!wP00B{W4p?VHBpPWF*3~b^MGtKSgkLgW*eg+Uec{WU4A$?(1$4yR&fW&ifJmlj#hKlA}~L z|4|zW`o*><^;b#b5;eMNEl!Y>4>C=~8H2TWhTv;w_bt zQdL>y3sZ?Qwh1L8Rz-2wVYV}1v}rEj?o!7>G39a?@f8%Z)OBxUDaP?uEAX?fSP+cR zqKjzFjL~fN6_oP<1L&K!uW0WpppLNbr|$8q(oM@TKy0GU($C`5J}<_Y@##xKtO_Mu zncq3hll>&0gQ>N>#EdHYlCl<1IlBxL0Hp_o68Sb>Rs1ka+mlu8%PN$2I&V)SuFYw> z0>R?e@}fP|ROqJ;YV;Dugv$k!v>haE3x`~Z%>H*YB9(f|O!LD_Mp$i8oIy1mM$3jW zHL_u*Q-KD8o2}GoS|lZ_15-sX;g!Sk=Au1ofR`A^Btlyet<8$aIr3YbU|JQh^{z^-Vwk0Q%^F-W4a>F3XaWwp`F1YX z_C!gQ0_PwF<|@l>?9qV=4szU5;IcaVt`N^4NB$}IP)dsH?5^X)ySDL8q@^8QX&5mz z#gyrQ=Y?{RB_TyRVFI={UF+MWL+74dU;<;b*;L^*Pmm0`(n#??&C>Xxce0?6^HrLQ zJZi1LswS=aY@t@mTU?7IaT-oFzyz-_@+XNodMJZN4;@=&+bGsUr)uFUfZsi$r1ImZ z66xw!Ur%<+tv`-n*eOvSrHxI9W*}cP){SF=N0Qg-nsgE60a%eww~hs z553a5KOwsl=ja5}TwJ^J4_-=*R>o2(zCVEBNoitLreD3HavuT6ryL793oQ!kPARuF ziGy-d3727xaJvxq6mzvt%~<}!++75p8X{<4gEt3As4^9lfC+?xA*#qeAmtx&?5loz zdZ=QQeZ(!iT(MRugkVbTCGIyYBMcP^#XJ?-D}+11Sn_$ZZnxku@^OS30o;6xTiHfB zr+L0!Q4Pis`e7-9DI=kRjsvrFmb60B%^}0Q859N5k}av`{3L=TV0&@m*aOQGvYHo@ z5dT!l74L8PE+A6nf|M1s4As_e)Bd6MFC^|np7mnKqXc_yh=ZFIVV{|(7|biH_K2G` z;Wi~Ht^<2gG(r({&AqFZXsbY6F`G1=j~JJ+$&QZXfg;(A_upZ0wb^q>nnawhVE&NvW<_ zx$cbwjsh*D9NaEIHL+gIMUA1Zy2M%ONkW@woZC7ir~O*Ub9mg_I$Gx+m8=*$J1X0<+?zdCeTD4t#rJV(7P3o|V!YET%Y#%r)e};>I71NspaHC7`K#rqPY=TQ-&p?!#J8EOGuiq9f$RO+ghu{b0N-> z3wixv3$(os6~;sA+O0Sp`8>`??tlp|SvkP5QrOiW=l|lXExXNp%LU(UrB_U1;5gPV z*_ExuwMtqQd!#cP?3F^mNXx~vn86ZYAN$tPa!a9#xwq=J@m~xwlc4 z$A)!IW4dB!HyOm}#iQzE-|c(l`fYjwUg{vh+Q$`oFMN1|=u?RHZYe9JTB2GR+&%GJ zzb5y~A`!q$$yPm+%x)LDg(ui1NUD|1AqTg-j+N{H6J zMjnKeE#&&z3>I_dvpd%2M~c(~>QA{LwgU753f{t`hHZ(#j6I~2r17yg77n^ALV+?b#}-R*!Yp`?5l=MfYRRj!oKLa z8ZB{f9raFlBn2$!vf98^&Wd-o9!{dmEM#TNbnx!kv$+G zO}T#ZVFOdW>M;W=&Oy(41m($4(mtgKv4(Eg-Yk5E%Q!eEXE;1(A;o9L@B+u$#AQpF zo@J!W+LgK+%cSdCOlsatt8J0odK zD|gJou)ewy5CiSV9k04z^}urTkh8Y5Yyl@<^&QPf&qGYVY6uO_5N}ow*$;ZC>MrCZ zyZ8N*3cu^-vYl*t-A%(G+UMb36}*S|P)Patz@dS+?be-cYO1Jzue4nOo6ti+zUU>} zU8>13zOsRp#e+I8Oj{puh8UCa=k0G_`xd3RjUqx>Qwtq^sY;xvc(4vxI;DLuVc(5X zqg-LOw4UVvRryFwIq7-s#Kqxs|~=*@}oEY=G$^v%4mi6qjikRIAU6yA*0pTq zcA>RvsnnGBWA~7$wjnB}>gm3U_E>*ZD@;{R!7&?t>p1ri&lMKq#Ud1ZC>dB2ZY*&@$L&RJ zdaWs%ejr}Nhq*clQRUEHYP;N~U(G8LpJgXU9>*mNpX+5!=jWmC`f*-U3+gNb*_5Ip zlGbyTJX|?uTAb&(gCgb2Cl9<>HdKm@#tzzxR5(5w}i2*{BbYP!CHgcw?#7)ymaKB(=zx*i!mEi>=>oQ>GM9(>9#vE9+t4opnv?slq z$8^1!EV~YFC&>|g^*PkF)Qri_HX^CcOT~a2h|1+gwbRSY9`ZtK5nh_`6;Jy*!dCA9yB)6GYlJhw)Wh7KN0kFnPAwPDMM*nEf<}0S{ScG3QhDS#+ zt@#=Jfr@FHlO7e9d$Mo>D`vMy{*!jalr0Hr+nMj{*S81%nd+b3?dPbp&QCr?U}9Ovq3MSRuAH7@q<&S6 zVeUBR5X2SfKIL#ldk!a@c+c;2`;AJ@ z$17&-EakNFSXVEUo3tK|kz$lAH{vv+uG=%tH4L*Ab51B4P`h4s>$Hwepr*3E4bI3| zm0AMq$`mH(R|fjA{3Oxh>#w}MoE3)GCiQxWa%1RE4bXls_fv+bHPlk%y87IC&!#QAzR?Jry}_8Qf^18i%UxEz;eCl%#B z91Y^Wm*Nw4T6JF_;&w}X1E8H+nwqlg^07-G$%1D9&mjC|&8N(IeA0fh#PUsW?^p+9 zIMhyG7fkEEa@F@qoVQ2k;mU$@Ag8Q6Q8l+?{UCXYk3d2)H zwF!T#Zuc{Lf1{Fs^E#Dxq$})crf$Jjo7eQr5D09`s%!iI99C(M+qLVRMO7L*1GT`! zVHb?Lvb3`HL!f9V;gm`9HgbKu$o&q!%5N$0CAj!%XH{fXPO5R4q>(UsZ0cYu>MWtz@cnKC#K!4eiyuM=Be9UAC<>DcxDgf~Gg4V8LG9>8<%dX=QS zlEhogd08QC0rlpxzcT@KJs`saoz>$Etje(nbp)IxOxfMgPPT1Y13m9pxc$?0d|E1F z4wY!*+sZ4n?OmfO#v>(ham+Q)zH4>pP1s@WzkGvw;^SLGe1mX~GNj5S2}-d(aWtgL z>Xaef7F*tX2!kABsOQeaQPMr4*IaH)|bxPI1ea(B@s^20oXt1LOt-Lm>o*fo^~t1al4UAX6A8+A zf-i5{@L=zY)yT+dkhR5l*_eEL})4fy0F#X3ImJVoet zKd_qVY4+>djBdxz5o_&z*5R+^B2iH2lQU+5Vg6?Xv7c1kz=-;6IV1KjQi#c0fD9uXNc;PKAz8cserhQ`e1mFOKWys)05eB z=jJ=cd?%^`aD@1KnLhWWB<26Ww8INLVxD4dGxL3+s;?_3IgP*a5iklcv8~6~mC+yD z)tp??(`l2yCzPBm?MA#EW6Q;m`{KIV!B|^v+f`h3iw{|b<0@vQPqgSnDCP^hZa`aa zo6|;t7AR&d)qVT;l=DOsZS1$r)$2ICDey(2X-Y%Jl{_AWyB%0R618QRNr8yrvmVGM z8j-wHp1nT%xnAPhv<8Mb%6A{L3zL&{Wfh^Ny73m@WOrS($EHZ;c)-&GaQKqnuBDV=OAV zkGlGrjM%s26_fDC^5k(2qOaEm9jao4mdTN?$#IYx64Uinumr!3@2No<uClbB(iQ8%CwrP8QUYmdB zwK-R7dvUuq7v;4%zfBv;m}j{cI{DgCro3}6;CyY*JEu)s%Eyl$JU>_B*NB@1$nGlbZcbYW6#+=@$6xcT%(8NzHyI)pM6cT%(8NzHyI zHT#`ZBm14y>~~VL-$~7WCpG(>)a-Xsv)@V0ekV2ioz(1iQnTMl&3-2}`<>M6cT%(8 zNzHyIHT#{^>~~VL-$|{?DB16%X1|k~{Z4B3JE__4q-MX9n*B~{_B*M68;9(7QnTMl z&3-2}`<>LB>~~VL-$~7WCpG(>RM$?aclJA}+3%!gzmuB%PHOf$soC$OX1|k~{Z4B3 zJE__4q`Dtv$bKg^`<>M6cT%(8NzHyIwHnV#&z{X4$bKg^`<+yGmh5*@50;qyPHOf$ zsoC$OX1|k~{Z4B3JE__4q#ml;>~~VL-$~7WCpG(>)a-Xsv)@V0ekV2ioz(1iQjP3) zQnTMl&3-2}`<>M6cT%(8NzHyIHT#{^>~~VL-$~7WCpG(>)a-Xsv)@V0ekV2ioz(1i sQnTMl&3-2}`<>M6cT%(8Nj0+HNzHyIHT#{^>~~VL-%0)d#dlKwA02Y#Bme*a diff --git a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po @@ -736,7 +736,7 @@ msgid "Cannot revoke permission for your msgstr "Impossible de révoquer votre permission d'administrateur" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "Permissions du groupe de dépôts mises à jour" #: kallithea/controllers/admin/repo_groups.py:472 @@ -984,7 +984,7 @@ msgid "Target group cannot be the same" msgstr "Le groupe cible ne peut pas être le même" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "Permissions du groupe d'utilisateurs mises à jour" #: kallithea/controllers/admin/user_groups.py:440 @@ -1848,7 +1848,7 @@ msgid "New user registration" msgstr "Nouveau enregistrement d'utilisateur" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" " fonctionnement de l’application" @@ -2957,7 +2957,7 @@ msgstr "adresse IP actuelle" #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4305,7 +4305,7 @@ msgid "Last Login" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4334,7 +4334,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff --git a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po @@ -709,7 +709,7 @@ msgid "Cannot revoke permission for your msgstr "" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "" #: kallithea/controllers/admin/repo_groups.py:472 @@ -949,7 +949,7 @@ msgid "Target group cannot be the same" msgstr "" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "" #: kallithea/controllers/admin/user_groups.py:440 @@ -1802,7 +1802,7 @@ msgid "New user registration" msgstr "" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" #: kallithea/model/user.py:255 @@ -2876,7 +2876,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4156,7 +4156,7 @@ msgid "Last Login" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4185,7 +4185,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff --git a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po @@ -721,7 +721,7 @@ msgid "Cannot revoke permission for your msgstr "自分自身の管理者としての権限を取り消すことはできません" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "リポジトリグループ権限を更新しました" #: kallithea/controllers/admin/repo_groups.py:472 @@ -961,7 +961,7 @@ msgid "Target group cannot be the same" msgstr "対象に同じ物を選ぶことはできません" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "ユーザーグループ権限を更新しました" #: kallithea/controllers/admin/user_groups.py:440 @@ -1811,7 +1811,7 @@ msgid "New user registration" msgstr "新規ユーザー登録" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "このユーザーを編集できません。このユーザーはアプリケーションにとって必要不可欠です。" #: kallithea/model/user.py:255 @@ -2900,9 +2900,9 @@ msgstr "現在の IP" #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" -msgstr "ユーザーは外部の Source of Record に属しているため、ここでは詳細を管理できません" +msgstr "ユーザーは外部の source of record に属しているため、ここでは詳細を管理できません" #: kallithea/templates/admin/my_account/my_account_repos.html:1 #, fuzzy @@ -4271,7 +4271,7 @@ msgid "Last Login" msgstr "最終ログイン日時" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "グループのメンバー数" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4300,9 +4300,9 @@ msgstr "メールアドレスがありません。このユーザーのメールアドレスを更新してください。" #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." -msgstr "このユーザーは外部の Source of Record (%s) に属しています。ここでは詳細を管理できません。" +msgstr "このユーザーは外部の source of record (%s) に属しています。ここでは詳細を管理できません。" #: kallithea/templates/admin/users/user_edit_profile.html:60 msgid "Name in Source of Record" diff --git a/kallithea/i18n/kallithea.pot b/kallithea/i18n/kallithea.pot --- a/kallithea/i18n/kallithea.pot +++ b/kallithea/i18n/kallithea.pot @@ -728,7 +728,7 @@ msgid "Cannot revoke permission for your msgstr "" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "" #: kallithea/controllers/admin/repo_groups.py:472 @@ -962,7 +962,7 @@ msgid "Target group cannot be the same" msgstr "" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "" #: kallithea/controllers/admin/user_groups.py:440 @@ -1718,51 +1718,51 @@ msgid "Top level" msgstr "" #: kallithea/model/db.py:1668 -msgid "Default user has no access to new Repositories" +msgid "Default user has no access to new repositories" msgstr "" #: kallithea/model/db.py:1669 -msgid "Default user has read access to new Repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1670 -msgid "Default user has write access to new Repositories" +msgid "Default user has write access to new repositories" msgstr "" #: kallithea/model/db.py:1671 -msgid "Default user has admin access to new Repositories" +msgid "Default user has admin access to new repositories" msgstr "" #: kallithea/model/db.py:1673 -msgid "Default user has no access to new Repository Groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1674 -msgid "Default user has read access to new Repository Groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1675 -msgid "Default user has write access to new Repository Groups" +msgid "Default user has write access to new repository groups" msgstr "" #: kallithea/model/db.py:1676 -msgid "Default user has admin access to new Repository Groups" +msgid "Default user has admin access to new repository groups" msgstr "" #: kallithea/model/db.py:1678 -msgid "Default user has no access to new User Groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1679 -msgid "Default user has read access to new User Groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1680 -msgid "Default user has write access to new User Groups" +msgid "Default user has write access to new user groups" msgstr "" #: kallithea/model/db.py:1681 -msgid "Default user has admin access to new User Groups" +msgid "Default user has admin access to new user groups" msgstr "" #: kallithea/model/db.py:1683 @@ -1774,19 +1774,19 @@ msgid "Non-admins can create Repository msgstr "" #: kallithea/model/db.py:1686 -msgid "Only admins can create User Groups" +msgid "Only admins can create user groups" msgstr "" #: kallithea/model/db.py:1687 -msgid "Non-admins can create User Groups" +msgid "Non-admins can create user groups" msgstr "" #: kallithea/model/db.py:1689 -msgid "Only admins can create top level Repositories" +msgid "Only admins can create top level repositories" msgstr "" #: kallithea/model/db.py:1690 -msgid "Non-admins can create top level Repositories" +msgid "Non-admins can create top level repositories" msgstr "" #: kallithea/model/db.py:1695 @@ -1917,7 +1917,7 @@ msgid "New user registration" msgstr "" #: kallithea/model/user.py:217 kallithea/model/user.py:239 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" #: kallithea/model/user.py:258 @@ -2965,7 +2965,7 @@ msgid "Current IP" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:28 -msgid "Your user is in an external Source of Record; some details cannot be managed here" +msgid "Your user is in an external source of record; some details cannot be managed here" msgstr "" #: kallithea/templates/admin/my_account/my_account_repos.html:1 @@ -4135,7 +4135,7 @@ msgid "Last Login" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4163,7 +4163,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format -msgid "This user is in an external Source of Record (%s); some details cannot be managed here." +msgid "This user is in an external source of record (%s); some details cannot be managed here." msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:60 diff --git a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po @@ -712,7 +712,7 @@ msgid "Cannot revoke permission for your msgstr "" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "" #: kallithea/controllers/admin/repo_groups.py:472 @@ -952,7 +952,7 @@ msgid "Target group cannot be the same" msgstr "" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "" #: kallithea/controllers/admin/user_groups.py:440 @@ -1805,7 +1805,7 @@ msgid "New user registration" msgstr "" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" #: kallithea/model/user.py:255 @@ -2879,7 +2879,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4161,7 +4161,7 @@ msgid "Last Login" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4190,7 +4190,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff --git a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po @@ -724,7 +724,7 @@ msgid "Cannot revoke permission for your msgstr "Nie można cofnąć zezwolenia dla admina jako admin" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "Aktualizacja uprawnień grup repozytorium" #: kallithea/controllers/admin/repo_groups.py:472 @@ -966,7 +966,7 @@ msgid "Target group cannot be the same" msgstr "Grupa docelowa nie może być taka sama" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "Aktualizacja uprawnień grupy użytkowników" #: kallithea/controllers/admin/user_groups.py:440 @@ -1831,7 +1831,7 @@ msgid "New user registration" msgstr "nowy użytkownik się zarejestrował" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej " "aplikacji" @@ -2938,7 +2938,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4285,7 +4285,7 @@ msgid "Last Login" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4314,7 +4314,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff --git a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po @@ -722,7 +722,7 @@ msgid "Cannot revoke permission for your msgstr "Você não pode revocar sua própria permissão de administrador" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "Permissões atualizadas do Grupo de Repositórios" #: kallithea/controllers/admin/repo_groups.py:472 @@ -962,7 +962,7 @@ msgid "Target group cannot be the same" msgstr "O grupo destino não pode ser o mesmo" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "Permissões do Grupo de Usuários atualizadas" #: kallithea/controllers/admin/user_groups.py:440 @@ -1821,7 +1821,7 @@ msgid "New user registration" msgstr "Novo registro de usuário" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Você não pode Editar esse usuário, pois ele é crucial para toda a " "aplicação" @@ -2928,7 +2928,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4275,7 +4275,7 @@ msgid "Last Login" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4304,7 +4304,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff --git a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po @@ -729,7 +729,7 @@ msgid "Cannot revoke permission for your msgstr "Администратор не может отозвать свои привелегии" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "Привилегии группы репозиториев обновлены" #: kallithea/controllers/admin/repo_groups.py:472 @@ -971,7 +971,7 @@ msgid "Target group cannot be the same" msgstr "Целевая группа не может быть такой же" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "Привилегии группы пользователей обновлены" #: kallithea/controllers/admin/user_groups.py:440 @@ -1837,7 +1837,7 @@ msgid "New user registration" msgstr "Регистрация нового пользователя" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Вы не можете редактировать пользователя, поскольку это критично для " "работы всего приложения" @@ -2939,7 +2939,7 @@ msgstr "текущий IP-адрес" #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4238,7 +4238,7 @@ msgid "Last Login" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4267,7 +4267,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff --git a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po @@ -709,7 +709,7 @@ msgid "Cannot revoke permission for your msgstr "" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "" #: kallithea/controllers/admin/repo_groups.py:472 @@ -949,7 +949,7 @@ msgid "Target group cannot be the same" msgstr "" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "" #: kallithea/controllers/admin/user_groups.py:440 @@ -1808,7 +1808,7 @@ msgid "New user registration" msgstr "" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "" #: kallithea/model/user.py:255 @@ -2884,7 +2884,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4168,7 +4168,7 @@ msgid "Last Login" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4197,7 +4197,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff --git a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po @@ -718,7 +718,7 @@ msgid "Cannot revoke permission for your msgstr "" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "" #: kallithea/controllers/admin/repo_groups.py:472 @@ -958,7 +958,7 @@ msgid "Target group cannot be the same" msgstr "" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "" #: kallithea/controllers/admin/user_groups.py:440 @@ -1806,7 +1806,7 @@ msgid "New user registration" msgstr "" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" #: kallithea/model/user.py:255 @@ -2889,7 +2889,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4209,7 +4209,7 @@ msgid "Last Login" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4238,7 +4238,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff --git a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po @@ -710,7 +710,7 @@ msgid "Cannot revoke permission for your msgstr "" #: kallithea/controllers/admin/repo_groups.py:435 -msgid "Repository Group permissions updated" +msgid "Repository group permissions updated" msgstr "" #: kallithea/controllers/admin/repo_groups.py:472 @@ -950,7 +950,7 @@ msgid "Target group cannot be the same" msgstr "" #: kallithea/controllers/admin/user_groups.py:320 -msgid "User Group permissions updated" +msgid "User group permissions updated" msgstr "" #: kallithea/controllers/admin/user_groups.py:440 @@ -1798,7 +1798,7 @@ msgid "New user registration" msgstr "" #: kallithea/model/user.py:214 kallithea/model/user.py:236 -msgid "You can't Edit this user since it's crucial for entire application" +msgid "You can't edit this user since it's crucial for entire application" msgstr "您無法編輯這個使用者，因為他是系統帳號" #: kallithea/model/user.py:255 @@ -2879,7 +2879,7 @@ msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:28 msgid "" -"Your user is in an external Source of Record; some details cannot be " +"Your user is in an external source of record; some details cannot be " "managed here" msgstr "" @@ -4187,7 +4187,7 @@ msgid "Last Login" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:10 -msgid "Member of User groups" +msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 @@ -4216,7 +4216,7 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_profile.html:27 #, python-format msgid "" -"This user is in an external Source of Record (%s); some details cannot be" +"This user is in an external source of record (%s); some details cannot be" " managed here." msgstr "" diff --git a/kallithea/lib/helpers.py b/kallithea/lib/helpers.py --- a/kallithea/lib/helpers.py +++ b/kallithea/lib/helpers.py @@ -1125,7 +1125,7 @@ def changed_tooltip(nodes): return literal(pref + '
'.join([safe_unicode(x.path) for x in nodes[:30]]) + suf) else: - return ': ' + _('No Files') + return ': ' + _('No files') def repo_link(groups_and_repos): diff --git a/kallithea/model/db.py b/kallithea/model/db.py --- a/kallithea/model/db.py +++ b/kallithea/model/db.py @@ -1664,29 +1664,29 @@ class Permission(Base, BaseModel): PERMS = [ ('hg.admin', _('Kallithea Administrator')), - ('repository.none', _('Default user has no access to new Repositories')), - ('repository.read', _('Default user has read access to new Repositories')), - ('repository.write', _('Default user has write access to new Repositories')), - ('repository.admin', _('Default user has admin access to new Repositories')), - - ('group.none', _('Default user has no access to new Repository Groups')), - ('group.read', _('Default user has read access to new Repository Groups')), - ('group.write', _('Default user has write access to new Repository Groups')), - ('group.admin', _('Default user has admin access to new Repository Groups')), - - ('usergroup.none', _('Default user has no access to new User Groups')), - ('usergroup.read', _('Default user has read access to new User Groups')), - ('usergroup.write', _('Default user has write access to new User Groups')), - ('usergroup.admin', _('Default user has admin access to new User Groups')), - - ('hg.repogroup.create.false', _('Only admins can create Repository Groups')), - ('hg.repogroup.create.true', _('Non-admins can create Repository Groups')), - - ('hg.usergroup.create.false', _('Only admins can create User Groups')), - ('hg.usergroup.create.true', _('Non-admins can create User Groups')), - - ('hg.create.none', _('Only admins can create top level Repositories')), - ('hg.create.repository', _('Non-admins can create top level Repositories')), + ('repository.none', _('Default user has no access to new repositories')), + ('repository.read', _('Default user has read access to new repositories')), + ('repository.write', _('Default user has write access to new repositories')), + ('repository.admin', _('Default user has admin access to new repositories')), + + ('group.none', _('Default user has no access to new repository groups')), + ('group.read', _('Default user has read access to new repository groups')), + ('group.write', _('Default user has write access to new repository groups')), + ('group.admin', _('Default user has admin access to new repository groups')), + + ('usergroup.none', _('Default user has no access to new user groups')), + ('usergroup.read', _('Default user has read access to new user groups')), + ('usergroup.write', _('Default user has write access to new user groups')), + ('usergroup.admin', _('Default user has admin access to new user groups')), + + ('hg.repogroup.create.false', _('Only admins can create repository groups')), + ('hg.repogroup.create.true', _('Non-admins can create repository groups')), + + ('hg.usergroup.create.false', _('Only admins can create user groups')), + ('hg.usergroup.create.true', _('Non-admins can create user groups')), + + ('hg.create.none', _('Only admins can create top level repositories')), + ('hg.create.repository', _('Non-admins can create top level repositories')), ('hg.create.write_on_repogroup.true', _('Repository creation enabled with write permission to a repository group')), ('hg.create.write_on_repogroup.false', _('Repository creation disabled with write permission to a repository group')), @@ -1695,8 +1695,8 @@ class Permission(Base, BaseModel): ('hg.fork.repository', _('Non-admins can can fork repositories')), ('hg.register.none', _('Registration disabled')), - ('hg.register.manual_activate', _('User Registration with manual account activation')), - ('hg.register.auto_activate', _('User Registration with automatic account activation')), + ('hg.register.manual_activate', _('User registration with manual account activation')), + ('hg.register.auto_activate', _('User registration with automatic account activation')), ('hg.extern_activate.manual', _('Manual activation of external account')), ('hg.extern_activate.auto', _('Automatic activation of external account')), @@ -2225,10 +2225,10 @@ class ChangesetStatus(Base, BaseModel): STATUS_UNDER_REVIEW = 'under_review' STATUSES = [ - (STATUS_NOT_REVIEWED, _("Not Reviewed")), # (no icon) and default + (STATUS_NOT_REVIEWED, _("Not reviewed")), # (no icon) and default (STATUS_APPROVED, _("Approved")), (STATUS_REJECTED, _("Rejected")), - (STATUS_UNDER_REVIEW, _("Under Review")), + (STATUS_UNDER_REVIEW, _("Under review")), ] changeset_status_id = Column(Integer(), nullable=False, unique=True, primary_key=True) diff --git a/kallithea/model/user.py b/kallithea/model/user.py --- a/kallithea/model/user.py +++ b/kallithea/model/user.py @@ -205,7 +205,7 @@ class UserModel(BaseModel): user = self.get(user_id, cache=False) if user.username == User.DEFAULT_USER: raise DefaultUserException( - _("You can't Edit this user since it's " + _("You can't edit this user since it's " "crucial for entire application")) for k, v in form_data.items(): @@ -227,7 +227,7 @@ class UserModel(BaseModel): user = self._get_user(user) if user.username == User.DEFAULT_USER: raise DefaultUserException( - _("You can't Edit this user since it's" + _("You can't edit this user since it's" " crucial for entire application") ) diff --git a/kallithea/templates/admin/settings/settings_visual.html b/kallithea/templates/admin/settings/settings_visual.html --- a/kallithea/templates/admin/settings/settings_visual.html +++ b/kallithea/templates/admin/settings/settings_visual.html @@ -89,7 +89,7 @@ ${h.form(url('admin_settings_visual'), m
- +
diff --git a/kallithea/templates/admin/users/user_edit_advanced.html b/kallithea/templates/admin/users/user_edit_advanced.html --- a/kallithea/templates/admin/users/user_edit_advanced.html +++ b/kallithea/templates/admin/users/user_edit_advanced.html @@ -7,7 +7,7 @@ (_('Source of Record'), c.user.extern_type, ''), (_('Created on'), h.fmt_date(c.user.created_on), ''), (_('Last Login'), c.user.last_login or '-', ''), - (_('Member of User groups'), len(c.user.group_member), ', '.join((x.users_group.users_group_name for x in c.user.group_member))), + (_('Member of User Groups'), len(c.user.group_member), ', '.join((x.users_group.users_group_name for x in c.user.group_member))), ] %> %for dt, dd, tt in elems: