commit ba972402df3eb6cbc3069bcde231c4f8a8dc07eb Author: n8fr8 nathan@freitas.net Date: Tue Jul 24 12:58:40 2012 -0400

update graphics --- res/drawable-hdpi-v11/ic_stat_notify.png | Bin 0 -> 900 bytes res/drawable-hdpi-v11/ic_stat_notifyerr.png | Bin 0 -> 480 bytes res/drawable-hdpi-v9/ic_stat_notify.png | Bin 0 -> 1014 bytes res/drawable-hdpi-v9/ic_stat_notifyerr.png | Bin 0 -> 616 bytes res/drawable-hdpi/ic_action_browse.png | Bin 0 -> 1790 bytes res/drawable-hdpi/ic_action_settings.png | Bin 0 -> 553 bytes res/drawable-hdpi/ic_action_start.png | Bin 0 -> 474 bytes res/drawable-hdpi/ic_launcher.png | Bin 0 -> 8751 bytes res/drawable-hdpi/ic_stat_notify.png | Bin 0 -> 1701 bytes res/drawable-hdpi/ic_stat_notifyerr.png | Bin 0 -> 1312 bytes res/drawable-ldpi-v11/ic_stat_notify.png | Bin 0 -> 398 bytes res/drawable-ldpi-v11/ic_stat_notifyerr.png | Bin 0 -> 294 bytes res/drawable-ldpi-v9/ic_stat_notify.png | Bin 0 -> 466 bytes res/drawable-ldpi-v9/ic_stat_notifyerr.png | Bin 0 -> 342 bytes res/drawable-ldpi/ic_action_browse.png | Bin 0 -> 729 bytes res/drawable-ldpi/ic_action_settings.png | Bin 0 -> 319 bytes res/drawable-ldpi/ic_action_start.png | Bin 0 -> 255 bytes res/drawable-ldpi/ic_launcher.png | Bin 0 -> 2852 bytes res/drawable-ldpi/ic_stat_notify.png | Bin 0 -> 761 bytes res/drawable-ldpi/ic_stat_notifyerr.png | Bin 0 -> 647 bytes res/drawable-mdpi-v11/ic_stat_notify.png | Bin 0 -> 563 bytes res/drawable-mdpi-v11/ic_stat_notifyerr.png | Bin 0 -> 357 bytes res/drawable-mdpi-v9/ic_stat_notify.png | Bin 0 -> 644 bytes res/drawable-mdpi-v9/ic_stat_notifyerr.png | Bin 0 -> 458 bytes res/drawable-mdpi/ic_action_browse.png | Bin 0 -> 1072 bytes res/drawable-mdpi/ic_action_settings.png | Bin 0 -> 364 bytes res/drawable-mdpi/ic_action_start.png | Bin 0 -> 305 bytes res/drawable-mdpi/ic_launcher.png | Bin 0 -> 4389 bytes res/drawable-mdpi/ic_stat_notify.png | Bin 0 -> 1033 bytes res/drawable-mdpi/ic_stat_notifyerr.png | Bin 0 -> 883 bytes res/drawable-xhdpi-v11/ic_stat_notify.png | Bin 0 -> 1203 bytes res/drawable-xhdpi-v11/ic_stat_notifyerr.png | Bin 0 -> 618 bytes res/drawable-xhdpi-v9/ic_stat_notify.png | Bin 0 -> 1445 bytes res/drawable-xhdpi-v9/ic_stat_notifyerr.png | Bin 0 -> 747 bytes res/drawable-xhdpi/ic_action_browse.png | Bin 0 -> 2616 bytes res/drawable-xhdpi/ic_action_settings.png | Bin 0 -> 716 bytes res/drawable-xhdpi/ic_action_start.png | Bin 0 -> 585 bytes res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 14446 bytes res/drawable-xhdpi/ic_stat_notify.png | Bin 0 -> 2324 bytes res/drawable-xhdpi/ic_stat_notifyerr.png | Bin 0 -> 1796 bytes res/drawable/ic_launcher.png | Bin 0 -> 8751 bytes res/drawable/tornotification.png | Bin 1080 -> 0 bytes res/drawable/tornotificationerr.png | Bin 751 -> 0 bytes res/drawable/tornotificationgimpsrc.xcf | Bin 3042 -> 0 bytes res/drawable/tornotificationon.png | Bin 1123 -> 0 bytes res/layout/layout_wizard_tips.xml | 78 +++++++++++++++++++++----- res/menu-v11/main.xml | 6 +- res/menu-v13/main.xml | 6 +- res/menu/main.xml | 6 +- res/values-v11/styles.xml | 5 ++ res/values-v14/styles.xml | 5 ++ res/values/strings.xml | 5 ++ res/values/styles.xml | 5 ++ 53 files changed, 92 insertions(+), 24 deletions(-)

diff --git a/res/drawable-hdpi-v11/ic_stat_notify.png b/res/drawable-hdpi-v11/ic_stat_notify.png new file mode 100644 index 0000000..f977038 Binary files /dev/null and b/res/drawable-hdpi-v11/ic_stat_notify.png differ diff --git a/res/drawable-hdpi-v11/ic_stat_notifyerr.png b/res/drawable-hdpi-v11/ic_stat_notifyerr.png new file mode 100644 index 0000000..1f97a9e Binary files /dev/null and b/res/drawable-hdpi-v11/ic_stat_notifyerr.png differ diff --git a/res/drawable-hdpi-v9/ic_stat_notify.png b/res/drawable-hdpi-v9/ic_stat_notify.png new file mode 100644 index 0000000..45e749e Binary files /dev/null and b/res/drawable-hdpi-v9/ic_stat_notify.png differ diff --git a/res/drawable-hdpi-v9/ic_stat_notifyerr.png b/res/drawable-hdpi-v9/ic_stat_notifyerr.png new file mode 100644 index 0000000..58fc5ae Binary files /dev/null and b/res/drawable-hdpi-v9/ic_stat_notifyerr.png differ diff --git a/res/drawable-hdpi/ic_action_browse.png b/res/drawable-hdpi/ic_action_browse.png new file mode 100644 index 0000000..0972bbd Binary files /dev/null and b/res/drawable-hdpi/ic_action_browse.png differ diff --git a/res/drawable-hdpi/ic_action_settings.png b/res/drawable-hdpi/ic_action_settings.png new file mode 100644 index 0000000..d57b290 Binary files /dev/null and b/res/drawable-hdpi/ic_action_settings.png differ diff --git a/res/drawable-hdpi/ic_action_start.png b/res/drawable-hdpi/ic_action_start.png new file mode 100644 index 0000000..8b7b829 Binary files /dev/null and b/res/drawable-hdpi/ic_action_start.png differ diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..05980b5 Binary files /dev/null and b/res/drawable-hdpi/ic_launcher.png differ diff --git a/res/drawable-hdpi/ic_stat_notify.png b/res/drawable-hdpi/ic_stat_notify.png new file mode 100644 index 0000000..06a4259 Binary files /dev/null and b/res/drawable-hdpi/ic_stat_notify.png differ diff --git a/res/drawable-hdpi/ic_stat_notifyerr.png b/res/drawable-hdpi/ic_stat_notifyerr.png new file mode 100644 index 0000000..b65fa64 Binary files /dev/null and b/res/drawable-hdpi/ic_stat_notifyerr.png differ diff --git a/res/drawable-ldpi-v11/ic_stat_notify.png b/res/drawable-ldpi-v11/ic_stat_notify.png new file mode 100644 index 0000000..9fdf779 Binary files /dev/null and b/res/drawable-ldpi-v11/ic_stat_notify.png differ diff --git a/res/drawable-ldpi-v11/ic_stat_notifyerr.png b/res/drawable-ldpi-v11/ic_stat_notifyerr.png new file mode 100644 index 0000000..b73292d Binary files /dev/null and b/res/drawable-ldpi-v11/ic_stat_notifyerr.png differ diff --git a/res/drawable-ldpi-v9/ic_stat_notify.png b/res/drawable-ldpi-v9/ic_stat_notify.png new file mode 100644 index 0000000..2a93206 Binary files /dev/null and b/res/drawable-ldpi-v9/ic_stat_notify.png differ diff --git a/res/drawable-ldpi-v9/ic_stat_notifyerr.png b/res/drawable-ldpi-v9/ic_stat_notifyerr.png new file mode 100644 index 0000000..2787bbb Binary files /dev/null and b/res/drawable-ldpi-v9/ic_stat_notifyerr.png differ diff --git a/res/drawable-ldpi/ic_action_browse.png b/res/drawable-ldpi/ic_action_browse.png new file mode 100644 index 0000000..9cf751b Binary files /dev/null and b/res/drawable-ldpi/ic_action_browse.png differ diff --git a/res/drawable-ldpi/ic_action_settings.png b/res/drawable-ldpi/ic_action_settings.png new file mode 100644 index 0000000..c3927fd Binary files /dev/null and b/res/drawable-ldpi/ic_action_settings.png differ diff --git a/res/drawable-ldpi/ic_action_start.png b/res/drawable-ldpi/ic_action_start.png new file mode 100644 index 0000000..fc098d2 Binary files /dev/null and b/res/drawable-ldpi/ic_action_start.png differ diff --git a/res/drawable-ldpi/ic_launcher.png b/res/drawable-ldpi/ic_launcher.png new file mode 100644 index 0000000..dd665db Binary files /dev/null and b/res/drawable-ldpi/ic_launcher.png differ diff --git a/res/drawable-ldpi/ic_stat_notify.png b/res/drawable-ldpi/ic_stat_notify.png new file mode 100644 index 0000000..70ae017 Binary files /dev/null and b/res/drawable-ldpi/ic_stat_notify.png differ diff --git a/res/drawable-ldpi/ic_stat_notifyerr.png b/res/drawable-ldpi/ic_stat_notifyerr.png new file mode 100644 index 0000000..518e188 Binary files /dev/null and b/res/drawable-ldpi/ic_stat_notifyerr.png differ diff --git a/res/drawable-mdpi-v11/ic_stat_notify.png b/res/drawable-mdpi-v11/ic_stat_notify.png new file mode 100644 index 0000000..8e4f9bf Binary files /dev/null and b/res/drawable-mdpi-v11/ic_stat_notify.png differ diff --git a/res/drawable-mdpi-v11/ic_stat_notifyerr.png b/res/drawable-mdpi-v11/ic_stat_notifyerr.png new file mode 100644 index 0000000..935e209 Binary files /dev/null and b/res/drawable-mdpi-v11/ic_stat_notifyerr.png differ diff --git a/res/drawable-mdpi-v9/ic_stat_notify.png b/res/drawable-mdpi-v9/ic_stat_notify.png new file mode 100644 index 0000000..19fbc97 Binary files /dev/null and b/res/drawable-mdpi-v9/ic_stat_notify.png differ diff --git a/res/drawable-mdpi-v9/ic_stat_notifyerr.png b/res/drawable-mdpi-v9/ic_stat_notifyerr.png new file mode 100644 index 0000000..b149031 Binary files /dev/null and b/res/drawable-mdpi-v9/ic_stat_notifyerr.png differ diff --git a/res/drawable-mdpi/ic_action_browse.png b/res/drawable-mdpi/ic_action_browse.png new file mode 100644 index 0000000..cb6075f Binary files /dev/null and b/res/drawable-mdpi/ic_action_browse.png differ diff --git a/res/drawable-mdpi/ic_action_settings.png b/res/drawable-mdpi/ic_action_settings.png new file mode 100644 index 0000000..d90f125 Binary files /dev/null and b/res/drawable-mdpi/ic_action_settings.png differ diff --git a/res/drawable-mdpi/ic_action_start.png b/res/drawable-mdpi/ic_action_start.png new file mode 100644 index 0000000..7d9f391 Binary files /dev/null and b/res/drawable-mdpi/ic_action_start.png differ diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..ae0180b Binary files /dev/null and b/res/drawable-mdpi/ic_launcher.png differ diff --git a/res/drawable-mdpi/ic_stat_notify.png b/res/drawable-mdpi/ic_stat_notify.png new file mode 100644 index 0000000..48f1670 Binary files /dev/null and b/res/drawable-mdpi/ic_stat_notify.png differ diff --git a/res/drawable-mdpi/ic_stat_notifyerr.png b/res/drawable-mdpi/ic_stat_notifyerr.png new file mode 100644 index 0000000..c4b3178 Binary files /dev/null and b/res/drawable-mdpi/ic_stat_notifyerr.png differ diff --git a/res/drawable-xhdpi-v11/ic_stat_notify.png b/res/drawable-xhdpi-v11/ic_stat_notify.png new file mode 100644 index 0000000..75d0aef Binary files /dev/null and b/res/drawable-xhdpi-v11/ic_stat_notify.png differ diff --git a/res/drawable-xhdpi-v11/ic_stat_notifyerr.png b/res/drawable-xhdpi-v11/ic_stat_notifyerr.png new file mode 100644 index 0000000..bed9e21 Binary files /dev/null and b/res/drawable-xhdpi-v11/ic_stat_notifyerr.png differ diff --git a/res/drawable-xhdpi-v9/ic_stat_notify.png b/res/drawable-xhdpi-v9/ic_stat_notify.png new file mode 100644 index 0000000..b9ec593 Binary files /dev/null and b/res/drawable-xhdpi-v9/ic_stat_notify.png differ diff --git a/res/drawable-xhdpi-v9/ic_stat_notifyerr.png b/res/drawable-xhdpi-v9/ic_stat_notifyerr.png new file mode 100644 index 0000000..7d1139c Binary files /dev/null and b/res/drawable-xhdpi-v9/ic_stat_notifyerr.png differ diff --git a/res/drawable-xhdpi/ic_action_browse.png b/res/drawable-xhdpi/ic_action_browse.png new file mode 100644 index 0000000..d7ca5b6 Binary files /dev/null and b/res/drawable-xhdpi/ic_action_browse.png differ diff --git a/res/drawable-xhdpi/ic_action_settings.png b/res/drawable-xhdpi/ic_action_settings.png new file mode 100644 index 0000000..f2572c8 Binary files /dev/null and b/res/drawable-xhdpi/ic_action_settings.png differ diff --git a/res/drawable-xhdpi/ic_action_start.png b/res/drawable-xhdpi/ic_action_start.png new file mode 100644 index 0000000..f45cadd Binary files /dev/null and b/res/drawable-xhdpi/ic_action_start.png differ diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000..759a528 Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher.png differ diff --git a/res/drawable-xhdpi/ic_stat_notify.png b/res/drawable-xhdpi/ic_stat_notify.png new file mode 100644 index 0000000..71be265 Binary files /dev/null and b/res/drawable-xhdpi/ic_stat_notify.png differ diff --git a/res/drawable-xhdpi/ic_stat_notifyerr.png b/res/drawable-xhdpi/ic_stat_notifyerr.png new file mode 100644 index 0000000..f48e8e8 Binary files /dev/null and b/res/drawable-xhdpi/ic_stat_notifyerr.png differ diff --git a/res/drawable/ic_launcher.png b/res/drawable/ic_launcher.png new file mode 100644 index 0000000..05980b5 Binary files /dev/null and b/res/drawable/ic_launcher.png differ diff --git a/res/drawable/tornotification.png b/res/drawable/tornotification.png deleted file mode 100644 index ff158f4..0000000 Binary files a/res/drawable/tornotification.png and /dev/null differ diff --git a/res/drawable/tornotificationerr.png b/res/drawable/tornotificationerr.png deleted file mode 100644 index 90603f8..0000000 Binary files a/res/drawable/tornotificationerr.png and /dev/null differ diff --git a/res/drawable/tornotificationgimpsrc.xcf b/res/drawable/tornotificationgimpsrc.xcf deleted file mode 100644 index e90ff6b..0000000 Binary files a/res/drawable/tornotificationgimpsrc.xcf and /dev/null differ diff --git a/res/drawable/tornotificationon.png b/res/drawable/tornotificationon.png deleted file mode 100644 index 1f39075..0000000 Binary files a/res/drawable/tornotificationon.png and /dev/null differ diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml index 140f708..c2a8c02 100644 --- a/res/layout/layout_wizard_tips.xml +++ b/res/layout/layout_wizard_tips.xml @@ -49,24 +49,72 @@ android:layout_span="3">

<LinearLayout - android:background="#575757" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:paddingRight="20dip" - > - -<TextView android:text="@string/wizard_tips_msg" android:layout_width="wrap_content" android:textColor="#ffffff" android:layout_height="wrap_content" android:textSize="8pt" android:id="@+id/WizardTextBody1" android:padding="20dip"></TextView> -<Button android:text="@string/wizard_tips_orweb" android:layout_gravity="left" android:drawableLeft="@drawable/icon_orweb" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOrweb" android:layout_width="wrap_content" android:layout_height="wrap_content"/> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="#575757" + android:orientation="vertical" + android:paddingRight="20dip" > + + <TextView + android:id="@+id/WizardTextBody1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0.31" + android:padding="20dip" + android:text="@string/wizard_tips_msg" + android:textColor="#ffffff" + android:textSize="8pt" > + </TextView>

-<Button android:text="@string/wizard_tips_gibberbot" android:layout_gravity="left" android:drawableLeft="@drawable/ic_launcher_gibberbot" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallGibberbot" android:layout_width="wrap_content" android:layout_height="wrap_content"/> + <Button + android:id="@+id/WizardRootButtonInstallOrweb" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginTop="10px" + android:drawableLeft="@drawable/icon_orweb" + android:text="@string/wizard_tips_orweb" />

-<!-- -<Button android:text="@string/wizard_tips_firefox" android:layout_gravity="left" android:drawableLeft="@drawable/icon_firefox" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallFirefox" android:layout_width="wrap_content" android:layout_height="wrap_content"/> + <Button + android:id="@+id/WizardRootButtonInstallGibberbot" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginTop="10px" + android:drawableLeft="@drawable/ic_launcher_gibberbot" + android:text="@string/wizard_tips_gibberbot" /> + + + <Button + android:id="@+id/WizardRootButtonInstallDuckgo" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginTop="10px" + android:drawableLeft="@drawable/icon_firefox" + android:text="@string/wizard_tips_duckgo" /> + + <Button + android:id="@+id/WizardRootButtonInstallFirefox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginTop="10px" + android:drawableLeft="@drawable/icon_firefox" + android:text="@string/wizard_tips_firefox" /> + + <Button + android:id="@+id/WizardRootButtonInstallTwitter" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginTop="10px" + android:drawableLeft="@drawable/icon_firefox" + android:text="@string/wizard_tips_twitter" /> + + +</LinearLayout>

-<Button android:text="@string/wizard_tips_proxymob" android:layout_marginTop="10px" android:drawableLeft="@drawable/proxymob" android:id="@+id/WizardRootButtonInstallProxyMob" android:layout_width="wrap_content" android:layout_height="wrap_content"/> - --> - </LinearLayout> </ScrollView> </TableRow> diff --git a/res/menu-v11/main.xml b/res/menu-v11/main.xml index 89b4d9e..7870c32 100755 --- a/res/menu-v11/main.xml +++ b/res/menu-v11/main.xml @@ -21,20 +21,20 @@

<item android:id="@+id/menu_start" android:title="@string/menu_start" - android:icon="@drawable/menu_start" + android:icon="@drawable/ic_action_start" android:showAsAction="ifRoom"

/>

<item android:id="@+id/menu_settings" android:title="@string/menu_settings" - android:icon="@drawable/menu_settings" + android:icon="@drawable/ic_action_settings" android:showAsAction="always" />

<item android:id="@+id/menu_verify" android:title="@string/menu_verify" - android:icon="@drawable/ic_menu_check" + android:icon="@drawable/ic_action_browse" android:showAsAction="always"

/> diff --git a/res/menu-v13/main.xml b/res/menu-v13/main.xml index 89b4d9e..7870c32 100755 --- a/res/menu-v13/main.xml +++ b/res/menu-v13/main.xml @@ -21,20 +21,20 @@

<item android:id="@+id/menu_start" android:title="@string/menu_start" - android:icon="@drawable/menu_start" + android:icon="@drawable/ic_action_start" android:showAsAction="ifRoom"

/>

<item android:id="@+id/menu_settings" android:title="@string/menu_settings" - android:icon="@drawable/menu_settings" + android:icon="@drawable/ic_action_settings" android:showAsAction="always" />

<item android:id="@+id/menu_verify" android:title="@string/menu_verify" - android:icon="@drawable/ic_menu_check" + android:icon="@drawable/ic_action_browse" android:showAsAction="always"

/> diff --git a/res/menu/main.xml b/res/menu/main.xml index 7a1b332..9dbf9a2 100755 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -21,17 +21,17 @@

<item android:id="@+id/menu_start" android:title="@string/menu_start" - android:icon="@drawable/menu_start" + android:icon="@drawable/ic_action_start" />

<item android:id="@+id/menu_settings" android:title="@string/menu_settings" - android:icon="@drawable/menu_settings" + android:icon="@drawable/ic_action_settings" />

<item android:id="@+id/menu_verify" android:title="@string/menu_verify" - android:icon="@drawable/ic_menu_check" + android:icon="@drawable/ic_action_browse" />

<item android:id="@+id/menu_about" diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml new file mode 100644 index 0000000..d408cbc --- /dev/null +++ b/res/values-v11/styles.xml @@ -0,0 +1,5 @@ +<resources> + + <style name="AppTheme" parent="android:Theme.Holo.Light" /> + +</resources> \ No newline at end of file diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml new file mode 100644 index 0000000..1c089a7 --- /dev/null +++ b/res/values-v14/styles.xml @@ -0,0 +1,5 @@ +<resources> + + <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar" /> + +</resources> \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 10e51eb..8cc6207 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -99,6 +99,11 @@ <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>

+ <string name="wizard_tips_duckgo">Duckduckgo Search Engine app</string> + + <string name="wizard_tips_firefox">Firefox with Proxy Mobile add-on (extra install after)</string> + <string name="wizard_tips_twitter">Twitter supports http proxy "localhost:8118"</string> + <string name="wizard_proxy_help_info">Proxy Settings</string> <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n The host settings is 127.0.0.1 or "localhost". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible. diff --git a/res/values/styles.xml b/res/values/styles.xml new file mode 100644 index 0000000..bc024be --- /dev/null +++ b/res/values/styles.xml @@ -0,0 +1,5 @@ +<resources> + + <style name="AppTheme" parent="android:Theme.Black.NoTitleBar" /> + +</resources> \ No newline at end of file