[meld] Clean up some ambiguous translatable strings (bgo#734969)

[Kai Willadsen <kaiw src gnome org>]

commit 55f2e981f618591418b9b2c0f24c8f68eb572114
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jan 11 06:06:02 2015 +1000

    Clean up some ambiguous translatable strings (bgo#734969)

 data/org.gnome.meld.gschema.xml |    8 ++++----
 data/ui/filediff.ui             |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/data/org.gnome.meld.gschema.xml b/data/org.gnome.meld.gschema.xml
index f0f6f2a..a58408c 100644
--- a/data/org.gnome.meld.gschema.xml
+++ b/data/org.gnome.meld.gschema.xml
@@ -111,7 +111,7 @@
       <key name="use-system-font" type="b">
           <default>true</default>
           <summary>Use the system default monospace font</summary>
-          <description>If false, the defined custom font will be used instead of the system monospace 
font.</description>
+          <description>If false, custom-font will be used instead of the system monospace font.</description>
       </key>
       <key name="custom-font" type="s">
           <default>"monospace, 14"</default>
@@ -132,7 +132,7 @@
       <key name="use-system-editor" type="b">
           <default>true</default>
           <summary>Use the system default editor</summary>
-          <description>If false, the defined custom editor will be used instead of the system editor when 
opening files externally.</description>
+          <description>If false, custom-editor-command will be used instead of the system editor when 
opening files externally.</description>
       </key>
       <key name="custom-editor-command" type="s">
           <default>""</default>
@@ -186,7 +186,7 @@
       <key name="vc-merge-file-order" enum="org.gnome.meld.mergefileorder">
           <default>"remote-merge-local"</default>
           <summary>Order for files in three-way version control merge comparisons</summary>
-          <description>Choices for file order are remote/merge/local and local/merged/remote. This 
preference only affects three-way comparisons launched from the version control view, so is used solely for 
merges/conflict resolution within Meld.</description>
+          <description>Choices for file order are remote/merged/local and local/merged/remote. This 
preference only affects three-way comparisons launched from the version control view, so is used solely for 
merges/conflict resolution within Meld.</description>
       </key>
       <key name="vc-show-commit-margin" type="b">
           <default>true</default>
@@ -201,7 +201,7 @@
       <key name="vc-break-commit-message" type="b">
           <default>false</default>
           <summary>Automatically hard-wrap commit messages</summary>
-          <description>If true, the version control commit message editor will hard-wrap (i.e., insert line 
breaks) at the defined commit margin before commit.</description>
+          <description>If true, the version control commit message editor will hard-wrap (i.e., insert line 
breaks) at the commit margin before commit.</description>
       </key>
       <key name="vc-status-filters" type="as">
           <default>['flatten', 'modified']</default>
diff --git a/data/ui/filediff.ui b/data/ui/filediff.ui
index 0ce4373..2e9f3e6 100644
--- a/data/ui/filediff.ui
+++ b/data/ui/filediff.ui
@@ -28,14 +28,14 @@
     <child>
       <object class="GtkAction" id="SplitAdd">
         <property name="label" translatable="yes">Add Synchronization Point</property>
-        <property name="tooltip" translatable="yes">Add a manual point for synchronization of changes 
between files</property>
+        <property name="tooltip" translatable="yes">Add a synchronization point for changes between 
files</property>
         <signal name="activate" handler="add_sync_point" swapped="no"/>
       </object>
     </child>
     <child>
       <object class="GtkAction" id="SplitClear">
         <property name="label" translatable="yes">Clear Synchronization Points</property>
-        <property name="tooltip" translatable="yes">Clear manual change sychronization points</property>
+        <property name="tooltip" translatable="yes">Clear sychronization points for changes between 
files</property>
         <signal name="activate" handler="clear_sync_points" swapped="no"/>
       </object>
     </child>