chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge

Browse Source
skala
cfasanando 15 years ago
parent d04841fc57 9090ffea6c
commit 0f39f24162
41 changed files with 178 additions and 42 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9
      main/css/academica/default.css
  2. 9
      main/css/baby_orange/default.css
  3. 3
      main/css/blue_lagoon/default.css
  4. 5
      main/css/chamilo/default.css
  5. 3
      main/css/cool_blue/default.css
  6. 9
      main/css/corporate/default.css
  7. 13
      main/css/cosmic_campus/default.css
  8. 3
      main/css/delicious_bordeaux/default.css
  9. 3
      main/css/dokeos_blue/default.css
  10. 3
      main/css/dokeos_classic/default.css
  11. 3
      main/css/dokeos_classic_2D/default.css
  12. 3
      main/css/empire_green/default.css
  13. 3
      main/css/fruity_orange/default.css
  14. 3
      main/css/medical/default.css
  15. 3
      main/css/public_admin/default.css
  16. 3
      main/css/royal_purple/default.css
  17. 2
      main/css/silver_line/default.css
  18. 3
      main/css/sober_brown/default.css
  19. 3
      main/css/steel_grey/default.css
  20. 3
      main/css/tasty_olive/default.css
  21. BIN
      main/img/accept_invitation.png
  22. BIN
      main/img/denied_invitation.png
  23. 4
      main/inc/lib/social.lib.php
  24. 1
      main/lang/english/trad4all.inc.php
  25. 6
      main/lang/english/userInfo.inc.php
  26. 1
      main/lang/italian/admin.inc.php
  27. 1
      main/lang/italian/courses.inc.php
  28. 5
      main/lang/italian/exercice.inc.php
  29. 1
      main/lang/italian/learnpath.inc.php
  30. 1
      main/lang/italian/survey.inc.php
  31. 9
      main/lang/italian/trad4all.inc.php
  32. 1
      main/lang/italian/userInfo.inc.php
  33. 1
      main/lang/italian/wiki.inc.php
  34. 1
      main/lang/italian/work.inc.php
  35. 1
      main/lang/spanish/trad4all.inc.php
  36. 4
      main/lang/spanish/userInfo.inc.php
  37. 2
      main/lang/spanish/work.inc.php
  38. 22
      main/lang/turkce/reservation.inc.php
  39. 6
      main/social/group_waiting_list.php
  40. 4
      main/social/invitations.php
  41. BIN
      tests/procedures/spanish/social_network.xls

9
main/css/academica/default.css
Unescape View File

@ -189,6 +189,15 @@ a.breadcrumb0 {
background:url(images/home.gif) no-repeat; background:url(images/home.gif) no-repeat;
padding-left: 22px; padding-left: 22px;
} }
/* The tool shortcuts */
#toolshortcuts {
text-align: right;
clear: right;
margin-left: auto;
margin-right: auto;
width: 97.6%
}
/* footer styles */ /* footer styles */
#footer { #footer {
height: 22em; height: 22em;

9
main/css/baby_orange/default.css
Unescape View File

@ -176,6 +176,15 @@ a.breadcrumb0 {
background:url(images/home.gif) no-repeat; background:url(images/home.gif) no-repeat;
padding-left: 22px; padding-left: 22px;
} }
/* The tool shortcuts */
#toolshortcuts {
text-align: right;
clear: right;
margin-left: auto;
margin-right: auto;
width: 99%
}
/* footer styles */ /* footer styles */
#footer { #footer {

3
main/css/blue_lagoon/default.css
Unescape View File

@ -348,6 +348,9 @@ select, input[type=checkbox], input[type=radio], input[type=button], input[type=
#toolshortcuts { #toolshortcuts {
text-align: right; text-align: right;
clear: right; clear: right;
margin-left: auto;
margin-right: auto;
width: 98%;
} }
/***************************************************** /*****************************************************
* FOOTER STYLES * * FOOTER STYLES *

5
main/css/chamilo/default.css
Unescape View File

@ -510,8 +510,11 @@ margin-top:0;
} }
/* The tool shortcuts */ /* The tool shortcuts */
#toolshortcuts { #toolshortcuts {
text-align: right;
clear:right; clear:right;
margin-left:auto;
margin-right:auto;
text-align:right;
width:92%;
} }
/***************************************************** /*****************************************************
* FOOTER STYLES * * FOOTER STYLES *

3
main/css/cool_blue/default.css
Unescape View File

@ -334,6 +334,9 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
#toolshortcuts { #toolshortcuts {
text-align: right; text-align: right;
clear: right; clear: right;
margin-left: auto;
margin-right: auto;
width: 98%;
} }
/***************************************************** /*****************************************************
* FOOTER STYLES * * FOOTER STYLES *

9
main/css/corporate/default.css
Unescape View File

@ -200,6 +200,15 @@ a.breadcrumb0 {
background:url(images/home.gif) no-repeat; background:url(images/home.gif) no-repeat;
padding-left: 22px; padding-left: 22px;
} }
/* The tool shortcuts */
#toolshortcuts {
text-align: right;
clear: right;
margin-left: auto;
margin-right: auto;
width: 97.6%
}
/* footer styles */ /* footer styles */
#footer { #footer {
border-top: 1px solid #aeaeae; border-top: 1px solid #aeaeae;

13
main/css/cosmic_campus/default.css
Unescape View File

@ -199,6 +199,15 @@ input[type=button], input[type=submit] {
text-decoration: none; text-decoration: none;
color: #f3840d; color: #f3840d;
} }
/* The tool shortcuts */
#toolshortcuts {
text-align: right;
clear: right;
margin-left: auto;
margin-right: auto;
padding: 10px;
width: 98.7%;
}
a.breadcrumb { a.breadcrumb {
height: 21px; height: 21px;
} }
@ -206,6 +215,7 @@ a.breadcrumb0 {
background:url(images/home.gif) no-repeat; background:url(images/home.gif) no-repeat;
padding-left: 22px; padding-left: 22px;
} }
/* footer styles */ /* footer styles */
#footer { #footer {
height: 7em; height: 7em;
@ -499,6 +509,7 @@ form span.form_error {
padding:2px; padding:2px;
margin-bottom: 5px; margin-bottom: 5px;
vertical-align:middle; vertical-align:middle;
width: 99.8%
} }
.actions img { .actions img {
/*display:inline-block;*/ /*display:inline-block;*/
@ -774,7 +785,7 @@ a.personal_agenda:hover, a.personal_agenda:hover {
.data_table { .data_table {
margin: 3px; margin: 3px;
border-collapse: collapse; border-collapse: collapse;
width: 100%; width: 99.8%;
padding: 5px; padding: 5px;
} }
.data_table th { .data_table th {

3
main/css/delicious_bordeaux/default.css
Unescape View File

@ -344,6 +344,9 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
#toolshortcuts { #toolshortcuts {
text-align: right; text-align: right;
clear: right; clear: right;
margin-left: auto;
margin-right: auto;
width: 98%
} }
/***************************************************** /*****************************************************
* FOOTER STYLES * * FOOTER STYLES *

3
main/css/dokeos_blue/default.css
Unescape View File

@ -334,6 +334,9 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
#toolshortcuts { #toolshortcuts {
text-align: right; text-align: right;
clear: right; clear: right;
margin-left: auto;
margin-right: auto;
width: 98%;
} }
/***************************************************** /*****************************************************
* FOOTER STYLES * * FOOTER STYLES *

3
main/css/dokeos_classic/default.css
Unescape View File

@ -379,6 +379,9 @@ input[text] {
#toolshortcuts { #toolshortcuts {
text-align: right; text-align: right;
clear: right; clear: right;
margin-left: auto;
margin-right: auto;
width: 98%
} }
/***************************************************** /*****************************************************
* FOOTER STYLES * * FOOTER STYLES *

3
main/css/dokeos_classic_2D/default.css
Unescape View File

@ -350,6 +350,9 @@ input.link_alike:hover {
#toolshortcuts { #toolshortcuts {
text-align: right; text-align: right;
clear: right; clear: right;
margin-left: auto;
margin-right: auto;
width: 98%;
} }
/* /*
============================================================================== ==============================================================================

3
main/css/empire_green/default.css
Unescape View File

@ -345,6 +345,9 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
#toolshortcuts { #toolshortcuts {
text-align: right; text-align: right;
clear: right; clear: right;
margin-left: auto;
margin-right: auto;
width: 98%
} }
/***************************************************** /*****************************************************
* FOOTER STYLES * * FOOTER STYLES *

3
main/css/fruity_orange/default.css
Unescape View File

@ -345,6 +345,9 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
#toolshortcuts { #toolshortcuts {
text-align: right; text-align: right;
clear: right; clear: right;
margin-left: auto;
margin-right: auto;
width: 98%
} }
/***************************************************** /*****************************************************
* FOOTER STYLES * * FOOTER STYLES *

3
main/css/medical/default.css
Unescape View File

@ -398,6 +398,9 @@ input[text] {
#toolshortcuts { #toolshortcuts {
text-align: right; text-align: right;
clear: right; clear: right;
margin-left: auto;
margin-right: auto;
width: 98%
} }
/***************************************************** /*****************************************************
* FOOTER STYLES * * FOOTER STYLES *

3
main/css/public_admin/default.css
Unescape View File

@ -398,6 +398,9 @@ select, input[type=checkbox], input[type=radio], input[type=button], input[type=
#toolshortcuts { #toolshortcuts {
text-align: right; text-align: right;
clear: right; clear: right;
margin-left: auto;
margin-right: auto;
width: 98%
} }
/***************************************************** /*****************************************************
* FOOTER STYLES * * FOOTER STYLES *

3
main/css/royal_purple/default.css
Unescape View File

@ -345,6 +345,9 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
#toolshortcuts { #toolshortcuts {
text-align: right; text-align: right;
clear: right; clear: right;
margin-left: auto;
margin-right: auto;
width: 98%;
} }
/***************************************************** /*****************************************************
* FOOTER STYLES * * FOOTER STYLES *

2
main/css/silver_line/default.css
Unescape View File

@ -338,7 +338,7 @@ ul {
width:550px; width:550px;
position: absolute; position: absolute;
bottom:-.75em; bottom:-.75em;
right:.5em; right: 1em;
padding: 0; padding: 0;
margin:0; margin:0;
text-align: right; text-align: right;

3
main/css/sober_brown/default.css
Unescape View File

@ -386,6 +386,9 @@ input[text] {
#toolshortcuts { #toolshortcuts {
text-align: right; text-align: right;
clear: right; clear: right;
margin-left: auto;
margin-right: auto;
width: 98%
} }
/***************************************************** /*****************************************************
* FOOTER STYLES * * FOOTER STYLES *

3
main/css/steel_grey/default.css
Unescape View File

@ -345,6 +345,9 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
#toolshortcuts { #toolshortcuts {
text-align: right; text-align: right;
clear: right; clear: right;
margin-left: auto;
margin-right: auto;
width: 98%
} }
/***************************************************** /*****************************************************
* FOOTER STYLES * * FOOTER STYLES *

3
main/css/tasty_olive/default.css
Unescape View File

@ -345,6 +345,9 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
#toolshortcuts { #toolshortcuts {
text-align: right; text-align: right;
clear: right; clear: right;
margin-left: auto;
margin-right: auto;
width: 98%;
} }
/***************************************************** /*****************************************************
* FOOTER STYLES * * FOOTER STYLES *

BIN
main/img/accept_invitation.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
main/img/denied_invitation.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

4
main/inc/lib/social.lib.php
Unescape View File

@ -779,14 +779,14 @@ class SocialManager extends UserManager {
if ($user_id != api_get_user_id()) { if ($user_id != api_get_user_id()) {
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=610&user_friend='.$user_id.'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">'; echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=610&user_friend='.$user_id.'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">';
echo Display::return_icon('message_new.png').'&nbsp;&nbsp;'.get_lang('SendMessage').'</a></li>'; echo Display::return_icon('message_new.png',get_lang('SendMessage')).'&nbsp;&nbsp;'.get_lang('SendMessage').'</a></li>';
} }
//check if I already sent an invitation message //check if I already sent an invitation message
$invitation_sent_list = SocialManager::get_list_invitation_sent_by_user_id(api_get_user_id()); $invitation_sent_list = SocialManager::get_list_invitation_sent_by_user_id(api_get_user_id());
if (is_array($invitation_sent_list) && is_array($invitation_sent_list[$user_id]) && count($invitation_sent_list[$user_id]) >0 ) { if (is_array($invitation_sent_list) && is_array($invitation_sent_list[$user_id]) && count($invitation_sent_list[$user_id]) >0 ) {
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.get_lang('YouAlreadySentAnInvitation').'</a></li>'; echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('mail_send.png',get_lang('YouAlreadySentAnInvitation')).'&nbsp;&nbsp;'.get_lang('YouAlreadySentAnInvitation').'</a></li>';
} else { } else {
if (!$show_full_profile) { if (!$show_full_profile) {
echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?view_panel=2&height=260&width=610&user_friend='.$user_id.'" class="thickbox" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('add_multiple_users.gif', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a></li>'; echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?view_panel=2&height=260&width=610&user_friend='.$user_id.'" class="thickbox" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('add_multiple_users.gif', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a></li>';

1
main/lang/english/trad4all.inc.php
Unescape View File

@ -772,4 +772,5 @@ $Created = "Created";
$LastUpdate = "Last update"; $LastUpdate = "Last update";
$UserNonRegisteredAtTheCourse = "User non registered at the course"; $UserNonRegisteredAtTheCourse = "User non registered at the course";
$EditMyProfile = "Edit my profile"; $EditMyProfile = "Edit my profile";
$Announcements = "Announcements";
?> ?>

6
main/lang/english/userInfo.inc.php
Unescape View File

@ -179,7 +179,7 @@ $UserAdded = "User added";
$FilesSizeExceedsX = "Files size exceeds"; $FilesSizeExceedsX = "Files size exceeds";
$YouShouldWriteASubject = "You should write a subject"; $YouShouldWriteASubject = "You should write a subject";
$Topics = "Topics"; $Topics = "Topics";
$StatusInThisGroup = "status in this group"; $StatusInThisGroup = "Status in this group";
$DescriptionGroup = "Description group"; $DescriptionGroup = "Description group";
$FriendsOnline = "Friends online"; $FriendsOnline = "Friends online";
$GroupDescription = "Group description"; $GroupDescription = "Group description";
@ -189,4 +189,8 @@ $ClickHereToSeeMessageGroup = "Click here to see message group";
$OrCopyPasteTheFollowingUrl = "Or copy paste the following url"; $OrCopyPasteTheFollowingUrl = "Or copy paste the following url";
$ThereIsANewMessageInTheGroupX = "There is a new message in the group %s"; $ThereIsANewMessageInTheGroupX = "There is a new message in the group %s";
$UserIsAlreadySubscribedToThisGroup = "User is already subscribed to this group"; $UserIsAlreadySubscribedToThisGroup = "User is already subscribed to this group";
$AddNormalUser = "Add as a normal user ";
$AddModerator = "Add as a moderator";
$DenyEntry = "Deny the entry";
$YouNeedToHaveFriendsInYourSocialNetwork = "You need to have friends in your social network";
?> ?>

1
main/lang/italian/admin.inc.php
Unescape View File

@ -1125,4 +1125,5 @@ $TabsSocial = "Etichetta social network";
$MessageMaxUploadFilesizeTitle = "Messaggio: dimensione massima file da caricare"; $MessageMaxUploadFilesizeTitle = "Messaggio: dimensione massima file da caricare";
$MessageMaxUploadFilesizeComment = "Messaggio: dimensione massima file da caricare"; $MessageMaxUploadFilesizeComment = "Messaggio: dimensione massima file da caricare";
$AddAdditionalProfileField = "Aggiungi un campo al profilo utente"; $AddAdditionalProfileField = "Aggiungi un campo al profilo utente";
$Username = "Nome utente";
?> ?>

1
main/lang/italian/courses.inc.php
Unescape View File

@ -82,4 +82,5 @@ $Expand = "Espandi";
$Collapse = "Riduci"; $Collapse = "Riduci";
$CourseDetails = "Informazioni sul corso"; $CourseDetails = "Informazioni sul corso";
$GroupPendingInvitations = "Gruppi con inviti in attesa"; $GroupPendingInvitations = "Gruppi con inviti in attesa";
$Compose = "Scrivi";
?> ?>

5
main/lang/italian/exercice.inc.php
Unescape View File

@ -353,4 +353,9 @@ $ExerciseTotalDurationInMinutes = "Durata totale del test in minuti";
$ToContinueUseMenu = "Per procedere usa il menù a lato"; $ToContinueUseMenu = "Per procedere usa il menù a lato";
$RandomAnswers = "Mescola le risposte"; $RandomAnswers = "Mescola le risposte";
$NotMarkActivity = "Non è possibile valutare l\'attività"; $NotMarkActivity = "Non è possibile valutare l\'attività";
$YouHaveToCreateAtLeastOneAnswer = "Devi indicare almeno una risposta valida";
$YouHaveToCreateAtLeastOneAnswer = "Devi indicare almeno una risposta valida";
$ExerciseAttempted = "Quesito affrontato";
$MultipleSelectCombination = "Selezione multipla";
$MultipleAnswerCombination = "Risposta multipla";
?> ?>

1
main/lang/italian/learnpath.inc.php
Unescape View File

@ -245,4 +245,5 @@ $AddForumToCourse = "Includi Forum nel modulo";
$SaveAudioAndOrganization = "Salva audio e ordinamento"; $SaveAudioAndOrganization = "Salva audio e ordinamento";
$UploadOnlyMp3Files = "Si possono caricare solo file mp3, grazie"; $UploadOnlyMp3Files = "Si possono caricare solo file mp3, grazie";
$ModifyHotPotatoes = "Modifica l\'elemento HotPotatoes"; $ModifyHotPotatoes = "Modifica l\'elemento HotPotatoes";
$SaveHotpotatoes = "Salva hotpotatoes";
?> ?>

1
main/lang/italian/survey.inc.php
Unescape View File

@ -202,4 +202,5 @@ $BackToSurvey = "Torna al questionario";
$UpdateInformation = "Aggiorna informazione"; $UpdateInformation = "Aggiorna informazione";
$PleaseFillSurvey = "Riempi il questionario, grazie."; $PleaseFillSurvey = "Riempi il questionario, grazie.";
$ReportingOverview = "Report di sintesi"; $ReportingOverview = "Report di sintesi";
$ThereAreNotQuestionsForthisSurvey = "Non ci sono domande nel questionario";
?> ?>

9
main/lang/italian/trad4all.inc.php
Unescape View File

@ -764,4 +764,13 @@ $UserAdded = "Utente aggiunto";
$UpdatedIn = "Aggiornato"; $UpdatedIn = "Aggiornato";
$Metadata = "Metadati"; $Metadata = "Metadati";
$langAddMetadata = "Vedi/Modifica i metadati"; $langAddMetadata = "Vedi/Modifica i metadati";
$SendMessage = "Invia messaggio";
$SeeForum = "Visita il forum";
$SeeMore = "Vedi tutto";
$NoDataAvailable = "Data non disponibile";
$Created = "Creato";
$LastUpdate = "Ultimo aggiornamento";
$UserNonRegisteredAtTheCourse = "Utente non iscritto al corso";
$EditMyProfile = "Modifica il profilo personale";
$Announcements = "Avvisi";
?> ?>

1
main/lang/italian/userInfo.inc.php
Unescape View File

@ -178,4 +178,5 @@ $InvitationDenied = "Invito non accettato";
$UserAdded = "Utente aggiunto"; $UserAdded = "Utente aggiunto";
$FilesSizeExceedsX = "Superata la dimensione massima del file"; $FilesSizeExceedsX = "Superata la dimensione massima del file";
$YouShouldWriteASubject = "Devi scrivere l\'oggetto del messaggio"; $YouShouldWriteASubject = "Devi scrivere l\'oggetto del messaggio";
$Topics = "Argomenti";
?> ?>

1
main/lang/italian/wiki.inc.php
Unescape View File

@ -176,4 +176,5 @@ $Feedback3 = "Terzo messaggio";
$FProgress = "Progresso"; $FProgress = "Progresso";
$PutATimeLimit = "Limiti di tempo"; $PutATimeLimit = "Limiti di tempo";
$StandardTask = "Compito predefinito"; $StandardTask = "Compito predefinito";
$ThePageHasBeenExportedToDocArea = "La pagina è stata esportata nella sezione Documenti";
?> ?>

1
main/lang/italian/work.inc.php
Unescape View File

@ -77,4 +77,5 @@ $StudentAllowedToDeleteOwnPublication = "Consenti agli studenti di eliminare i d
$TheDocumentHasBeenDeleted = "Documento eliminato"; $TheDocumentHasBeenDeleted = "Documento eliminato";
$YouAreNotAllowedToDeleteThisDocument = "Non hai il permesso di eliminare il documento"; $YouAreNotAllowedToDeleteThisDocument = "Non hai il permesso di eliminare il documento";
$ConfirmYourChoiceDeleteAllfiles = "TUTTI I FILE SARANNO ELIMINATI E NON POTRANNO ESSERE RECUPERATI CONFERMANDO LA SCELTA"; $ConfirmYourChoiceDeleteAllfiles = "TUTTI I FILE SARANNO ELIMINATI E NON POTRANNO ESSERE RECUPERATI CONFERMANDO LA SCELTA";
$WorkName = "Titolo del compito";
?> ?>

1
main/lang/spanish/trad4all.inc.php
Unescape View File

@ -772,4 +772,5 @@ $Created = "Creado";
$LastUpdate = "Última actualización"; $LastUpdate = "Última actualización";
$UserNonRegisteredAtTheCourse = "Usuario no registrado en el curso"; $UserNonRegisteredAtTheCourse = "Usuario no registrado en el curso";
$EditMyProfile = "Editar mi perfil"; $EditMyProfile = "Editar mi perfil";
$Announcements = "Anuncios";
?> ?>

4
main/lang/spanish/userInfo.inc.php
Unescape View File

@ -189,4 +189,8 @@ $ClickHereToSeeMessageGroup = "Clic aqu
$OrCopyPasteTheFollowingUrl = "O copiar y pegar la siguente url"; $OrCopyPasteTheFollowingUrl = "O copiar y pegar la siguente url";
$ThereIsANewMessageInTheGroupX = "Hay un nuevo mensaje en el grupo %s"; $ThereIsANewMessageInTheGroupX = "Hay un nuevo mensaje en el grupo %s";
$UserIsAlreadySubscribedToThisGroup = "El usuario ya esta suscrito a este grupo"; $UserIsAlreadySubscribedToThisGroup = "El usuario ya esta suscrito a este grupo";
$AddNormalUser = "Agregar como un usuario normal";
$AddModerator = "Agregar como moderador";
$DenyEntry = "Denegar la entrada";
$YouNeedToHaveFriendsInYourSocialNetwork = "Usted necesita tener amigos en su red social";
?> ?>

2
main/lang/spanish/work.inc.php
Unescape View File

@ -86,5 +86,5 @@ $ViewUsersWithoutTask = "Aun no presentan la tarea";
$ViewUsersWithTask = "Ya presentaron la tarea"; $ViewUsersWithTask = "Ya presentaron la tarea";
$ReminderMessage = "Enviar un recordatorio"; $ReminderMessage = "Enviar un recordatorio";
$DateSent = "Fecha de envío"; $DateSent = "Fecha de envío";
$ViewUsersWithoutTask = "Faltan presentar tarea"; $ViewUsersWithoutTask = "Faltan presentar la tarea";
?> ?>

22
main/lang/turkce/reservation.inc.php
Unescape View File

@ -1,4 +1,26 @@
<?php /* <?php /*
for more information: see languages.txt in the lang folder. for more information: see languages.txt in the lang folder.
*/ */
$ReservationPeriodToSmall = "Rezervasyon süresi çok k&#305;sa";
$BookingSystem = "Rezervasyon Sistemi";
$BookingPeriodList = "Rezervasy&#305;n süreleri listesi";
$BookingListView = "Rezervasyon listesi";
$BookingCalendarView = "Rezervasyon takvim görüntüsü";
$BookingPeriods = "&#304;&#351; Program&#305;";
$ResourceList = "Kaynak Listesi";
$GoToCalendarView = "Takvim görünümü";
$GoToListView = "Liste görüntüsü";
$ManageResources = "Kaynak yönetimi";
$EditResource = "Kaynak düzenle";
$BookIt = "Bir kaynak rezerve et";
$GoTo = "Git";
$NoTimePicker = "Zaman seçici yok";
$TimePicker = "Zaman seçici";
$ManageBookingPeriods = "Rezervasyon sürelerini yönet";
$BookingPeriodToSmall = "Rezervasyon süresi çok k&#305;sa";
$BookingPeriodToBig = "Rezervasyon süresi çok büyük";
$DeleteSelectedBookingPeriod = "Seçili rezervasyon sürelerini sil";
$EditNewBookingPeriod = "Rezervasyon süresini düzenle";
$BookingPeriodAdded = "Rezervasyon eklendi";
$BookingPeriodDeleted = "Rezervasyon silindi";
?> ?>

6
main/social/group_waiting_list.php
Unescape View File

@ -106,9 +106,9 @@ echo '<div id="social-content">';
foreach($users as $user) { foreach($users as $user) {
switch ($user['relation_type']) { switch ($user['relation_type']) {
case GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER: case GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER:
$user['link'] = '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=accept">'.Display::return_icon('add_normal_user.png', get_lang('Accept')).'</a>'; $user['link'] = '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=accept">'.Display::return_icon('add_normal_user.png', get_lang('AddNormalUser')).'</a>';
$user['link'] .= '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=set_moderator">'.Display::return_icon('add_moderator.png', get_lang('Moderator')).'</a>'; $user['link'] .= '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=set_moderator">'.Display::return_icon('add_moderator.png', get_lang('AddModerator')).'</a>';
$user['link'] .= '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=deny">'.Display::return_icon('delete.gif', get_lang('Deny')).'</a>'; $user['link'] .= '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=deny">'.Display::return_icon('delete.gif', get_lang('DenyEntry')).'</a>';
break; break;
} }
$new_member_list[] = $user; $new_member_list[] = $user;

4
main/social/invitations.php
Unescape View File

@ -228,8 +228,8 @@ echo '<div id="social-content">';
$invitation['picture_uri'] = '<a href="groups.php?id='.$invitation['id'].'">'.$img.'</a>'; $invitation['picture_uri'] = '<a href="groups.php?id='.$invitation['id'].'">'.$img.'</a>';
$invitation['name'] = '<a href="groups.php?id='.$invitation['id'].'">'.cut($invitation['name'],120,true).'</a>'; $invitation['name'] = '<a href="groups.php?id='.$invitation['id'].'">'.cut($invitation['name'],120,true).'</a>';
$invitation['join'] = '<a href="invitations.php?accept='.$invitation['id'].'">'.get_lang('AcceptInvitation').'</a>'; $invitation['join'] = '<a href="invitations.php?accept='.$invitation['id'].'">'.Display::return_icon('accept_invitation.png', get_lang('AcceptInvitation')).'&nbsp;&nbsp;'.get_lang('AcceptInvitation').'</a>';
$invitation['deny'] = '<a href="invitations.php?deny='.$invitation['id'].'">'.get_lang('DenyInvitation').'</a>'; $invitation['deny'] = '<a href="invitations.php?deny='.$invitation['id'].'">'.Display::return_icon('denied_invitation.png', get_lang('DenyInvitation')).'&nbsp;&nbsp;'.get_lang('DenyInvitation').'</a>';
$invitation['description'] = cut($invitation['description'],220,true); $invitation['description'] = cut($invitation['description'],220,true);
//$invitation['send_message'] = '<a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=610&user_friend='.$invitation['id'].'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">'; //$invitation['send_message'] = '<a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=610&user_friend='.$invitation['id'].'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">';
//$invitation['send_message'] .= Display::return_icon('message_new.png').'&nbsp;&nbsp;'.get_lang('SendMessage').'</a>'; //$invitation['send_message'] .= Display::return_icon('message_new.png').'&nbsp;&nbsp;'.get_lang('SendMessage').'</a>';

BIN
tests/procedures/spanish/social_network.xls
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save