From: David A. Velasco Date: Mon, 15 Apr 2013 11:12:04 +0000 (+0200) Subject: Merge branch 'develop' into loggingtool X-Git-Tag: oc-android-1.4.3~36^2~4 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c3ca5b5a4fda44999f215a3559921a4781f310f8?hp=5a22c7e79f1a53ccdbae04327e6ac500f3676a67 Merge branch 'develop' into loggingtool Conflicts: AndroidManifest.xml res/menu/main_menu.xml src/com/owncloud/android/datamodel/OCFile.java src/com/owncloud/android/files/services/FileDownloader.java src/com/owncloud/android/files/services/InstantUploadService.java src/com/owncloud/android/operations/SynchronizeFileOperation.java src/com/owncloud/android/operations/UploadFileOperation.java src/com/owncloud/android/ui/activity/FileDetailActivity.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/activity/UploadFilesActivity.java src/com/owncloud/android/ui/fragment/FileDetailFragment.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java src/eu/alefzero/webdav/FileRequestEntity.java src/eu/alefzero/webdav/WebdavClient.java --- diff --git a/.tx/config b/.tx/config index 5abe130f..f30f5ef0 100644 --- a/.tx/config +++ b/.tx/config @@ -5,4 +5,4 @@ host = https://www.transifex.com file_filter = res/values-/strings.xml source_file = res/values/strings.xml source_lang = en -lang_map = af_ZA: af-rZA, am_ET: am-rET, ar_AE: ar-rAE, ar_BH: ar-rBH, ar_DZ: ar-rDZ, ar_EG: ar-rEG, ar_IQ: ar-rIQ, ar_JO: ar-rJO, ar_KW: ar-rKW, ar_LB: ar-rLB, ar_LY: ar-rLY, ar_MA: ar-rMA, ar_OM: ar-rOM, ar_QA: ar-rQA, ar_SA: ar-rSA, ar_SY: ar-rSY, ar_TN: ar-rTN, ar_YE: ar-rYE, arn_CL: arn-rCL, as_IN: as-rIN, az_AZ: az-rAZ, ba_RU: ba-rRU, be_BY: be-rBY, bg_BG: bg-rBG, bn_BD: bn-rBD, bn_IN: bn-rIN, bo_CN: bo-rCN, br_FR: br-rFR, bs_BA: bs-rBA, ca_ES: ca-rES, co_FR: co-rFR, cs_CZ: cs-rCZ, cy_GB: cy-rGB, da_DK: da-rDK, de_AT: de-rAT, de_CH: de-rCH, de_DE: de-rDE, de_LI: de-rLI, de_LU: de-rLU, dsb_DE: dsb-rDE, dv_MV: dv-rMV, el_GR: el-rGR, en_AU: en-rAU, en_BZ: en-rBZ, en_CA: en-rCA, en_GB: en-rGB, en_IE: en-rIE, en_IN: en-rIN, en_JM: en-rJM, en_MY: en-rMY, en_NZ: en-rNZ, en_PH: en-rPH, en_SG: en-rSG, en_TT: en-rTT, en_US: en-rUS, en_ZA: en-rZA, en_ZW: en-rZW, es_AR: es-rAR, es_BO: es-rBO, es_CL: es-rCL, es_CO: es-rCO, es_CR: es-rCR, es_DO: es-rDO, es_EC: es-rEC, es_ES: es-rES, es_GT: es-rGT, es_HN: es-rHN, es_MX: es-rMX, es_NI: es-rNI, es_PA: es-rPA, es_PE: es-rPE, es_PR: es-rPR, es_PY: es-rPY, es_SV: es-rSV, es_US: es-rUS, es_UY: es-rUY, es_VE: es-rVE, et_EE: et-rEE, eu_ES: eu-rES, fa_IR: fa-rIR, fi_FI: fi-rFI, fil_PH: fil-rPH, fo_FO: fo-rFO, fr_BE: fr-rBE, fr_CA: fr-rCA, fr_CH: fr-rCH, fr_FR: fr-rFR, fr_LU: fr-rLU, fr_MC: fr-rMC, fy_NL: fy-rNL, ga_IE: ga-rIE, gd_GB: gd-rGB, gl_ES: gl-rES, gsw_FR: gsw-rFR, gu_IN: gu-rIN, ha_NG: ha-rNG, he_IL: he-rIL, hi_IN: hi-rIN, hr_BA: hr-rBA, hr_HR: hr-rHR, hsb_DE: hsb-rDE, hu_HU: hu-rHU, hy_AM: hy-rAM, id_ID: id-rID, ig_NG: ig-rNG, ii_CN: ii-rCN, is_IS: is-rIS, it_CH: it-rCH, it_IT: it-rIT, iu_CA: iu-rCA, ja_JP: ja-rJP, ka_GE: ka-rGE, kk_KZ: kk-rKZ, kl_GL: kl-rGL, km_KH: km-rKH, kn_IN: kn-rIN, ko_KR: ko-rKR, kok_IN: kok-rIN, ku_IQ: ku-rIQ, ky_KG: ky-rKG, lb_LU: lb-rLU, lo_LA: lo-rLA, lt_LT: lt-rLT, lv_LV: lv-rLV, mi_NZ: mi-rNZ, mk_MK: mk-rMK, ml_IN: ml-rIN, mn_CN: mn-rCN, mn_MN: mn-rMN, moh_CA: moh-rCA, mr_IN: mr-rIN, ms_BN: ms-rBN, ms_MY: ms-rMY, mt_MT: mt-rMT, nb_NO: nb-rNO, ne_NP: ne-rNP, nl_BE: nl-rBE, nl_NL: nl-rNL, nn_NO: nn-rNO, nso_ZA: nso-rZA, oc_FR: oc-rFR, or_IN: or-rIN, pa_IN: pa-rIN, pl_PL: pl-rPL, prs_AF: prs-rAF, ps_AF: ps-rAF, pt_BR: pt-rBR, pt_PT: pt-rPT, qut_GT: qut-rGT, quz_BO: quz-rBO, quz_EC: quz-rEC, quz_PE: quz-rPE, rm_CH: rm-rCH, ro_RO: ro-rRO, ru_RU: ru-rRU, rw_RW: rw-rRW, sa_IN: sa-rIN, sah_RU: sah-rRU, se_FI: se-rFI, se_NO: se-rNO, se_SE: se-rSE, si_LK: si-rLK, sk_SK: sk-rSK, sl_SI: sl-rSI, sma_NO: sma-rNO, sma_SE: sma-rSE, smj_NO: smj-rNO, smj_SE: smj-rSE, smn_FI: smn-rFI, sms_FI: sms-rFI, sq_AL: sq-rAL, sr_BA: sr-rBA, sr_CS: sr-rCS, sr_ME: sr-rME, sr_RS: sr-rRS, sr@latin: sr-rSP, sv_FI: sv-rFI, sv_SE: sv-rSE, sw_KE: sw-rKE, syr_SY: syr-rSY, ta_IN: ta-rIN, ta_LK: ta-rLK, te_IN: te-rIN, tg_TJ: tg-rTJ, th_TH: th-rTH, tk_TM: tk-rTM, tn_ZA: tn-rZA, tr_TR: tr-rTR, tt_RU: tt-rRU, tzm_DZ: tzm-rDZ, ug_CN: ug-rCN, uk_UA: uk-rUA, ur_PK: ur-rPK, uz_UZ: uz-rUZ, vi_VN: vi-rVN, wo_SN: wo-rSN, xh_ZA: xh-rZA, yo_NG: yo-rNG, zh_CN: zh-rCN, zh_CN.GB2312:zh-rBG, zh_HK: zh-rHK, zh_MO: zh-rMO, zh_SG: zh-rSG, zh_TW: zh-rTW, zu_ZA: zu-rZA +lang_map = af_ZA: af-rZA, am_ET: am-rET, ar_AE: ar-rAE, ar_BH: ar-rBH, ar_DZ: ar-rDZ, ar_EG: ar-rEG, ar_IQ: ar-rIQ, ar_JO: ar-rJO, ar_KW: ar-rKW, ar_LB: ar-rLB, ar_LY: ar-rLY, ar_MA: ar-rMA, ar_OM: ar-rOM, ar_QA: ar-rQA, ar_SA: ar-rSA, ar_SY: ar-rSY, ar_TN: ar-rTN, ar_YE: ar-rYE, arn_CL: arn-rCL, as_IN: as-rIN, az_AZ: az-rAZ, ba_RU: ba-rRU, be_BY: be-rBY, bg_BG: bg-rBG, bn_BD: bn-rBD, bn_IN: bn-rIN, bo_CN: bo-rCN, br_FR: br-rFR, bs_BA: bs-rBA, ca_ES: ca-rES, co_FR: co-rFR, cs_CZ: cs-rCZ, cy_GB: cy-rGB, da_DK: da-rDK, de_AT: de-rAT, de_CH: de-rCH, de_DE: de-rDE, de_LI: de-rLI, de_LU: de-rLU, dsb_DE: dsb-rDE, dv_MV: dv-rMV, el_GR: el-rGR, en_AU: en-rAU, en_BZ: en-rBZ, en_CA: en-rCA, en_GB: en-rGB, en_IE: en-rIE, en_IN: en-rIN, en_JM: en-rJM, en_MY: en-rMY, en_NZ: en-rNZ, en_PH: en-rPH, en_SG: en-rSG, en_TT: en-rTT, en_US: en-rUS, en_ZA: en-rZA, en_ZW: en-rZW, es_AR: es-rAR, es_BO: es-rBO, es_CL: es-rCL, es_CO: es-rCO, es_CR: es-rCR, es_DO: es-rDO, es_EC: es-rEC, es_ES: es-rES, es_GT: es-rGT, es_HN: es-rHN, es_MX: es-rMX, es_NI: es-rNI, es_PA: es-rPA, es_PE: es-rPE, es_PR: es-rPR, es_PY: es-rPY, es_SV: es-rSV, es_US: es-rUS, es_UY: es-rUY, es_VE: es-rVE, et_EE: et-rEE, eu_ES: eu-rES, fa_IR: fa-rIR, fi_FI: fi-rFI, fil_PH: fil-rPH, fo_FO: fo-rFO, fr_BE: fr-rBE, fr_CA: fr-rCA, fr_CH: fr-rCH, fr_FR: fr-rFR, fr_LU: fr-rLU, fr_MC: fr-rMC, fy_NL: fy-rNL, ga_IE: ga-rIE, gd_GB: gd-rGB, gl_ES: gl-rES, gsw_FR: gsw-rFR, gu_IN: gu-rIN, ha_NG: ha-rNG, he_IL: he-rIL, hi_IN: hi-rIN, hr_BA: hr-rBA, hr_HR: hr-rHR, hsb_DE: hsb-rDE, hu_HU: hu-rHU, hy_AM: hy-rAM, id_ID: id-rID, ig_NG: ig-rNG, ii_CN: ii-rCN, is_IS: is-rIS, it_CH: it-rCH, it_IT: it-rIT, iu_CA: iu-rCA, ja_JP: ja-rJP, ka_GE: ka-rGE, kk_KZ: kk-rKZ, kl_GL: kl-rGL, km_KH: km-rKH, kn_IN: kn-rIN, ko_KR: ko-rKR, kok_IN: kok-rIN, ku_IQ: ku-rIQ, ky_KG: ky-rKG, lb_LU: lb-rLU, lo_LA: lo-rLA, lt_LT: lt-rLT, lv_LV: lv-rLV, mi_NZ: mi-rNZ, mk_MK: mk-rMK, ml_IN: ml-rIN, mn_CN: mn-rCN, mn_MN: mn-rMN, moh_CA: moh-rCA, mr_IN: mr-rIN, ms_BN: ms-rBN, ms_MY: ms-rMY, my_MM: my, mt_MT: mt-rMT, nb_NO: nb-rNO, ne_NP: ne-rNP, nl_BE: nl-rBE, nl_NL: nl-rNL, nn_NO: nn-rNO, nso_ZA: nso-rZA, oc_FR: oc-rFR, or_IN: or-rIN, pa_IN: pa-rIN, pl_PL: pl-rPL, prs_AF: prs-rAF, ps_AF: ps-rAF, pt_BR: pt-rBR, pt_PT: pt-rPT, qut_GT: qut-rGT, quz_BO: quz-rBO, quz_EC: quz-rEC, quz_PE: quz-rPE, rm_CH: rm-rCH, ro_RO: ro-rRO, ru_RU: ru-rRU, rw_RW: rw-rRW, sa_IN: sa-rIN, sah_RU: sah-rRU, se_FI: se-rFI, se_NO: se-rNO, se_SE: se-rSE, si_LK: si-rLK, sk_SK: sk-rSK, sl_SI: sl-rSI, sma_NO: sma-rNO, sma_SE: sma-rSE, smj_NO: smj-rNO, smj_SE: smj-rSE, smn_FI: smn-rFI, sms_FI: sms-rFI, sq_AL: sq-rAL, sr_BA: sr-rBA, sr_CS: sr-rCS, sr_ME: sr-rME, sr_RS: sr-rRS, sr@latin: sr-rSP, sv_FI: sv-rFI, sv_SE: sv-rSE, sw_KE: sw-rKE, syr_SY: syr-rSY, ta_IN: ta-rIN, ta_LK: ta-rLK, te_IN: te-rIN, tg_TJ: tg-rTJ, th_TH: th-rTH, tk_TM: tk-rTM, tn_ZA: tn-rZA, tr_TR: tr-rTR, tt_RU: tt-rRU, tzm_DZ: tzm-rDZ, ug_CN: ug-rCN, uk_UA: uk-rUA, ur_PK: ur-rPK, uz_UZ: uz-rUZ, vi_VN: vi-rVN, wo_SN: wo-rSN, xh_ZA: xh-rZA, yo_NG: yo-rNG, zh_CN: zh-rCN, zh_CN.GB2312:zh-rBG, zh_HK: zh-rHK, zh_MO: zh-rMO, zh_SG: zh-rSG, zh_TW: zh-rTW, zu_ZA: zu-rZA diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a6f4b5bc..4570ea14 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -19,8 +19,8 @@ along with this program. If not, see . --> + android:versionCode="104000" + android:versionName="1.4.0" xmlns:android="http://schemas.android.com/apk/res/android"> @@ -35,7 +35,8 @@ - + + @@ -60,6 +61,7 @@ + @@ -88,6 +90,13 @@ + + + + + - - - + + + + @@ -142,10 +152,9 @@ + - - @@ -163,5 +172,5 @@ - + diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..5d0c02f2 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,39 @@ +## Submitting issues + +If you have questions about how to use ownCloud, please direct these to the [mailing list][mailinglist] or our [forum][forum]. We are also available on [IRC][irc]. + +### Guidelines +* [Report the issue](https://github.com/owncloud/android/issues/new) using our [template][template], it includes all the informations we need to track down the issue. +* This repository is *only* for issues within the ownCloud Android app code. Issues in other compontents should be reported in their own repositores: + - [ownCloud code](https://github.com/owncloud/core/issues) + - [iOS client](https://github.com/owncloud/ios-issues/issues) + - [Desktop client](https://github.com/owncloud/mirall/issues) + - [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar, Contacts...) +* Search the existing issues first, it's likely that your issue was already reported. + +If your issue appears to be a bug, and hasn't been reported, open a new issue. + +Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues. + +[template]: https://raw.github.com/owncloud/android/master/issue_template.md +[mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud +[forum]: http://forum.owncloud.org/ +[irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4 + +## Contributing to Source Code + +Thanks for wanting to contribute source code to ownCloud. That's great! + +Before we're able to merge your code into the ownCloud app for Android, you need to sign our [Contributor Agreement][agreement]. + +### Guidelines +* Contribute your code in the branch 'develop'. It will give us a better chance to test your code before merging it with stable code. +* For your first contribution, start a pull request on develop and send us the signed [Contributor Agreement][agreement]. +* Keep on using pull requests for your next contributions although you own write permissions. + +[agreement]: http://owncloud.org/about/contributor-agreement/ + +## Translations +Please submit translations via [Transifex][transifex]. + +[transifex]: https://www.transifex.com/projects/p/owncloud/ diff --git a/README.md b/README.md new file mode 100644 index 00000000..3ba9f73a --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +This is the android client for [owncloud][0]. + +Make sure you read [SETUP.md][1] when you start working on this project. + +[0]: https://github.com/owncloud/core +[1]: https://raw.github.com/owncloud/android/master/SETUP.md \ No newline at end of file diff --git a/README.setup b/README.setup deleted file mode 100644 index 3d592e06..00000000 --- a/README.setup +++ /dev/null @@ -1,13 +0,0 @@ -If you want to start development of ownCloud android client you have two way to do so -(a) building with console -(b) building with eclipse - -1. Use setup_env.sh -2a. ant clean;ant debug -2b. Open Eclipse and import actionbarsherlock/library project to your workspace - -after those space you should be good to go. - -HAVE FUN! - -NOTE: You must have 'tools' and 'platforms-tools' in your path in order to run setup_env.sh diff --git a/SETUP.md b/SETUP.md new file mode 100644 index 00000000..d527d4fe --- /dev/null +++ b/SETUP.md @@ -0,0 +1,23 @@ + + If you want to start development of ownCloud android client you have two way to do so: + + 1. Building with console: + + - Use setup_env.sh or setup_env.bat + - NOTE: You must have git, ant/bin, android/tools in your enviroment path + + 2. Building with eclipse: + + - Run ant clean debug + - Open Eclipse and import *actionbarsherlock/library* project to your workspace + - NOTE: You must have 'tools' and 'platforms-tools' in your path in order to run setup_env.sh + + After those actions you should be good to go. + + HAVE FUN! + + + + + + diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt new file mode 100644 index 00000000..1d51b72a --- /dev/null +++ b/THIRD_PARTY.txt @@ -0,0 +1,64 @@ +################################################################### + ownCloud Android client + + Copyright (C) 2012-2013 ownCloud Inc. + Copyright (C) 2012 Bartek Przybylski +################################################################### + + +########### +# LICENSE # +########### + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +The source distribution of this program should include a full copy +of the GNU GPL version 2 license in the LICENSE.txt file located +in its root directory. If not, see . + + +######################## +# THIRD PARTY LICENSES # +######################## + +Both the source and binary distributions of this software contain +some third party software. All the third party software included +or linked is redistributed under the terms and conditions of their +original licenses. These licenses are compatible the GPL license +that govern this software, for the purposes they are being used. + +The third party software included and used by this project is: + + * Apache JackRabbit, version 2.2.5. + Copyright (C) 2004-2010 The Apache Software Foundation. + Licensed under Apache License, Version 2.0. + Placed at libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar + The jar file must be included in the ownCloud client APK. + Original license document included at libs/LICENSE.txt + See http://jackrabbit.apache.org/ + + * Transifex client.JavaMail API, version 1.4.3 + Copyright (C) Transifex. + Licensed under GNU General Public License. + Placed at third_party/transifex-client. + Used as a helper tool, not included in the ownCloud client APK. + Original license document included at third_party/transifex-client/LICENSE. + See http://help.transifex.com/features/client/ + + * ActionBarSherlock, master branch. + Copyright (C) 2012 Jake Wharton. + Licensed under Apache License, Version 2.0. + The official repository is linked as a submodule in the + ownCloud/android repository. + A binary JAR file must be generated from this linked project + and included in the ownCloud client APK. + See http://http://actionbarsherlock.com/ + \ No newline at end of file diff --git a/doc/CodeStyleFormatter.xml b/doc/CodeStyleFormatter.xml new file mode 100644 index 00000000..af0006c6 --- /dev/null +++ b/doc/CodeStyleFormatter.xml @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/issue_template.md b/issue_template.md new file mode 100644 index 00000000..493572d2 --- /dev/null +++ b/issue_template.md @@ -0,0 +1,32 @@ +### Expected behaviour +Tell us what should happen + +### Actual behaviour +Tell us what happens instead + +### Steps to reproduce +1. +2. +3. + +### Environment data +Android version: + +Device model: + +Stock or customized system: + +ownCloud app version: + +ownCloud server version: + +### Logs +#### Web server error log +``` +Insert your webserver log here +``` + +#### ownCloud log (data/owncloud.log) +``` +Insert your ownCloud log here +``` diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..27263337 --- /dev/null +++ b/pom.xml @@ -0,0 +1,100 @@ + + + + 4.0.0 + com.owncloud.android + owncloud + 1.3.21-SNAPSHOT + apk + Owncloud Android + + + 1.6 + 4.1.1.4 + r7 + 4.2.0 + + + https://github.com/owncloud/android + Owncloud for Android + + scm:git:git@github.com:owncloud/android.git + scm:git:git@github.com:owncloud/android.git + https://github.com/owncloud/android + + + + + + com.google.android + android + ${google.android-version} + provided + + + + com.google.android + support-v4 + ${google.android.support-version} + + + + com.actionbarsherlock + actionbarsherlock + ${actionbarsherlock-version} + provided + + + + com.actionbarsherlock + actionbarsherlock + ${actionbarsherlock-version} + apklib + + + + org.apache.jackrabbit + jackrabbit-webdav + 2.5.2 + + + + + + ${project.artifactId} + + src + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + ${java-version} + ${java-version} + + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + 3.5.0 + + + + ${env.ANDROID_HOME} + 17 + + + true + + + + + + + + diff --git a/res/drawable-hdpi/image_fail.png b/res/drawable-hdpi/image_fail.png new file mode 100644 index 00000000..38667417 Binary files /dev/null and b/res/drawable-hdpi/image_fail.png differ diff --git a/res/drawable-ldpi/image_fail.png b/res/drawable-ldpi/image_fail.png new file mode 100644 index 00000000..77513ad2 Binary files /dev/null and b/res/drawable-ldpi/image_fail.png differ diff --git a/res/drawable-mdpi/image_fail.png b/res/drawable-mdpi/image_fail.png new file mode 100644 index 00000000..8e650cd3 Binary files /dev/null and b/res/drawable-mdpi/image_fail.png differ diff --git a/res/layout/audio_player.xml b/res/layout/audio_player.xml new file mode 100644 index 00000000..bee0f870 --- /dev/null +++ b/res/layout/audio_player.xml @@ -0,0 +1,29 @@ + + + + + + \ No newline at end of file diff --git a/res/layout/failed_upload_message_view.xml b/res/layout/failed_upload_message_view.xml new file mode 100644 index 00000000..41e9a7d0 --- /dev/null +++ b/res/layout/failed_upload_message_view.xml @@ -0,0 +1,19 @@ + + + + +