Commit 8a6167d0 authored by Steve Borho's avatar Steve Borho
Browse files

sync: improve descriptions of rebase and fetch post-pull options

parent c31c5c69803a
......@@ -730,7 +730,7 @@ class PostPullDialog(QDialog):
if 'fetch' in repo.extensions() or repo.postpull == 'fetch':
if 'fetch' in repo.extensions():
btntxt = _('Fetch - use fetch extension')
btntxt = _('Fetch - use fetch (auto merge pulled changes)')
else:
btntxt = _('Fetch - use fetch extension (fetch is not active!)')
self.fetch = QRadioButton(btntxt)
......@@ -739,7 +739,7 @@ class PostPullDialog(QDialog):
self.fetch = None
if 'rebase' in repo.extensions() or repo.postpull == 'rebase':
if 'rebase' in repo.extensions():
btntxt = _('Rebase - use rebase extension')
btntxt = _('Rebase - rebase local commits above pulled changes')
else:
btntxt = _('Rebase - use rebase extension (rebase is not active!)')
self.rebase = QRadioButton(btntxt)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment