diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2014-08-27 20:22:07 +0400 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2014-08-27 20:22:07 +0400 |
| commit | cf12a56b4c5a2372343e32898dba4f8881f439e8 (patch) | |
| tree | 08b1492873dd4e05f09729bd92095c9df6c4ced0 /src/gui/accountsettings.ui | |
| parent | 2c6324e3e5096af5199bd11e533921d106802ae6 (diff) | |
| parent | 928652e4cf62d918d9cbbdda0100bb4686c38ccd (diff) | |
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/gui/socketapi.cpp
Diffstat (limited to 'src/gui/accountsettings.ui')
| -rw-r--r-- | src/gui/accountsettings.ui | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/accountsettings.ui b/src/gui/accountsettings.ui index e62916ddd..fa7a3d86b 100644 --- a/src/gui/accountsettings.ui +++ b/src/gui/accountsettings.ui @@ -73,7 +73,7 @@ <item> <widget class="QPushButton" name="_buttonSelectiveSync"> <property name="text"> - <string>Selective Sync...</string> + <string>Choose What to Sync</string> </property> </widget> </item> |