summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Locale/bs_BA/translations.php72
-rw-r--r--app/Locale/fr_FR/translations.php4
-rw-r--r--app/Template/user/index.php5
3 files changed, 44 insertions, 37 deletions
diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php
index e384f923..19a11c44 100644
--- a/app/Locale/bs_BA/translations.php
+++ b/app/Locale/bs_BA/translations.php
@@ -763,14 +763,14 @@ return array(
'List' => 'Lista',
'Filter' => 'Filter',
'Advanced search' => 'Napredna pretraga',
- 'Example of query: ' => 'Primjer za upit',
- 'Search by project: ' => 'Pretraga po projektu',
- 'Search by column: ' => 'Pretraga po koloni',
- 'Search by assignee: ' => 'Pretraga po izvršiocu',
- 'Search by color: ' => 'Pretraga po boji',
- 'Search by category: ' => 'Pretraga po kategoriji',
- 'Search by description: ' => 'Pretraga po opisu',
- 'Search by due date: ' => 'Pretraga po datumu završetka',
+ 'Example of query: ' => 'Primjer za upit: ',
+ 'Search by project: ' => 'Pretraga po projektu: ',
+ 'Search by column: ' => 'Pretraga po koloni: ',
+ 'Search by assignee: ' => 'Pretraga po izvršiocu: ',
+ 'Search by color: ' => 'Pretraga po boji: ',
+ 'Search by category: ' => 'Pretraga po kategoriji: ',
+ 'Search by description: ' => 'Pretraga po opisu: ',
+ 'Search by due date: ' => 'Pretraga po datumu završetka: ',
'Lead and Cycle time for "%s"' => 'Vrijeme upravljanje i vremenski ciklus za "%s"',
'Average time spent into each column for "%s"' => 'Prosjek utrošenog vremena u svakoj koloni za "%s"',
'Average time spent into each column' => 'Prosjek utrošenog vrmena u svakoj koloni',
@@ -1135,32 +1135,32 @@ return array(
'There is no action at the moment.' => 'Trenutno nema akcija.',
'Import actions from another project' => 'Uvezi akcije iz drugog projekta',
'There is no available project.' => 'Trenutno nema dostupnih projekata.',
- // 'Local File' => '',
- // 'Configuration' => '',
- // 'PHP version:' => '',
- // 'PHP SAPI:' => '',
- // 'OS version:' => '',
- // 'Database version:' => '',
- // 'Browser:' => '',
- // 'Task view' => '',
- // 'Edit task' => '',
- // 'Edit description' => '',
- // 'New internal link' => '',
- // 'Display list of keyboard shortcuts' => '',
- // 'Menu' => '',
- // 'Set start date' => '',
- // 'Avatar' => '',
- // 'Upload my avatar image' => '',
- // 'Remove my image' => '',
- // 'The OAuth2 state parameter is invalid' => '',
- // 'User not found.' => '',
- // 'Search in activity stream' => '',
- // 'My activities' => '',
- // 'Activity until yesterday' => '',
- // 'Activity until today' => '',
- // 'Search by creator: ' => '',
- // 'Search by creation date: ' => '',
- // 'Search by task status: ' => '',
- // 'Search by task title: ' => '',
- // 'Activity stream search' => '',
+ 'Local File' => 'Lokalni fajl',
+ 'Configuration' => 'Konfiguracija',
+ 'PHP version:' => 'Verzija PHP-a:',
+ 'PHP SAPI:' => 'Verzija SAPI-a:',
+ 'OS version:' => 'Verzija OS-a:',
+ 'Database version:' => 'Verzija baze podataka:',
+ 'Browser:' => 'Pretraživač:',
+ 'Task view' => 'Pregled zadatka',
+ 'Edit task' => 'Uredi zadatak',
+ 'Edit description' => 'Uredi opis',
+ 'New internal link' => 'Nova unutrašnja veza',
+ 'Display list of keyboard shortcuts' => 'Prikaži listu prečica na tastaturi',
+ 'Menu' => 'Meni',
+ 'Set start date' => 'Postavi početni datum',
+ 'Avatar' => 'Avatar',
+ 'Upload my avatar image' => 'Dodaj sliku za moj avatar',
+ 'Remove my image' => 'Ukloni moju sliku',
+ 'The OAuth2 state parameter is invalid' => 'OAuth2 status parametar nije validan',
+ 'User not found.' => 'Korisnik nije pronađen.',
+ 'Search in activity stream' => 'Pretraži aktivnosti',
+ 'My activities' => 'Moje aktivnosti',
+ 'Activity until yesterday' => 'Aktivnosti do jučer',
+ 'Activity until today' => 'Aktivnosti do danas',
+ 'Search by creator: ' => 'Pretraga po kreatoru: ',
+ 'Search by creation date: ' => 'Pretraga po datumu kreiranja: ',
+ 'Search by task status: ' => 'Pretraga po statusu zadatka: ',
+ 'Search by task title: ' => 'Pretraga po naslovu zadatka: ',
+ 'Activity stream search' => 'Pretraga aktivnosti',
);
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index 0c2e4955..ed4638cd 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -1163,4 +1163,8 @@ return array(
'Search by task status: ' => 'Rechercher par le statut des tâches : ',
'Search by task title: ' => 'Rechercher par le titre des tâches : ',
'Activity stream search' => 'Recherche dans le flux d\'activité',
+ 'Projects where "%s" is manager' => 'Projets où « %s » est gestionnaire',
+ 'Projects where "%s" is member' => 'Projets où « %s » est membre du projet',
+ 'Open tasks assigned to "%s"' => 'Tâches ouvertes assignées à « %s »',
+ 'Closed tasks assigned to "%s"' => 'Tâches fermées assignées à « %s »',
);
diff --git a/app/Template/user/index.php b/app/Template/user/index.php
index 364fd965..0b5da17c 100644
--- a/app/Template/user/index.php
+++ b/app/Template/user/index.php
@@ -14,6 +14,7 @@
<?php else: ?>
<table class="table-stripped">
<tr>
+ <th class="column-5"><?= $paginator->order(t('Id'), 'id') ?></th>
<th class="column-18"><?= $paginator->order(t('Username'), 'username') ?></th>
<th class="column-18"><?= $paginator->order(t('Name'), 'name') ?></th>
<th class="column-15"><?= $paginator->order(t('Email'), 'email') ?></th>
@@ -26,7 +27,9 @@
<?php foreach ($paginator->getCollection() as $user): ?>
<tr>
<td>
- <?= '#'.$user['id'] ?>&nbsp;
+ <?= '#'.$user['id'] ?>
+ </td>
+ <td>
<?= $this->url->link($this->text->e($user['username']), 'user', 'show', array('user_id' => $user['id'])) ?>
</td>
<td>