← Back to branch summary

~ubuntu-branches/ubuntu/wily/blueman/wily

« back to all changes in this revision

Viewing changes to data/ui/services-transfer.ui

  • Committer: Package Import Robot
  • Author(s): Sean Davis
  • Date: 2015-09-07 12:48:18 UTC
  • mfrom: (2.3.11 sid)
  • Revision ID: package-import@ubuntu.com-20150907124818-evulc0mhjotz8q29
Tags: 2.0-1ubuntu1
https://launchpad.net/bugs/1482626
* Merge from Debian unstable (LP: #1482626). Remaining changes:
  - debian/patches/03_filemanage_fix.patch:
    + Dropped, no longer needed.
  - debian/patches/dhcpclient_priority
  - debian/patches/01_dont_autostart_lxde.patch
    + Refreshed patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/ui/services-transfer.ui
25
25
                <child>
26
26
                  <object class="GtkLabel" id="label1">
27
27
                    <property name="visible">True</property>
28
 
                    <property name="label" translatable="yes">Shared Folder:</property>
 
28
                    <property name="label" translatable="yes">Incoming Folder:</property>
29
29
                  </object>
30
30
                  <packing>
31
31
                    <property name="expand">False</property>
33
33
                  </packing>
34
34
                </child>
35
35
                <child>
36
 
                  <object class="GtkFileChooserButton" id="shared_path">
 
36
                  <object class="GtkFileChooserButton" id="shared-path">
37
37
                    <property name="visible">True</property>
38
38
                    <property name="action">select-folder</property>
39
 
                    <property name="title" translatable="yes">Select Shared/Storage folder</property>
 
39
                    <property name="title" translatable="yes">Select folder for incoming file transfers</property>
40
40
                  </object>
41
41
                  <packing>
42
42
                    <property name="expand">False</property>
64
64
                        <property name="orientation">vertical</property>
65
65
                        <property name="visible">True</property>
66
66
                        <child>
67
 
                          <object class="GtkCheckButton" id="opp_enabled">
68
 
                            <property name="label" translatable="yes">Enabled</property>
69
 
                            <property name="visible">True</property>
70
 
                            <property name="can_focus">True</property>
71
 
                            <property name="receives_default">False</property>
72
 
                            <property name="draw_indicator">True</property>
73
 
                          </object>
74
 
                          <packing>
75
 
                            <property name="position">0</property>
76
 
                          </packing>
77
 
                        </child>
78
 
                        <child>
79
 
                          <object class="GtkCheckButton" id="opp_accept">
 
67
                          <object class="GtkCheckButton" id="opp-accept">
80
68
                            <property name="label" translatable="yes">Accept files from trusted devices</property>
81
69
                            <property name="visible">True</property>
82
70
                            <property name="can_focus">True</property>
84
72
                            <property name="draw_indicator">True</property>
85
73
                          </object>
86
74
                          <packing>
87
 
                            <property name="position">1</property>
 
75
                            <property name="position">0</property>
88
76
                          </packing>
89
77
                        </child>
90
78
                      </object>
105
93
              </packing>
106
94
            </child>
107
95
            <child>
108
 
              <object class="GtkFrame" id="frame4">
109
 
                <property name="visible">True</property>
110
 
                <property name="label_xalign">0</property>
111
 
                <property name="shadow_type">none</property>
112
 
                <child>
113
 
                  <object class="GtkAlignment" id="alignment8">
114
 
                    <property name="visible">True</property>
115
 
                    <property name="top_padding">4</property>
116
 
                    <property name="left_padding">12</property>
117
 
                    <child>
118
 
                      <object class="GtkBox" id="vbox8">
119
 
                        <property name="orientation">vertical</property>
120
 
                        <property name="visible">True</property>
121
 
                        <child>
122
 
                          <object class="GtkCheckButton" id="ftp_enabled">
123
 
                            <property name="label" translatable="yes">Enabled</property>
124
 
                            <property name="visible">True</property>
125
 
                            <property name="can_focus">True</property>
126
 
                            <property name="receives_default">False</property>
127
 
                            <property name="draw_indicator">True</property>
128
 
                          </object>
129
 
                          <packing>
130
 
                            <property name="position">0</property>
131
 
                          </packing>
132
 
                        </child>
133
 
                        <child>
134
 
                          <object class="GtkCheckButton" id="ftp_allow_write">
135
 
                            <property name="label" translatable="yes">Allow devices to write/delete</property>
136
 
                            <property name="visible">True</property>
137
 
                            <property name="can_focus">True</property>
138
 
                            <property name="receives_default">False</property>
139
 
                            <property name="draw_indicator">True</property>
140
 
                          </object>
141
 
                          <packing>
142
 
                            <property name="position">1</property>
143
 
                          </packing>
144
 
                        </child>
145
 
                      </object>
146
 
                    </child>
147
 
                  </object>
148
 
                </child>
149
 
                <child type="label">
150
 
                  <object class="GtkLabel" id="label4">
151
 
                    <property name="visible">True</property>
152
 
                    <property name="label" translatable="yes">&lt;b&gt;File Sharing (FTP)&lt;/b&gt;</property>
153
 
                    <property name="use_markup">True</property>
154
 
                  </object>
155
 
                </child>
156
 
              </object>
157
 
              <packing>
158
 
                <property name="expand">False</property>
159
 
                <property name="position">2</property>
160
 
              </packing>
161
 
            </child>
162
 
            <child>
163
96
              <object class="GtkExpander" id="expander1">
164
97
                <property name="visible">True</property>
165
98
                <property name="can_focus">True</property>
187
120
                          </packing>
188
121
                        </child>
189
122
                        <child>
190
 
                          <object class="GtkEntry" id="e_obex_cmd">
 
123
                          <object class="GtkEntry" id="e-obex-cmd">
191
124
                            <property name="visible">True</property>
192
125
                            <property name="can_focus">True</property>
193
126
                            <property name="invisible_char">&#x25CF;</property>
227
160
          <object class="GtkImage" id="image3">
228
161
            <property name="visible">True</property>
229
162
            <property name="pixel_size">32</property>
230
 
            <property name="icon_name">gtk-open</property>
 
163
            <property name="icon_name">document-open</property>
231
164
          </object>
232
165
          <packing>
233
166
            <property name="position">0</property>