diff --git a/include/class.forms.php b/include/class.forms.php
index b66421adfffa0bffbf4256badab0e68ed21cd7b4..2f597eb0757008ade7abe3a7a624561db47dd420 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -1028,27 +1028,27 @@ class TicketStateField extends ChoiceField {
 
     static $_states = array(
             'open' => array(
-                'name' => /* @trans */ 'Open',
-                'verb' => /* @trans */ 'Open'
+                'name' => /* @trans, @context "ticket state name" */ 'Open',
+                'verb' => /* @trans, @context "ticket state action" */ 'Open'
                 ),
             'resolved' => array(
-                'name' => /* @trans */ 'Resolved',
-                'verb' => /* @trans */ 'Resolve'
+                'name' => /* @trans, @context "ticket state name" */ 'Resolved',
+                'verb' => /* @trans, @context "ticket state action" */ 'Resolve'
                 ),
             'closed' => array(
-                'name' => /* @trans */ 'Closed',
-                'verb' => /* @trans */ 'Close'
+                'name' => /* @trans, @context "ticket state name" */ 'Closed',
+                'verb' => /* @trans, @context "ticket state action" */ 'Close'
                 )
             );
     // Private states
     static $_privatestates = array(
             'archived' => array(
-                'name' => /* @trans */ 'Archived',
-                'verb' => /* @trans */ 'Archive'
+                'name' => /* @trans, @context "ticket state name" */ 'Archived',
+                'verb' => /* @trans, @context "ticket state action" */ 'Archive'
                 ),
             'deleted'  => array(
-                'name' => /* @trans */ 'Deleted',
-                'verb' => /* @trans */ 'Delete'
+                'name' => /* @trans, @context "ticket state name" */ 'Deleted',
+                'verb' => /* @trans, @context "ticket state action" */ 'Delete'
                 )
             );
 
@@ -1066,7 +1066,7 @@ class TicketStateField extends ChoiceField {
         if (!isset($_choices)) {
             // Translate and cache the choices
             foreach (static::$_states as $k => $v)
-                $_choices[$k] =  __($v['name']);
+                $_choices[$k] =  _P('ticket state name', $v['name']);
 
             $this->ht['default'] =  '';
         }
@@ -1080,10 +1080,10 @@ class TicketStateField extends ChoiceField {
             $state = key($state);
 
         if (isset(static::$_states[$state]))
-            return __(static::$_states[$state]['name']);
+            return _P('ticket state name', static::$_states[$state]['name']);
 
         if (isset(static::$_privatestates[$state]))
-            return __(static::$_privatestates[$state]['name']);
+            return _P('ticket state name', static::$_privatestates[$state]['name']);
 
         return $state;
     }
@@ -1101,10 +1101,10 @@ class TicketStateField extends ChoiceField {
     static function getVerb($state) {
 
         if (isset(static::$_states[$state]))
-            return __(static::$_states[$state]['verb']);
+            return _P('ticket state action', static::$_states[$state]['verb']);
 
         if (isset(static::$_privatestates[$state]))
-            return __(static::$_privatestates[$state]['verb']);
+            return _P('ticket state action', static::$_privatestates[$state]['verb']);
     }
 }
 FormField::addFieldTypes('Dynamic Fields', function() {
diff --git a/include/client/view.inc.php b/include/client/view.inc.php
index 60d94cbc784dccedfe5e3f5bf72b72bff0790470..8e547913a10b73e7efac108fd81d141365f17858 100644
--- a/include/client/view.inc.php
+++ b/include/client/view.inc.php
@@ -16,7 +16,7 @@ if ($thisclient && $thisclient->isGuest()
     <strong><?php echo __('Looking for your other tickets?'); ?></strong></br>
     <a href="<?php echo ROOT_PATH; ?>login.php?e=<?php
         echo urlencode($thisclient->getEmail());
-    ?>" style="text-decoration:underline"><?php echo __('Sign In'); ?></a> or
+    ?>" style="text-decoration:underline"><?php echo __('Sign In'); ?></a>
     <?php echo sprintf(__('or %s register for an account %s for the best experience on our help desk.'),
         '<a href="account.php?do=create" style="text-decoration:underline">','</a>'); ?>
     </div>
diff --git a/include/staff/settings-system.inc.php b/include/staff/settings-system.inc.php
index bb99bc5cc5865e8ad2bcd782615c29ee9bb2ecee..30efbb4c5d084cbd44c5f4a48b915bf39e6afb11 100644
--- a/include/staff/settings-system.inc.php
+++ b/include/staff/settings-system.inc.php
@@ -114,7 +114,7 @@ $gmtime = Misc::gmtime();
     list($desc, $func) = $f;
     $selected = ($config['name_format'] == $n) ? 'selected="selected"' : ''; ?>
                     <option value="<?php echo $n; ?>" <?php echo $selected;
-                        ?>><?php echo $desc; ?></option>
+                        ?>><?php echo __($desc); ?></option>
 <?php } ?>
                 </select>
                 <i class="help-tip icon-question-sign" href="#default_name_formatting"></i>