From 07dfbae1309a1d5d1ce38d11124cbffd816153d8 Sun, 16 Sep 2012 11:55:04 +0200
From: hass <hass@85918.no-reply.drupal.org>
Date: Sun, 16 Sep 2012 11:54:34 +0200
Subject: [PATCH] #1785742: Translatable string review

diff --git a/diff.module b/diff.module
index a9c200a..e0f33f2 100644
--- a/diff.module
+++ b/diff.module
@@ -16,7 +16,7 @@
 function diff_help($path, $arg) {
   switch ($path) {
     case 'admin/help#diff':
-      $output = '<p>' . t('The diff module overwrites the normal revisions view. The revisions table is enhanced with a possibility to view the difference between two node revisions. Users with the %view_revisions permission will also be able to view the changes between any two selected revisions. You may disable this for individual content types on the content type configuration page. This module also provides a nifty %preview_changes button while editing a post.', array('%preview_changes' => t('View changes'), '%view_revisions' => t('view revisions'))) . '</p>';
+      $output = '<p>' . t('The diff module overwrites the normal revisions view. The revisions table is enhanced with a possibility to view the difference between two node revisions. Users with the <em>View revisions</em> permission will also be able to view the changes between any two selected revisions. You may disable this for individual content types on the content type configuration page. This module also provides a nifty <em>View changes</em> button while editing a post.') . '</p>';
       return $output;
     case 'node/%/revisions/%/view':
       // the following string is copied from string copied from node_help('node/%/revisions')
@@ -53,7 +53,7 @@
     'file' => 'diff.pages.inc',
   );
   $items['node/%node/revisions/view'] = array(
-    'title' => 'Diff',
+    'title' => 'Differences',
     'page callback' => 'diff_diffs_show',
     'page arguments' => array(1, 4, 5, 6),
     'type' => MENU_LOCAL_TASK,
@@ -63,7 +63,7 @@
     'file' => 'diff.pages.inc',
   );
   $items['node/%node/revisions/view/latest'] = array(
-    'title' => 'Show latest diff',
+    'title' => 'Show latest differences',
     'page callback' => 'diff_latest',
     'page arguments' => array(1),
     'type' => MENU_LOCAL_TASK,
@@ -115,7 +115,7 @@
  * Implements hook_block_info().
  */
 function diff_block_info() {
-  return array('inline' => array('info' => t('Inline diff')));
+  return array('inline' => array('info' => t('Inline differences')));
 }
 
 /**
@@ -176,14 +176,14 @@
     // Node type edit form.
     // Add checkbox to activate 'View changes' button per node type.
     $form['diff'] = array(
-      '#title' => t('Diff'),
+      '#title' => t('Differences'),
       '#type' => 'fieldset',
       '#group' => 'additional_settings',
       '#tree' => FALSE,
     );
     $form['diff']['show_preview_changes'] = array(
       '#type' => 'checkbox',
-      '#title' => t('Show %preview_changes button on node edit form', array('%preview_changes' => t('View changes'))),
+      '#title' => t('Show <em>View changes<em> button on node edit form'),
       '#weight' => 10,
       '#default_value' => variable_get('show_preview_changes_' . $form['#node_type']->type, TRUE),
     );
@@ -195,14 +195,14 @@
     );
     $form['diff']['show_diff_inline'] = array(
       '#type' => 'checkbox',
-      '#title' => t('Show diffs inline for this content type'),
-      '#description' => t("You must enable the 'Inline diff' block to use this feature"),
+      '#title' => t('Show differences inline for this content type'),
+      '#description' => t("You must enable the <em>Inline differences</em> block to use this feature."),
       '#weight' => 10,
       '#default_value' => variable_get('show_diff_inline_' . $form['#node_type']->type, FALSE),
     );
     $form['diff']['enable_revisions_page'] = array(
       '#type' => 'checkbox',
-      '#title' => t('Enable the %revisions page for this content type', array('%revisions' => t('Revisions'))),
+      '#title' => t('Enable the <em>Revisions</em> page for this content type'),
       '#weight' => 11,
       '#default_value' => variable_get('enable_revisions_page_' . $form['#node_type']->type, TRUE),
     );
@@ -320,7 +320,7 @@
   );
   $form['revision'] = array(
     '#type' => 'select',
-    '#options' => array(0 => '< ' . t('No highlighting') . ' >'),
+    '#options' => array(0 => t('- No highlighting -')),
     '#default_value' => (arg(2) === 'revisions' && arg(3) === $node->vid) ? $node->vid : 0,
     '#ajax' => array(
       'callback' => 'diff_inline_ajax',
diff --git a/diff.pages.inc b/diff.pages.inc
index 7304e2c..ed8810a 100644
--- a/diff.pages.inc
+++ b/diff.pages.inc
@@ -113,7 +113,7 @@
     '#options' => $revision_ids,
     '#default_value' => $new_vid
   );
-  $form['submit'] = array('#type' => 'submit', '#value' => t('Show diff'));
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Compare'));
 
   if (count($revision_list) > REVISION_LIST_SIZE) {
     $form['#suffix'] = theme('pager');
@@ -159,7 +159,7 @@
 function diff_diffs_show($node, $old_vid, $new_vid, $remove_markup = NULL) {
 
   // Set same title as on the 'Revisions' tab for consistency
-  drupal_set_title(t('Revisions for @title', array('@title' => $node->title)));
+  drupal_set_title(t('Revisions for %title', array('%@title' => $node->title)));
 
   $node_revisions = node_revision_list($node);
 
@@ -187,14 +187,14 @@
   // Generate previous diff/next diff links.
   $next_vid = _diff_get_next_vid($node_revisions, $new_vid);
   if ($next_vid) {
-    $next_link = l(t('next diff >'), 'node/' . $node->nid . '/revisions/view/' . $new_vid . '/' . $next_vid);
+    $next_link = l(t('next difference >'), 'node/' . $node->nid . '/revisions/view/' . $new_vid . '/' . $next_vid);
   }
   else {
     $next_link = '';
   }
   $prev_vid = _diff_get_previous_vid($node_revisions, $old_vid);
   if ($prev_vid) {
-    $prev_link = l(t('< previous diff'), 'node/' . $node->nid . '/revisions/view/' . $prev_vid . '/' . $old_vid);
+    $prev_link = l(t('< previous difference'), 'node/' . $node->nid . '/revisions/view/' . $prev_vid . '/' . $old_vid);
   }
   else {
     $prev_link = '';
@@ -229,10 +229,10 @@
   );
 
   if ($remove_markup) {
-    $show_hide_markup_link= l(t('Show Markup'), 'node/'. $node->nid .'/revisions/view/'. $old_vid .'/'. $new_vid .'/0');
+    $show_hide_markup_link= l(t('Show markup'), 'node/'. $node->nid .'/revisions/view/'. $old_vid .'/'. $new_vid .'/0');
   }
   else {
-    $show_hide_markup_link = l(t('Hide Markup'), 'node/'. $node->nid .'/revisions/view/'. $old_vid .'/'. $new_vid .'/1');
+    $show_hide_markup_link = l(t('Hide markup'), 'node/'. $node->nid .'/revisions/view/'. $old_vid .'/'. $new_vid .'/1');
   }
   $rows[] = array(
     array(