From aaef46f149e42f75ec4a29a484f0d2b7ee56156f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= Date: Wed, 8 Sep 2010 22:19:27 +0200 Subject: [PATCH] more fix socialnetwork styles and update lang --- main/auth/profile.php | 34 ++++++++------ main/img/my_shared_profile.png | Bin 658 -> 621 bytes main/img/profile_edit.png | Bin 731 -> 833 bytes main/img/social_group_admin.png | Bin 0 -> 781 bytes main/img/social_group_moderator.png | Bin 0 -> 738 bytes main/img/social_moderator_add.png | Bin 0 -> 865 bytes main/img/social_moderator_delete.png | Bin 0 -> 871 bytes main/img/user_delete.png | Bin 0 -> 767 bytes main/inc/lib/group_portal_manager.lib.php | 4 +- main/inc/lib/internationalization.lib.php | 4 +- main/lang/english/admin.inc.php | 4 +- main/lang/english/exercice.inc.php | 2 +- main/lang/english/wiki.inc.php | 4 +- main/lang/french/admin.inc.php | 2 + main/lang/german/accessibility.inc.php | 6 +-- main/lang/german/agenda.inc.php | 12 ++--- main/lang/italian/admin.inc.php | 3 ++ main/lang/italian/document.inc.php | 7 +++ main/lang/italian/exercice.inc.php | 1 + main/lang/italian/trad4all.inc.php | 3 ++ main/lang/italian/userInfo.inc.php | 1 + main/lang/spanish/admin.inc.php | 4 +- main/lang/spanish/userInfo.inc.php | 42 +++++++++--------- main/lang/spanish/wiki.inc.php | 2 +- main/messages/view_message.php | 2 +- main/social/group_invitation.php | 2 +- main/social/group_members.php | 12 ++--- main/social/groups.php | 4 +- main/social/home.php | 2 +- main/social/profile.php | 8 ++-- .../social/profile_friends_and_groups.inc.php | 4 +- main/social/search.php | 4 +- 32 files changed, 99 insertions(+), 74 deletions(-) mode change 100644 => 100755 main/img/my_shared_profile.png mode change 100644 => 100755 main/img/profile_edit.png create mode 100644 main/img/social_group_admin.png create mode 100644 main/img/social_group_moderator.png create mode 100644 main/img/social_moderator_add.png create mode 100644 main/img/social_moderator_delete.png create mode 100644 main/img/user_delete.png mode change 100755 => 100644 main/lang/german/accessibility.inc.php mode change 100755 => 100644 main/lang/german/agenda.inc.php mode change 100755 => 100644 main/lang/italian/document.inc.php mode change 100755 => 100644 main/lang/italian/exercice.inc.php mode change 100755 => 100644 main/lang/italian/userInfo.inc.php mode change 100755 => 100644 main/lang/spanish/wiki.inc.php mode change 100644 => 100755 main/social/profile_friends_and_groups.inc.php diff --git a/main/auth/profile.php b/main/auth/profile.php index e90cbe1cf8..605da753ce 100755 --- a/main/auth/profile.php +++ b/main/auth/profile.php @@ -260,11 +260,11 @@ if (api_get_setting('extended_profile') == 'true') { //$form->addElement('html', ' show_extend_profile'); $form->addElement('static', null, ''.get_lang('OptionalTextFields').''); // MY COMPETENCES - $form->add_html_editor('competences', get_lang('MyCompetences'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130')); + $form->add_html_editor('competences', get_lang('MyCompetences'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '550', 'Height' => '130')); // MY DIPLOMAS - $form->add_html_editor('diplomas', get_lang('MyDiplomas'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130')); + $form->add_html_editor('diplomas', get_lang('MyDiplomas'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '550', 'Height' => '130')); // WHAT I AM ABLE TO TEACH - $form->add_html_editor('teach', get_lang('MyTeach'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130')); + $form->add_html_editor('teach', get_lang('MyTeach'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '550', 'Height' => '130')); // MY PRODUCTIONS $form->addElement('file', 'production', get_lang('MyProductions')); @@ -272,7 +272,7 @@ if (api_get_setting('extended_profile') == 'true') { $form->addElement('static', 'productions_list', null, $production_list); } // MY PERSONAL OPEN AREA - $form->add_html_editor('openarea', get_lang('MyPersonalOpenArea'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130')); + $form->add_html_editor('openarea', get_lang('MyPersonalOpenArea'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '550', 'Height' => '350')); $form->applyFilter(array('competences', 'diplomas', 'teach', 'openarea'), 'stripslashes'); $form->applyFilter(array('competences', 'diplomas', 'teach'), 'trim'); // openarea is untrimmed for maximum openness } @@ -825,18 +825,24 @@ if (api_get_setting('allow_social_tool') == 'true') { SocialManager::show_social_menu('home', null, $user_id, $show_full_profile); echo ''; - echo '
'; - echo '
'; - if (api_get_setting('extended_profile') == 'true') { - $show = isset($_GET['show']) ? '&show='.Security::remove_XSS($_GET['show']) : ''; - if (isset($_GET['type']) && $_GET['type'] == 'reduced') { - echo ''; - } else { - echo ''; + echo '
'; + echo '
'.Display::return_icon('content-post-group1.jpg',get_lang('Profile')).'
'; + echo ''; - $form->display(); echo '
'; echo '
'; diff --git a/main/img/my_shared_profile.png b/main/img/my_shared_profile.png old mode 100644 new mode 100755 index 03517299835004058a6b3e59ad1ff8ea8b036268..fedfc5a637c809a3a0a1560c276002945b4e3a94 GIT binary patch literal 621 zcmV-z0+RiSP)Px#32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^RU0SN^#7;|jxGXMYp8FWQhbVF}# zZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b0oqAKK~y-))seey69EuK&l11w#82V~ z2P}jwg+My6pr@chfW)h#r{NbUkW!@P3y|oL_y9s0C@mn7i9nIo$ZJUaSbOb#*t_;n zSPn4+(aYds;qhT5Ve=J2Hc7@#4XUCpi-Fg7P3}9-OL4&^j9@r!h z$xU{yeyEEV9^)C>F91u!wTH;CkLA=zoqI@lvGmsveE`xQLnKGy!Xp5taeC$#M!ikM z(-E&T>5)Nj`N_mH1*p9&3*S`Iu@-Hu%I>=|R>P!Fn&;Hn;h_;=>~>Jb#_R>Jt1Fo0 zPpqbF;?n2xwcCU;S&XlrseXJ(G;=^=!9m=824)C zEF#WHx@`-6cZTxGx4!5*BzwJds_Hm1=f;1?3fFo8LPaAXAA zkX*Y3yqyGb@9rJh+1VBm!M1Jcsw#C=6}{P97ZLu{|D=8Z#qRCD_p{dY00000NkvXX Hu0mjfZiW-d literal 658 zcmV;D0&V??P)|~h%QOkkg#FFhJ=mLZrHnU;YPZ^q?#@?1`~B5M57T!E3wcz zGcXTlnDGvENQ()Qz)4Q-IcM(t@9*5?9x9v7g4liHw=tb<=5o0^FijIg)STA-YJkR! zjU6pitJPs_oj7V%&2qyq26;RlA1`QGG#Uj(QNy2)3LMSr_4@w_t&O!>?UKZ!c{dmgqWP@}FU#P^`#Rbm-(q?7EF5kpnjb#HAH9h1rTAomSiV0jTjtAm4gJJ|pF1pzWZmcr*ipYlPIRjm2E zhk~tEi(*(Ov~CBixJRbINkZm?p=yxYZD_g%&-?;ho)h2#XTY&ELVgbfUcu|_C)nD0 zipMYB;QGy5xMB(NJkL-JZ9IGUfL`ZhEP7p_`WlSB4p|V<-rI+ysASsEkaQFLZyF1M s5IzZg$Q}+xWCK@;lZH1f!ao8G087P<2`Vb*jQ{`u07*qoM6N<$f|heFT>t<8 diff --git a/main/img/profile_edit.png b/main/img/profile_edit.png old mode 100644 new mode 100755 index 646db36bf7b4d28218ed9975bb9d3b2d9bf928d9..c1974cda745278a404b9e29fa91e0503a84accb1 GIT binary patch delta 756 zcmVL_t(I%cYZjEEHfI$Mr|^Pr8oOYHb>6UdGzwuVP5LbBJMC zm$#UlI*ZY9oXGn{LtY~`FP%$ExpIbFHFn6!y(F!4h%x27O2U+lQy@;C107F!0 zx$jFvwmShaj{7wfTcfmH17#EfYP2F-D`iuDLqw*BG2)#Kam9|XxN9KWaUa^sk}=6= zqqiys(N4yQbv=UX=S>lDhPYOn;Hkf3pfbp0PCfGpi#=tS>bM6n_cr7&bD@xnz=+6Y1FM1A`bW&7GI~k7+8?J z0DewkUh)LOJkrdTe3;U(*Zgc$Er)&@D+5(f%bInl-ZwzNw#9d8%I4~~7EHgs3zhUK zHpaRkt%*?UWMg-Zz7eUOc8t^s*~BuqNnU77^3>6u=YIl)jD<~AH&mlHFxOAV$GR{` zDg%G?7x|pjGa_^M7`SmmOgy?VJgGwcBoHeDXnjCdhX4v`A~w}RD8B?lJwe6NFcb0$ zrx{Vc>nYtOTKiUeyZW)w)VqOlF+dk;5Gl|gmGcbK?-+mNAgISLV^Nj_S)m(ZBO+6` zUSTlVVt-?nmw@7G9zys)SS!G)<3ZYXOMC3MP|L%xG7*Rc?MX&TE?~AL9>O@wwXJ}d zWvNlL-$6h`4Kg~Eh%4gYLn{+vegP)?{GpUnF*lR|NvRJ4!%H#WnT~#jm1Zj-t)(Z5 z63y2`L$lWHLj-u7dk$C{!^i_abTN;jr<@Fa4s97OepR4{GnIoWwkujEecMNpH_{AJ zm>EXLy?Nzn;Wk(m7Gt%q5Pg}>sK06k2Xe0B#Ko5Oo6)I<#`GWyuXu?`I!WkJ$YhLz|$`)aK%NtA0PU-1s+6rlf}nqbrS-eXeMk|o6wB*dSQc6ztO7WWgNTs$ z)QAy5yAaYt><_02Mh@dl-6T+FF){LnlC5U#g`c~s0C_Wqh_Gi}wya)wMx$?xU@VS3 zc@IYsWspuk?cMOYVHgp?b$?y%-#Eik{gU9uIQHZfJpK}@ zuz}3uXQ&^=?zX(VygjyP1MoLas1_);esod$!Voxm9}( zzyikAH0t$TB0Khy&(4w_PBB_{fWp@zjaC!0neVJstu-~OHvZQ#0UX=cxX>1D_H}HD oAbw|P;aj$+``l>yUt9VMy(531cSWdP)CrU4o&u6xvM} zE>!43A_c(|D^&=#^_8j(DoK2_jE_hv6Jy4XCZqY^$FGYRnNZ?^!{r{%_q&I4&NY&l zv&~qvd5Z(RR~bC;k(pzXlvwbd5QMWYK{tDPH|x#` z?|dmjqV)3WHS2M)r?Ko39dCYxjXl=-S;5x{1m~G9T9#F%v9YJM{3q7c-eIY3^LBNH zsp1UYzqSJ3^XKq5i_=M(Yo4+?HAJGel}(jrSW=PV^0hI7^F0d+ocpG&d*ttlp36fy z)|dZAvTi$xMeoy`=;zAyQHKA@_1x<1>@H=DB<#gi87XQ|P!t4TTB& zq=+B<$dU8W&pVoi_DKms5Z)Fi>b5_6U?dTrts7H$<8lckp&$}9A3*skWS<~gz)lX~ zi;ob7U@h^p`^5Rj9Yzwx<7P{+^hQmeRwkG4L~)J~KOxvW_#()GNn(;!1ZOD>9wk3G za)LCw%-kXsj+px3Ihk6stsz>m6~*JoO`}jm{yCTkmw!m^)G;4Fqr2sM?Vs1g>W`Hr z&AJ!&`uf7tn;;?0pfCf9F+`02dMs~eXq$uoH-(y=nlhP+ep|>Q11MlHAdfNC6e;g@aPD2@LIrTdYx{lty>00000 LNkvXXu0mjfmic>9 literal 0 HcmV?d00001 diff --git a/main/img/social_group_moderator.png b/main/img/social_group_moderator.png new file mode 100644 index 0000000000000000000000000000000000000000..1d72d47247ceaddb46f918d53ec4444d633912f6 GIT binary patch literal 738 zcmV<80v-K{P)Y)`XtzyIql2{sy6=Hu9+tjql+xOzk)<~?R3&ZZt%=gXAx2x3abu`xKgN6FU ztvTdqR_-fsPsm+$v5g2F{&wVy{xABFA=M z>Tg$mz@w??JKYAiqlT`oE)2OXoN={bDZS1`^p*q*kAjg;*-d@vV*wYO2F~{MptG|R zZl#Q+58tqoDd?Z$cO%UhgO)<#mU{;p6#;L>jklv)NFsR-vjYHa0e}wY9}S8QZ(dwW|Fum-# zX!7LP^#a*Nd(TIhT5IZlF#3bTJ3kj`Z z8uA>QO!~%m&%N(<5hF7Td*E<5i~sK&&WB^IW!GLlch&ZvJjhS0H6m>>Cc>DA$V6xz z@!Wwd7cO4s`lqiuyBe1!i;N+PEL#2*>YZrxj%#f(+B8duH7Ea76N6TULelVjHbj(0 zMDG9}1c`l6qGHqlNimt9M zj%Fhs?P#Mif15~~k^coufAs3vBk%29NVwo7ZH?Fh{(p^;NUIC zT8rm-e$1MSj_>=32wH2lwzjC%YHzpzN~tqJ5L_%4 zi=F9on$68kf*>FW0<5(dW60<8lu9L%$t0CZg_V_+%OW!2>>kq8)Kp1CzAY3Ahf=8& z^?Ds+3{ezet>wmF3oNZws5ds*4(j3G+y42<4;Rln&6hYaG0~}%`m$Uu_lXFNMgwat zi)*uN#D3+e^3!x@4svDrYpyL%vwGA2xMd4{eSOLc7jN|nPxka; zVus#*Coqoi?2+RD11$i6FbrSI<#MD_DLOhjXfzu5Tk9m8PEPi`4Zz?_;~aSGC_t*^ z7skiO+ePHXVzG$ldCbkt-4v0TyYDh%gDD4qT{=Ro}S}ILV!Z!ArPn00000NkvXXu0mjf)9HxZ literal 0 HcmV?d00001 diff --git a/main/img/social_moderator_delete.png b/main/img/social_moderator_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..d2cdbe8a9f0753cdd4481cd39e0b036a619068e6 GIT binary patch literal 871 zcmV-t1DO1YP)}FSr!87DefFB%#FpK&qSVn00As zh&I{Y?0wGjypI>PBe`$~4u^9%-|snx^L4DX?AnPBezaq+ALQztCZV<%6JktAXhO6O zdGXma=jWDLzVL>#i}C2P&=|tdqUArJ-ib!6vVuqK}0irY_ zdWZ0F1fe!Ocp&V5B8Di#bIE|weNpy0!cznN-1h^FdF%#erg~$8eKC*1P#@{2VsLPf z=hGoi?&+gk`;$6(+ z<5+8{)oKZ?^)UosaPGvSKIe2Ru~aH0l~NZ+M@NeyLZ{QgS_{jU z*}MJ|hmIGCjU1tKZGm5x7ENJf7eg;mRebnboWpP92Ko7y} z>}*0rUdiY4R4Ns!)#_~#xpFKy@UCC`nmu2P6LdE5fp*KqxZLYGK`HfeCX-3b&(Bk- zR6bTp9i5(@9@7KEb2qOpQGb}A2T{W$5=Suvq2C9xz*LxHKo+}!wMF|0iq|AK>&MHw6~-ksQ9RtH+=$?!G=zinz|BNIO*d}XYdmm2K>Qw%i9j?X9SgRBJn4W5%uAclWG_T7f?M4s9q5$`w5b| z31S}-Tq~-?NahjDw3mU5cfqF5z)+g+pPplGDyLv1f8WAnTQ+Xiw;{fhcBLH^j|gI# z2~IT;7{m9#PQ$2>16f?4#0x*vLFksSJ~;)W1wO>uQ-rAG1{C+&5Zw%%))Pc(2_k9< z`smoi)Pkk!SK)SAcOy>0d#x(Rl;b_GP?XFE#P>r%M^9Kn>j@#I>kHsrS$qYvKE>lwZZUsXcw4nFNHZZ~?%71a&2u7&aV|47ZvJKBUVO{)!ekB`ACp}1 xSnjsa#jtYM{A~v!cV^R$X2;lcpKyd7^}lwPp>~q=QF{OY002ovPDHLkV1lJ{Vb%Zu literal 0 HcmV?d00001 diff --git a/main/inc/lib/group_portal_manager.lib.php b/main/inc/lib/group_portal_manager.lib.php index af31b22ef4..8a25578b00 100755 --- a/main/inc/lib/group_portal_manager.lib.php +++ b/main/inc/lib/group_portal_manager.lib.php @@ -978,9 +978,9 @@ class GroupPortalManager if (in_array($member['relation_type'] , array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))) { //add icons if ($member['relation_type'] == GROUP_USER_PERMISSION_ADMIN) { - $icon= Display::return_icon('admin_star.png', get_lang('Admin')); + $icon= Display::return_icon('social_group_admin.png', get_lang('Admin')); }elseif ($member['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) { - $icon= Display::return_icon('moderator_star.png', get_lang('Moderator')); + $icon= Display::return_icon('social_group_moderator.png', get_lang('Moderator')); } else{ $icon= ''; } diff --git a/main/inc/lib/internationalization.lib.php b/main/inc/lib/internationalization.lib.php index f7aeb01ba4..36609a215d 100755 --- a/main/inc/lib/internationalization.lib.php +++ b/main/inc/lib/internationalization.lib.php @@ -673,8 +673,8 @@ function date_to_str_ago($date) { date_default_timezone_set(_api_get_timezone()); if (!$initialized) { - $today = api_ucfirst(get_lang('Today')); - $yesterday = api_ucfirst(get_lang('Yesterday')); + $today = get_lang('Today'); + $yesterday = get_lang('Yesterday'); $min_decade = get_lang('MinDecade'); $min_year = get_lang('MinYear'); diff --git a/main/lang/english/admin.inc.php b/main/lang/english/admin.inc.php index 25d3078a9d..95bc148906 100644 --- a/main/lang/english/admin.inc.php +++ b/main/lang/english/admin.inc.php @@ -1105,8 +1105,8 @@ $GoToCourseAfterLoginComment = "When a user is registered in one course, go dire $GroupList = "Group List"; $AllowStudentsDownloadFoldersTitle = "Allow students to download directories"; $AllowStudentsDownloadFoldersComment = "Allow students to pack and download a complete directory from the document tool"; -$AllowStudentsToCreateGroupsInSocialTitle = "Allow students to create groups in social network"; -$AllowStudentsToCreateGroupsInSocialComment = "Allow students to create groups in social network"; +$AllowStudentsToCreateGroupsInSocialTitle = "Allow users to create groups in social network"; +$AllowStudentsToCreateGroupsInSocialComment = "Allow users to create groups in social network"; $AllowSendMessageToAllPlatformUsersTitle = "Allow send message to all platform users"; $AllowSendMessageToAllPlatformUsersComment = "Allow send message to all platform users"; $TabsSocial = "Social network tab"; diff --git a/main/lang/english/exercice.inc.php b/main/lang/english/exercice.inc.php index 157f1508e5..6e98d2b54e 100644 --- a/main/lang/english/exercice.inc.php +++ b/main/lang/english/exercice.inc.php @@ -27,7 +27,7 @@ $langSound = "Audio or video file"; $langDeleteSound = "Delete the audio or video file"; $langNoAnswer = "There is no answer for the moment"; $langGoBackToQuestionPool = "Go back to the question pool"; -$langGoBackToQuestionList = "Go back to the question list"; +$langGoBackToQuestionList = "Go back to the questions list"; $langQuestionAnswers = "Answers to the question"; $langUsedInSeveralExercises = "Warning ! This question and its answers are used in several tests. Would you like to Edit them"; $langModifyInAllExercises = "in all tests"; diff --git a/main/lang/english/wiki.inc.php b/main/lang/english/wiki.inc.php index 2e30c55d34..971d5ea5f6 100644 --- a/main/lang/english/wiki.inc.php +++ b/main/lang/english/wiki.inc.php @@ -12,7 +12,7 @@ $AllPages = "All pages"; $AddNew = "Add new page"; $ChangesStored = "Audio added"; $NewWikiSaved = "The wiki page has been saved. You can see it clicking on:"; -$DefaultContent = "

\"Mr.

To begin editing this page and remove this text

"; +$DefaultContent = "

\"Working

To begin editing this page and remove this text

"; $CourseWikiPages = "Wiki pages"; $GroupWikiPages = "Group wiki pages"; $NoWikiPageTitle = "Your changes have been saved. You still have to give a name to the page"; @@ -64,7 +64,7 @@ $RatingMedia = "The average rating for the page is"; $NumComments = "Comments on this page"; $NumCommentsScore = "Number of comments scored:"; $AddPagesLocked = "The add option has been temporarily disabled by the trainer"; -$LinksPages = "References"; +$LinksPages = "What links here"; $ShowLinksPages = "Show the pages that have links to this page"; $MoreWikiOptions = "More Wiki options"; $DefaultTitle = "Home"; diff --git a/main/lang/french/admin.inc.php b/main/lang/french/admin.inc.php index 1c689a753d..046cdba68d 100644 --- a/main/lang/french/admin.inc.php +++ b/main/lang/french/admin.inc.php @@ -1270,4 +1270,6 @@ $ErrorReadingZip = "Erreur de lecture du fichier ZIP"; $ErrorStylesheetFilesExtensionsInsideZip = "Les seules extensions acceptées pour les fichiers contenus dans le ZIP sont jpg, jpeg, png, gif et css."; $MyTextHere = "Introduisez votre texte ici..."; $FieldTypeSocialProfile = "Lien réseau social"; +$AllowUsersCopyFilesTitle = "Permet aux utilisateurs de copier des fichiers à partir d'un cours de votre dossier personnel"; +$AllowUsersCopyFilesComment = "Permet aux utilisateurs de copier des fichiers à partir d'un cours de votre dossier personnel, visible à travers les réseaux sociaux ou par l'intermédiaire de l'éditeur HTML lorsqu'ils ne font pas partis d'un cours"; ?> \ No newline at end of file diff --git a/main/lang/german/accessibility.inc.php b/main/lang/german/accessibility.inc.php old mode 100755 new mode 100644 index f7d071e26c..cfe6bab8d2 --- a/main/lang/german/accessibility.inc.php +++ b/main/lang/german/accessibility.inc.php @@ -7,10 +7,10 @@ $test = "Test"; $WCAGImage = "Bild"; $WCAGLabel = "Bildbezeichnung"; $WCAGLink = "Link"; -$WCAGLinkLabel = "Link Bezeichnung"; -$errorNoLabel = "Das Bild hat kein Label"; +$WCAGLinkLabel = "Linkbeschreibung"; +$errorNoLabel = "Das Bild hat keine Beschreibung"; $AllLanguages = "alle Sprachen"; $WCAGEditor = "WCAG Editor"; $WCAGGoMenu = "Gehe zu Menü"; -$WCAGGoContent = "Geh zu Inhalt"; +$WCAGGoContent = "Gehe zu Inhalt"; ?> \ No newline at end of file diff --git a/main/lang/german/agenda.inc.php b/main/lang/german/agenda.inc.php old mode 100755 new mode 100644 index 3c220675a5..4b3a24567f --- a/main/lang/german/agenda.inc.php +++ b/main/lang/german/agenda.inc.php @@ -12,14 +12,14 @@ $Year = "Jahr"; $Hour = "Stunde"; $Minutes = "Minuten"; $Detail = "Detail"; -$EditSuccess = "Eintrag wurde geändert"; -$AddSuccess = "Eintrag wurde hinzugefügt"; -$AgendaDeleteSuccess = "Eintrag wurde gelöscht"; -$NoAgendaItems = "Keine Einträge vorhanden"; +$EditSuccess = "Termin wurde geändert"; +$AddSuccess = "Termin wurde hinzugefügt"; +$AgendaDeleteSuccess = "Termin wurde gelöscht"; +$NoAgendaItems = "Keine Termine vorhanden"; $lang_september = "September"; $langClassName = "Klasse"; $lang_agenda = "Agenda"; -$ModifyCalendarItem = "Agenda Eintrag ändern"; +$ModifyCalendarItem = "Termin ändern"; $ItemTitle = "Eintrag Titel"; $langDay = "Tag"; $month_default = "Monat (default)"; @@ -75,4 +75,6 @@ $AgendaSortChronologicallyDown = "absteigend"; $ItemForUserSelection = "ausgewählte Objekte"; $IsNotiCalFormatFile = "Diese Datei ist nicht im iCal-Format gespeichert"; $RepeatEvent = "Termin wiederholen"; +$RepeatDate = "Termin wiederholen"; +$EndDateMustBeMoreThanStartDate = "Endtermin muss nach dem Starttermin liegen"; ?> \ No newline at end of file diff --git a/main/lang/italian/admin.inc.php b/main/lang/italian/admin.inc.php index f958b8b120..2bb9d7c967 100644 --- a/main/lang/italian/admin.inc.php +++ b/main/lang/italian/admin.inc.php @@ -1273,4 +1273,7 @@ $AddUsersToGroup = "Aggiungi un membro al gruppo"; $ErrorReadingZip = "Errore di lettura del file ZIP"; $ErrorStylesheetFilesExtensionsInsideZip = "Le uniche estensioni accettate nel file ZIP sono jpg, jpeg. png, gif e css"; $MyTextHere = "Scrivi qui dentro..."; +$FieldTypeSocialProfile = "Collegamento alla rete sociale"; +$AllowUsersCopyFilesTitle = "Consenti agli utenti di fare una copia di file del corso nella propria area personale"; +$AllowUsersCopyFilesComment = "Consenti agli utenti di fare una copia di file del corso nell'area personale, rendendoli visibili tramite la rete sociale o un browser/editor, nel caso siano esterni al corso"; ?> \ No newline at end of file diff --git a/main/lang/italian/document.inc.php b/main/lang/italian/document.inc.php old mode 100755 new mode 100644 index c531aa73ef..2872791b52 --- a/main/lang/italian/document.inc.php +++ b/main/lang/italian/document.inc.php @@ -216,4 +216,11 @@ $HelpSharedFolder = "La cartella contiene i documenti caricati da te e dai corsi $TemplateImage = "Immagine del modello"; $MoveElement = "Sposta l'elemento"; $CertificateName = "Nome"; +$CopyToMyFiles = "Copia nella mia area personale"; +$Export2PDF = "Esporta in formato PDF"; +$ResourceShared = "Risorsa condivisa"; +$CopyAlreadyDone = "Nell'area personale è presente un documento con lo stesso nome, vuoi sostituirlo?"; +$CopyFailed = "Copia non effettuata"; +$CopyMade = "Copia effettuata"; +$OverwritenFile = "Documento sostituito"; ?> \ No newline at end of file diff --git a/main/lang/italian/exercice.inc.php b/main/lang/italian/exercice.inc.php old mode 100755 new mode 100644 index b3873befe1..3e4855877e --- a/main/lang/italian/exercice.inc.php +++ b/main/lang/italian/exercice.inc.php @@ -368,4 +368,5 @@ $ReUseACopyInCurrentTest = "Riutilizza una copia all'interno del test"; $Copy = "Copia"; $ScoreAverageFromAllAttempts = "Media dl punteggio per tutti i tentativi"; $DefaultContent = "Genera un contenuto di default"; +$ExerciseEditionNotAvailableInSession = "Non è possibile modificare gli esercizi nel corso di una sessione"; ?> \ No newline at end of file diff --git a/main/lang/italian/trad4all.inc.php b/main/lang/italian/trad4all.inc.php index 1755718819..52bfe5641e 100644 --- a/main/lang/italian/trad4all.inc.php +++ b/main/lang/italian/trad4all.inc.php @@ -954,4 +954,7 @@ $MemoryUsage = "Impiego memoria:"; $MemoryUsagePeak = "Picco impiego memoria:"; $Seconds = "secondi"; $QualifyInGradebook = "Valuta nel Registro"; +$SessionSpecificResource = "Risorsa specifica della sessione"; +$EditionNotAvailableFromSession = "Non è possibile modificare questa risorsa nel corso di una sessione: puoi farlo nel corso di origine"; +$HandingOverOfTaskX = "Compito realizzato al %s"; ?> \ No newline at end of file diff --git a/main/lang/italian/userInfo.inc.php b/main/lang/italian/userInfo.inc.php old mode 100755 new mode 100644 index 2edd89556f..62673788a0 --- a/main/lang/italian/userInfo.inc.php +++ b/main/lang/italian/userInfo.inc.php @@ -194,4 +194,5 @@ $YouNeedToHaveFriendsInYourSocialNetwork = "Nel social network devi avere degli $SeeAllMyGroups = "Mostra i miei gruppi"; $YouAlreadyInviteAllYourContacts = "Hai già mandato un invito a tutti i tuoi contatti"; $YouShouldCreateAGroup = "Devi prima creare un gruppo"; +$MyFiles = "I miei documenti"; ?> \ No newline at end of file diff --git a/main/lang/spanish/admin.inc.php b/main/lang/spanish/admin.inc.php index dce2f42eb6..74b53f4c09 100644 --- a/main/lang/spanish/admin.inc.php +++ b/main/lang/spanish/admin.inc.php @@ -1105,8 +1105,8 @@ $GoToCourseAfterLoginComment = "Cuando un usuario está inscrito sólamente en u $GroupList = "Lista de grupos de la red social"; $AllowStudentsDownloadFoldersTitle = "Permitir a los estudiantes descargar directorios"; $AllowStudentsDownloadFoldersComment = "Permitir a los estudiantes empaquetar y descargar un directorio completo en la herramienta documentos"; -$AllowStudentsToCreateGroupsInSocialTitle = "Permitir a los alumnos de crear grupos en la red social"; -$AllowStudentsToCreateGroupsInSocialComment = "Permitir a los alumnos crear sus propios grupos en la red social"; +$AllowStudentsToCreateGroupsInSocialTitle = "Permitir a los usuarios crear grupos en la red social"; +$AllowStudentsToCreateGroupsInSocialComment = "Permitir a los usuarios crear sus propios grupos en la red social"; $AllowSendMessageToAllPlatformUsersTitle = "Permitir enviar mensajes a todos los usuarios de la plataforma"; $AllowSendMessageToAllPlatformUsersComment = "Permite poder enviar mensajes a todos los usuarios de la plataforma"; $TabsSocial = "Pestaña Red social"; diff --git a/main/lang/spanish/userInfo.inc.php b/main/lang/spanish/userInfo.inc.php index 44e33b34c3..90fa601f37 100644 --- a/main/lang/spanish/userInfo.inc.php +++ b/main/lang/spanish/userInfo.inc.php @@ -45,7 +45,7 @@ $SelectOneContact = "Seleccione un contacto"; $SelectOneGroup = "Seleccione un grupo"; $AttachContactsPersonal = "Está seguro de que desea añadir este contacto al grupo seleccionado"; $AttachContactsToGroupSuccesfuly = "Su contacto fue agrupado correctamente"; -$InvitationDenied = "Invitación denegada"; +$InvitationDenied = "Invitación rechazada"; $AddedContactToList = "Usuario añadido a su lista de contactos"; $ContactsGroupsComment = "Aquí se muestran sus contactos ordenados por grupos"; $YouDontHaveContactsInThisGroup = "No tiene contactos en este grupo"; @@ -107,10 +107,10 @@ $AddPicture = "Agregar imagen"; $GroupPermissions = "Permisos del grupo"; $Closed = "Cerrado"; $AddGroup = "Agregar grupo"; -$Privacy = "Privado"; +$Privacy = "Privacidad"; $ThisIsAnOpenGroup = "Grupo abierto"; $YouShouldCreateATopic = "Debería crear un tema"; -$IamAnAdmin = "Yo soy un administrador"; +$IamAnAdmin = "Administrador"; $NewTopic = "Nuevo tema"; $MessageList = "Lista de mensajes"; $EditGroup = "Editar grupo"; @@ -133,14 +133,14 @@ $Reply = "Responder"; $Newest = "Lo último"; $Popular = "Populares"; $Moderator = "Moderador"; -$DeleteModerator = "Eliminar moderador"; -$UserChangeToModerator = "Usuario cambiado a moderador"; -$IamAModerator = "Yo soy un moderador"; +$DeleteModerator = "Dar de baja como moderador"; +$UserChangeToModerator = "Usuario convertido en moderador"; +$IamAModerator = "Moderador"; $ThisIsACloseGroup = "Grupo privado"; -$IamAReader = "Yo soy un lector"; -$UserChangeToReader = "Usuario cambiado a lector"; +$IamAReader = "Usuario estándard"; +$UserChangeToReader = "Usuario convertido en usuario estándard"; $AddModerator = "Agregar como moderador"; -$UserDeleted = "Los usuarios seleccionados han sido eliminados"; +$UserDeleted = "Los usuarios seleccionados han sido dados de baja en el grupo"; $JoinGroup = "Unirse al grupo"; $YouShouldJoinTheGroup = "Debería unirse al grupo"; $WaitingForAdminResponse = "Esperando a que el admin responda"; @@ -154,15 +154,15 @@ $SubscribeUsersToGroup = "Inscribir usuarios al grupo"; $YouHaveBeenInvitedJoinNow = "Ud. ha sido invitado a unirser ahora"; $DenyInvitation = "Rechazar invitación"; $AcceptInvitation = "Aceptar invitación"; -$GroupsWaitingApproval = "Grupos esperando ser aprobado"; +$GroupsWaitingApproval = "Grupos esperando su aceptación"; $GroupInvitationWasDeny = "Invitación de grupo fue rechazada"; $UserIsSubscribedToThisGroup = "Ahora ya forma parte del grupo"; -$DeleteFromGroup = "Eliminar de grupo"; +$DeleteFromGroup = "Dar de baja en el grupo"; $GroupMembers = "Miembros del grupo"; -$Subscribe = "Inscribirme"; -$YouAreInvitedToGroupContent = "Ud. esta invitado al contenido del grupo"; -$YouAreInvitedToGroup = "Estas invitado a unirte al grupo"; -$ToSubscribeClickInTheLinkBelow = "Para inscribirte has clic en el siguiente enlace"; +$Subscribe = "Quiero formar parte de este grupo"; +$YouAreInvitedToGroupContent = "Queda invitado/a a acceder al contenido del grupo"; +$YouAreInvitedToGroup = "Invitación para unirse al grupo"; +$ToSubscribeClickInTheLinkBelow = "Para unirse haga clic en el siguiente enlace"; $ReturnToInbox = "Regresar a bandeja de entrada"; $View = "Vista"; $Me = "Mí"; @@ -171,15 +171,15 @@ $EditNormalProfile = "Edición básica del perfil"; $GroupPendingInvitations = "Invitaciones pendientes de grupo"; $LeaveGroup = "Abandonar el grupo"; $UserIsNotSubscribedToThisGroup = "Ha dejado de formar parte de este grupo"; -$InvitationReceived = "Invitación aceptada"; -$InvitationSent = "Invitación enviada"; -$YouAlreadySentAnInvitation = "Usted ya ha enviado una invitación"; +$InvitationReceived = "Invitaciones recibidas"; +$InvitationSent = "Invitaciones enviadas"; +$YouAlreadySentAnInvitation = "Ya le he enviado una invitación"; $AllowSendMessageToAllPlatformUsersTitle = "Permitir enviar mensajes a todos los usuarios de la plataforma"; $UserAdded = "El usuario ha sido añadido"; $FilesSizeExceedsX = "Tamaña del archivo excedido"; $YouShouldWriteASubject = "Debe escribir el asunto"; $Topics = "Temas"; -$StatusInThisGroup = "Estatus en este grupo"; +$StatusInThisGroup = "Mi función en el grupo"; $FriendsOnline = "Amigos en línea"; $GroupDescription = "Descripción del grupo"; $MyProductions = "Mis producciones"; @@ -187,8 +187,8 @@ $YouHaveReceivedANewMessageInTheGroupX = "Ha recibido un nuevo mensaje en el gru $ClickHereToSeeMessageGroup = "Clic aquí para ver el mensaje de grupo"; $OrCopyPasteTheFollowingUrl = "o copie y pegue la siguiente url:"; $ThereIsANewMessageInTheGroupX = "Hay un nuevo mensaje en el grupo %s"; -$UserIsAlreadySubscribedToThisGroup = "El usuario ya esta suscrito a este grupo"; -$AddNormalUser = "Agregar como un usuario normal"; +$UserIsAlreadySubscribedToThisGroup = "El usuario ya pertenece a este grupo"; +$AddNormalUser = "Agregar como un usuario estándard"; $DenyEntry = "Denegar la entrada"; $YouNeedToHaveFriendsInYourSocialNetwork = "Necesita tener amigos en su red social"; $SeeAllMyGroups = "Ver todos mis grupos"; diff --git a/main/lang/spanish/wiki.inc.php b/main/lang/spanish/wiki.inc.php old mode 100755 new mode 100644 index 98020d85e0..64e630004a --- a/main/lang/spanish/wiki.inc.php +++ b/main/lang/spanish/wiki.inc.php @@ -12,7 +12,7 @@ $AllPages = "Todas las páginas"; $AddNew = "Añadir una página"; $ChangesStored = "Cambios almacenados"; $NewWikiSaved = "La nueva página wiki ha sido guardada."; -$DefaultContent = "

\"Mr.

Para comenzar edite esta página y borre este texto

"; +$DefaultContent = "

\"Trabajando

Para comenzar edite esta página y borre este texto

"; $CourseWikiPages = "Páginas Wiki del curso"; $GroupWikiPages = "Páginas Wiki del grupo"; $NoWikiPageTitle = "Los cambios no se han guardado. Debe dar un título a esta página"; diff --git a/main/messages/view_message.php b/main/messages/view_message.php index 34acb41145..0f93ed2fb1 100755 --- a/main/messages/view_message.php +++ b/main/messages/view_message.php @@ -68,8 +68,8 @@ echo '
'; $id_content_right = 'inbox'; echo ''; diff --git a/main/social/group_invitation.php b/main/social/group_invitation.php index b7b6a5b872..50585ccd71 100755 --- a/main/social/group_invitation.php +++ b/main/social/group_invitation.php @@ -398,7 +398,7 @@ if ($add_type=='multiple') { '; echo '
'.Display::return_icon('content-post-group1.jpg',get_lang('SubscribeUsersToGroup')).'
'; diff --git a/main/social/group_members.php b/main/social/group_members.php index 8ea6c6df59..cb91b573f0 100755 --- a/main/social/group_members.php +++ b/main/social/group_members.php @@ -113,27 +113,27 @@ echo '
'; echo '
'.Display::return_icon('content-post-group1.jpg',get_lang('MemberList')).'
'; echo '