diff options
| author | Christian Kamm <kamm@incasoftware.de> | 2014-12-10 15:01:36 +0300 |
|---|---|---|
| committer | Christian Kamm <kamm@incasoftware.de> | 2014-12-10 15:01:36 +0300 |
| commit | 53d5de685c9d9a73899f02f739f15fd25c3efce0 (patch) | |
| tree | fdb4026b1cd50bfa319d3a980be585b3e54d1d3e /src/gui/folderwizardtargetpage.ui | |
| parent | e982790ad55374a85dced0b04a2cdb4f6807398b (diff) | |
| parent | f0ce8b8fd4f87eca0e5e1f33943448498c7eda5b (diff) | |
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/libsync/networkjobs.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagatedownload.cpp
Diffstat (limited to 'src/gui/folderwizardtargetpage.ui')
| -rw-r--r-- | src/gui/folderwizardtargetpage.ui | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/folderwizardtargetpage.ui b/src/gui/folderwizardtargetpage.ui index 483178ae9..0f242e1a7 100644 --- a/src/gui/folderwizardtargetpage.ui +++ b/src/gui/folderwizardtargetpage.ui @@ -137,7 +137,7 @@ <item row="1" column="1"> <widget class="QPushButton" name="addFolderButton"> <property name="text"> - <string>Add Folder</string> + <string>Create Folder</string> </property> </widget> </item> |