Skip to content

Commit 55f2e98

Browse files
committed
Clean up some ambiguous translatable strings (bgo#734969)
1 parent 6c23e5e commit 55f2e98

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

data/org.gnome.meld.gschema.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<key name="use-system-font" type="b">
112112
<default>true</default>
113113
<summary>Use the system default monospace font</summary>
114-
<description>If false, the defined custom font will be used instead of the system monospace font.</description>
114+
<description>If false, custom-font will be used instead of the system monospace font.</description>
115115
</key>
116116
<key name="custom-font" type="s">
117117
<default>"monospace, 14"</default>
@@ -132,7 +132,7 @@
132132
<key name="use-system-editor" type="b">
133133
<default>true</default>
134134
<summary>Use the system default editor</summary>
135-
<description>If false, the defined custom editor will be used instead of the system editor when opening files externally.</description>
135+
<description>If false, custom-editor-command will be used instead of the system editor when opening files externally.</description>
136136
</key>
137137
<key name="custom-editor-command" type="s">
138138
<default>""</default>
@@ -186,7 +186,7 @@
186186
<key name="vc-merge-file-order" enum="org.gnome.meld.mergefileorder">
187187
<default>"remote-merge-local"</default>
188188
<summary>Order for files in three-way version control merge comparisons</summary>
189-
<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>
189+
<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>
190190
</key>
191191
<key name="vc-show-commit-margin" type="b">
192192
<default>true</default>
@@ -201,7 +201,7 @@
201201
<key name="vc-break-commit-message" type="b">
202202
<default>false</default>
203203
<summary>Automatically hard-wrap commit messages</summary>
204-
<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>
204+
<description>If true, the version control commit message editor will hard-wrap (i.e., insert line breaks) at the commit margin before commit.</description>
205205
</key>
206206
<key name="vc-status-filters" type="as">
207207
<default>['flatten', 'modified']</default>

data/ui/filediff.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
<child>
2929
<object class="GtkAction" id="SplitAdd">
3030
<property name="label" translatable="yes">Add Synchronization Point</property>
31-
<property name="tooltip" translatable="yes">Add a manual point for synchronization of changes between files</property>
31+
<property name="tooltip" translatable="yes">Add a synchronization point for changes between files</property>
3232
<signal name="activate" handler="add_sync_point" swapped="no"/>
3333
</object>
3434
</child>
3535
<child>
3636
<object class="GtkAction" id="SplitClear">
3737
<property name="label" translatable="yes">Clear Synchronization Points</property>
38-
<property name="tooltip" translatable="yes">Clear manual change sychronization points</property>
38+
<property name="tooltip" translatable="yes">Clear sychronization points for changes between files</property>
3939
<signal name="activate" handler="clear_sync_points" swapped="no"/>
4040
</object>
4141
</child>

0 commit comments

Comments
 (0)