Merge branch 'master' of ssh:https://github.com/OsTicket-Reloaded/OsTicket

Conflicts: translate/en/translate.php
OsTicket-Reloaded · Mar 9, 2012 · 0f6ae7e · 0f6ae7e
2 parents 7f77f7b + 91b6f08
commit 0f6ae7e
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 211 deletions.
diff --git a/include/class.nav.php b/include/class.nav.php
@@ -55,7 +55,7 @@ function StaffNav($pagetype='staff'){
  $tabs['kbase']=array('desc'=>$desc,'href'=>'kb.php','title'=>$title);
  }
  $desc = $trl->translate('LABEL_DIRECTORY');
- $title = $trl->translate('LABEL_DIRETORY_STAFF');
+ $title = $trl->translate('LABEL_DIRECTORY_STAFF');
  $tabs['directory']=array('desc'=>$desc,'href'=>'directory.php','title'=>$title);
  $desc = $trl->translate('LABEL_MY_ACCOUNT');
  $title = $trl->translate('LABEL_MY_ACCOUNT');

diff --git a/include/staff/viewticket.inc.php b/include/staff/viewticket.inc.php
@@ -172,26 +172,26 @@ class="inline">
  type='hidden' name='a' value="process" /> <span for="do"> &nbsp;<b>Action:</b>
  </span> <select id="do" name="do"
  onChange="this.form.ticket_priority.disabled=strcmp(this.options[this.selectedIndex].value,'change_priority','reopen','overdue')?false:true;">
- <option value="">Select Action</option>
+ <option value=""><?php te('LABEL_STAFF_VIEWTICKET_SELECT_ACTION')?></option>
  <option value="change_priority"
- <?=$info['do']=='change_priority'?'selected':''?>>Change Priority</option>
+ <?=$info['do']=='change_priority'?'selected':''?>><?php te('LABEL_STAFF_VIEWTICKET_CHANGE_PRIORITY')?></option>
  <?if(!$ticket->isoverdue()){ ?>
- <option value="overdue" <?=$info['do']=='overdue'?'selected':''?>>Mark
- Overdue</option>
+ <option value="overdue" <?=$info['do']=='overdue'?'selected':''?>><?php te('LABEL_STAFF_VIEWTICKET_MARK_OVERDUE')?>
+ </option>
  <?}?>
  <?if($ticket->isAssigned()){ ?>
- <option value="release" <?=$info['do']=='release'?'selected':''?>>Release
- (unassign)</option>
+ <option value="release" <?=$info['do']=='release'?'selected':''?>><?php te('LABEL_STAFF_VIEWTICKET_RELEASE_UNASSIGN')?>
+ </option>
  <?}?>
 
  <?if($thisuser->canCloseTickets()){
  //if you can close a ticket...reopening it is given.
  if($ticket->isOpen()){?>
- <option value="close" <?=$info['do']=='close'?'selected':''?>>Close
- Ticket</option>
+ <option value="close" <?=$info['do']=='close'?'selected':''?>><?php te('LABEL_STAFF_VIEWTICKET_CLOSE_TICKET')?>
+ </option>
  <?}else{?>
- <option value="reopen" <?=$info['do']=='reopen'?'selected':''?>>Reopen
- Ticket</option>
+ <option value="reopen" <?=$info['do']=='reopen'?'selected':''?>><?php te('LABEL_STAFF_VIEWTICKET_REOPEN_TICKET')?>
+ </option>
  <?}
  }?>
  <?php

diff --git a/index.php b/index.php
@@ -40,8 +40,8 @@
 </div>
 <div class="rcol">
  <img src="./images/ticket_status_icon.jpg" width="48" height="48" align="left" style="padding-bottom:150px;">
- <h3><?= $trl->translate('TITLE_OPEN_PREVIUS_TICKET'); ?></h3>
- <?= $trl->translate('TEXT_OPEN_PREVIUS_TICKET'); ?>
+ <h3><?= $trl->translate('TITLE_OPEN_PREVIOUS_TICKET'); ?></h3>
+ <?= $trl->translate('TEXT_OPEN_PREVIOUS_TICKET'); ?>
  <br /><br />
  <form class="status_form" action="login.php" method="post">
  <fieldset>

diff --git a/translate/en/client/index.html b/translate/en/client/index.html
diff --git a/translate/en/client/my_tickets.gif b/translate/en/client/my_tickets.gif
diff --git a/translate/en/client/new_ticket.gif b/translate/en/client/new_ticket.gif
diff --git a/translate/en/client/new_ticket_icon.jpg b/translate/en/client/new_ticket_icon.jpg
diff --git a/translate/en/client/new_ticket_title.jpg b/translate/en/client/new_ticket_title.jpg
diff --git a/translate/en/client/refresh_btn.gif b/translate/en/client/refresh_btn.gif
diff --git a/translate/en/client/ticket_status.gif b/translate/en/client/ticket_status.gif
diff --git a/translate/en/client/ticket_status_icon.jpg b/translate/en/client/ticket_status_icon.jpg
diff --git a/translate/en/client/ticket_status_title.jpg b/translate/en/client/ticket_status_title.jpg
diff --git a/translate/en/client/view_closed_btn.gif b/translate/en/client/view_closed_btn.gif
diff --git a/translate/en/client/view_open_btn.gif b/translate/en/client/view_open_btn.gif
diff --git a/translate/en/languages.php b/translate/en/languages.php
diff --git a/translate/en/translate.php b/translate/en/translate.php
diff --git a/translate/pt_BR/translate.php b/translate/pt_BR/translate.php
@@ -242,6 +242,12 @@
 $LANG['LABEL_STAFF_MEMBER'] = 'Profissional';
 $LANG['LABEL_STAFF_MEMBERS'] = 'Membros da Equipe';
 $LANG['LABEL_STAFF_PANEL'] = 'Painel de Equipe';
+$LANG['LABEL_STAFF_VIEWTICKET_SELECT_ACTION']='Selecione uma Ação';
+$LANG['LABEL_STAFF_VIEWTICKET_CHANGE_PRIORITY']='Alterar Prioridade';
+$LANG['LABEL_STAFF_VIEWTICKET_MARK_OVERDUE']='Marcar como Atrasado';
+$LANG['LABEL_STAFF_VIEWTICKET_RELEASE_UNASSIGN']='Liberar (desatribuir)';
+$LANG['LABEL_STAFF_VIEWTICKET_CLOSE_TICKET']='Fechar Ticket (protocolo)';
+$LANG['LABEL_STAFF_VIEWTICKET_REOPEN_TICKET']='Reabrir Ticket (protocolo)';
 $LANG['LABEL_STATUS'] = 'Situção';
 $LANG['LABEL_STATUS_IS'] = 'No Estado';
 $LANG["LABEL_SETTINGS"] = 'Configurações';