tt-rss.php: gettextification (fixes)

diff --git a/tt-rss.php b/tt-rss.php
index 461a6e94df389b7700f6eb295f47f0a22ff8b2a6..a0bb4108fb3addc249e71d7ba122385bfc1e905c 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -128,45 +128,45 @@ window.onload = init;
 
                <div style="float : right">
                        <select id="quickMenuChooser" onchange="quickMenuChange()">
-                                       <option value="qmcDefault" selected><?php _('Actions...') ?></option>
-                                       <option value="qmcSearch"><?php _('Search') ?></option>
-                                       <option value="qmcPrefs"><?php _('Preferences') ?></option>
+                                       <option value="qmcDefault" selected><?php echo _('Actions...') ?></option>
+                                       <option value="qmcSearch"><?php echo _('Search') ?></option>
+                                       <option value="qmcPrefs"><?php echo _('Preferences') ?></option>
                                        <option disabled>--------</option>
-                                       <option style="color : #5050aa" disabled><?php _('Feed actions:') ?></option>
-                                       <option value="qmcAddFeed"><?php _('&nbsp;&nbsp;Subscribe to feed') ?></option>
-                                       <option value="qmcEditFeed"><?php _('&nbsp;&nbsp;Edit this feed') ?></option>
-                                       <option value="qmcRemoveFeed"><?php _('&nbsp;&nbsp;Unsubscribe') ?></option>
+                                       <option style="color : #5050aa" disabled><?php echo _('Feed actions:') ?></option>
+                                       <option value="qmcAddFeed"><?php echo _('&nbsp;&nbsp;Subscribe to feed') ?></option>
+                                       <option value="qmcEditFeed"><?php echo _('&nbsp;&nbsp;Edit this feed') ?></option>
+                                       <option value="qmcRemoveFeed"><?php echo _('&nbsp;&nbsp;Unsubscribe') ?></option>
                                        <!-- <option>Edit this feed</option> -->
                                        <option disabled>--------</option>
-                                       <option style="color : #5050aa" disabled><?php _('All feeds:') ?></option>
+                                       <option style="color : #5050aa" disabled><?php echo _('All feeds:') ?></option>
                                        <?php if (!ENABLE_UPDATE_DAEMON && !DAEMON_REFRESH_ONLY) { ?>
-                                       <option value="qmcUpdateFeeds"><?php _('&nbsp;&nbsp;Update') ?></option>
+                                       <option value="qmcUpdateFeeds"><?php echo _('&nbsp;&nbsp;Update') ?></option>
                                        <?php } ?>
-                                       <option value="qmcCatchupAll"><?php _('&nbsp;&nbsp;Mark as read') ?></option>
-                                       <option value="qmcShowOnlyUnread"><?php _('&nbsp;&nbsp;(Un)hide read feeds') ?></option>
+                                       <option value="qmcCatchupAll"><?php echo _('&nbsp;&nbsp;Mark as read') ?></option>
+                                       <option value="qmcShowOnlyUnread"><?php echo _('&nbsp;&nbsp;(Un)hide read feeds') ?></option>
                                        <option disabled>--------</option>
-                                       <option style="color : #5050aa" disabled><?php _('Other actions:') ?></option>                          
-                                       <option value="qmcAddFilter"><?php _('&nbsp;&nbsp;Create filter') ?></option>
+                                       <option style="color : #5050aa" disabled><?php echo _('Other actions:') ?></option>                             
+                                       <option value="qmcAddFilter"><?php echo _('&nbsp;&nbsp;Create filter') ?></option>
                        </select>
                </div>
 
                <form id="main_toolbar_form">
 
-               <?php _('Search:') ?>
+               <?php echo _('Search:') ?>
                <input name="query"
                        onKeyPress="return filterCR(event, viewCurrentFeed)"
                        onblur="javascript:enableHotkeys();" onfocus="javascript:disableHotkeys();">
                &nbsp; 
-               <?php _('View:') ?>
+               <?php echo _('View:') ?>
                <select name="view_mode" onchange="viewCurrentFeed(0, '')">
-                       <option selected value="adaptive"><?php _('Adaptive') ?></option>
-                       <option value="all_articles"><?php _('All Articles') ?></option>
-                       <option value="marked"><?php _('Starred') ?></option>
-                       <option value="unread"><?php _('Unread') ?></option>
+                       <option selected value="adaptive"><?php echo _('Adaptive') ?></option>
+                       <option value="all_articles"><?php echo _('All Articles') ?></option>
+                       <option value="marked"><?php echo _('Starred') ?></option>
+                       <option value="unread"><?php echo _('Unread') ?></option>
                </select>
                
                &nbsp;
-               <?php _('Limit:') ?>
+               <?php echo _('Limit:') ?>
                <?php
                $limits = array(15 => 15, 30 => 30, 60 => 60, 0 => "All");
                        
@@ -192,7 +192,7 @@ window.onload = init;
                        onclick="quickMenuGo('qmcSearch')" value="Search (tmp)"> -->
 
                &nbsp;<input class="button" type="submit"
-                       onclick="viewCurrentFeed('ForceUpdate')" value="<?php _('Update') ?>">
+                       onclick="viewCurrentFeed('ForceUpdate')" value="<?php echo _('Update') ?>">
 
                <!-- <input class="button" type="submit"
                        onclick="catchupCurrentFeed()" value="Mark as read">  -->
@@ -201,11 +201,11 @@ window.onload = init;
 
 <?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?>
        <div id="headlines-frame" class="headlines_normal">
-               <div class="whiteBox"><?php _('No feed selected.') ?></div></div>
+               <div class="whiteBox"><?php echo _('No feed selected.') ?></div></div>
        <div id="content-frame"><div class="whiteBox">&nbsp;</div></div>
 <?php } else { ?>
        <div id="headlines-frame" class="headlines_cdm">
-               <div class="whiteBox"><?php _('No feed selected.') ?></div></div>
+               <div class="whiteBox"><?php echo _('No feed selected.') ?></div></div>
 <?php } ?>
 
 <div id="footer">