diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-12-12 18:58:34 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-12-12 18:58:34 +0100 |
| commit | eabcf90f5266b746503fef5c438971d7d6a1689e (patch) | |
| tree | 7f2d6d38d297a0f4c4b4e7d52e0d59ce7f7f025b /app/layout/aside_subscription.phtml | |
| parent | 99763412c2f49e4e52b5a0343bb465141be76188 (diff) | |
| parent | 6078888de631ea105410079888838503fd7acb3d (diff) | |
Merge branch 'dev' into beta
Conflicts:
app/i18n/en.php
app/i18n/fr.php
Diffstat (limited to 'app/layout/aside_subscription.phtml')
| -rw-r--r-- | app/layout/aside_subscription.phtml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml index cbf5df67d..8a54e2dc2 100644 --- a/app/layout/aside_subscription.phtml +++ b/app/layout/aside_subscription.phtml @@ -1,17 +1,17 @@ <ul class="nav nav-list aside"> - <li class="nav-header"><?php echo _t('subscription_management'); ?></li> + <li class="nav-header"><?php echo _t('sub.menu.subscription_management'); ?></li> <li class="item<?php echo Minz_Request::controllerName() == 'subscription' ? ' active' : ''; ?>"> - <a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('subscription_management'); ?></a> + <a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('sub.menu.subscription_management'); ?></a> </li> <li class="item<?php echo Minz_Request::controllerName() == 'importExport' ? ' active' : ''; ?>"> - <a href="<?php echo _url('importExport', 'index'); ?>"><?php echo _t('import_export'); ?></a> + <a href="<?php echo _url('importExport', 'index'); ?>"><?php echo _t('sub.menu.import_export'); ?></a> </li> <li class="item"> <a onclick="return false;" href="javascript:(function(){var%20url%20=%20location.href;window.open('<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&url_rss='+encodeURIComponent(url), '_blank');})();"> - <?php echo _t('bookmark'); ?> + <?php echo _t('sub.menu.bookmark'); ?> </a> </li> </ul> |