summaryrefslogtreecommitdiffstats
path: root/extras
Commit message (Collapse)AuthorAgeFilesLines
* weld SvxShadowTabPageCaolán McNamara2018-09-091-3/+0
| | | | | | | Change-Id: I5447641216c8cba3d275d76c00bf7306df8acf19 Reviewed-on: https://gerrit.libreoffice.org/60221 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* drop some unused custom widget descriptionsCaolán McNamara2018-09-081-33/+0
| | | | | | | | Change-Id: I21f170235729ee7ea34763d620704213bc9d3b32 Reviewed-on: https://gerrit.libreoffice.org/60171 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* [tr][autocorr] Fix erroneous entriesMuhammet Kara2018-09-081-2/+2
| | | | | | | Change-Id: Iaded68785c50833aa998706b6840f86d99ffc17d Reviewed-on: https://gerrit.libreoffice.org/60155 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@pardus.org.tr>
* [tr][autocorr] Consistent capitalizations for TurkishMuhammet Kara2018-09-071-43/+43
| | | | | | | Change-Id: Icfb6d82f094a4ab743d0ec4f51ddfdda606a731a Reviewed-on: https://gerrit.libreoffice.org/60152 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@pardus.org.tr>
* [pt_PT] Added 21 autocorrect wordsMarco A.G.Pinto2018-09-071-0/+21
| | | | | | | Change-Id: I8ca06334d176d5d00f72d448cb92afcc891a7d83 Reviewed-on: https://gerrit.libreoffice.org/60015 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
* [tr] Add 27 new autocorrect entries for TurkishMuhammet Kara2018-09-071-0/+27
| | | | | | | | Change-Id: Ifb0f6fbda69c0696f55a6430120e4ec2e1eb2754 Reviewed-on: https://gerrit.libreoffice.org/60096 Tested-by: Jenkins Reviewed-by: Marco A.G.Pinto <marcoagpinto@sapo.pt> Reviewed-by: Muhammet Kara <muhammet.kara@pardus.org.tr>
* weld SwColumnPage and SwColumnDialogCaolán McNamara2018-09-061-21/+0
| | | | | | | | Change-Id: Ia649785047db2551044b4d765881309f83b5c838 Reviewed-on: https://gerrit.libreoffice.org/60044 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* weld SvxBorderTabPageCaolán McNamara2018-09-051-3/+0
| | | | | | | | Change-Id: I33f12f160ac5fea14c9a53c3846c6d31c7fd0084 Reviewed-on: https://gerrit.libreoffice.org/59954 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* weld SvxAreaTabPageCaolán McNamara2018-09-031-3/+0
| | | | | | | | | | which itself has 5 sub tab pages Change-Id: If71e91248b5771af4845ad6dba997ac4c7841b5d Reviewed-on: https://gerrit.libreoffice.org/56112 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* Removed executable permission on xml fileAndrea Gelmini2018-08-291-0/+0
| | | | | | | | Change-Id: Iaf8ca3004c209291a42edf4e6eea7c3631847db1 Reviewed-on: https://gerrit.libreoffice.org/59307 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* pt_PT autocorrect - added 21 new words.Marco A.G.Pinto2018-08-221-0/+21
| | | | | | | Change-Id: I59793df3b2424661c92c0015444b12b7b4abeb94 Reviewed-on: https://gerrit.libreoffice.org/59378 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
* Fix typosAndrea Gelmini2018-08-211-1/+1
| | | | | | | Change-Id: If515966300c5d3835e4d4a9004fb8cd472f4d3ae Reviewed-on: https://gerrit.libreoffice.org/59308 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins
* Writer templates: built from XML codeLaurent BP2018-08-1964-5/+5102
| | | | | | | | | | | Maintaining XML code is easier if we need to change a font (name or size). See tdf#114749 Change-Id: I1c1e5951c24863be717aef3dd22d533f5fd23a4f Reviewed-on: https://gerrit.libreoffice.org/58787 Tested-by: Jenkins Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> Tested-by: Heiko Tietze <tietze.heiko@gmail.com>
* [pt_PT] Added 20 autocorrect wordsMarco A.G.Pinto2018-08-031-0/+20
| | | | | | | Change-Id: If2cd89b76433ce32e072805969e2381a30f62125 Reviewed-on: https://gerrit.libreoffice.org/57482 Tested-by: Jenkins Reviewed-by: Aron Budea <aron.budea@collabora.com>
* weld SwTextGridPageCaolán McNamara2018-07-261-3/+0
| | | | | | | | Change-Id: I4f8e5f643126bea5deef7636b6d20f8080cb6662 Reviewed-on: https://gerrit.libreoffice.org/56309 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* Added 20 autocorrect words to pt_PTMarco A.G.Pinto2018-06-251-0/+20
| | | | | | | Change-Id: Iadff2f580e90487204e1c94a33d59921f4cc1cbe Reviewed-on: https://gerrit.libreoffice.org/56277 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* weld SvxColorTabPageCaolán McNamara2018-06-201-3/+0
| | | | | | | | Change-Id: I5dc6f949edcb34aa110dfa9415e2ac886d0dfa4c Reviewed-on: https://gerrit.libreoffice.org/56111 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* weld SvxPageDescPageCaolán McNamara2018-06-171-3/+0
| | | | | | | | Change-Id: I5e2457b51a294cbdacc5c78db4ec0a048567b93d Reviewed-on: https://gerrit.libreoffice.org/55877 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* GraphCtrl factory no longer neededCaolán McNamara2018-06-161-3/+0
| | | | | | | | Change-Id: I55f8280bb256c8eb298dd3550cc2a9621b2cfb4b Reviewed-on: https://gerrit.libreoffice.org/55933 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* tdf#117827 Restore Synchronize labels in templateLaurent BP2018-06-161-0/+0
| | | | | | | | | | | | | | | | Correction of de14f0487118d8ea15db54d94c44d7bd28833c82 Update Businesscard-with-logo - restore "Synchronize labels" function - restore links that need to be updated at the begining - change Tab for name and profession to center Tab - change "Sektsioon" to "Section" - change "Paneel" to "Frame" - change "Pilt" to "Image" Change-Id: If3123ed76faf1055f539dc9f47051696f3f1b40b Reviewed-on: https://gerrit.libreoffice.org/55243 Tested-by: Jenkins Reviewed-by: Laurent BP <laurent.balland-poirier@laposte.net>
* weld SwDropCapsPageCaolán McNamara2018-06-151-3/+0
| | | | | | | | Change-Id: Ic3438ff0862f74273fe0aec443aaeacee331abdd Reviewed-on: https://gerrit.libreoffice.org/55843 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* swuilo-NumberingPreview is now unusedCaolán McNamara2018-06-141-3/+0
| | | | Change-Id: Ieba56962ae1986686ae649ac15ba721a3fbfae5e
* weld SwSectionFootnoteEndTabPageCaolán McNamara2018-06-021-3/+0
| | | | | | | | Change-Id: Ib4246a2f90780a005e79e2d071b43a5629a3242c Reviewed-on: https://gerrit.libreoffice.org/55216 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* add --enable-build-opensymbol option to build opens___.ttf from sourceRene Engelhard2018-05-294-2/+31
| | | | | | | | | | | ... and handle opens___.ttf like unowinreg.dll (-> download.lst/$(TARFILE_LOCATION)) Change-Id: Id4723fb15c4b4b04133dedf97b1262441baa4756 Reviewed-on: https://gerrit.libreoffice.org/54938 Tested-by: Rene Engelhard <rene@debian.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Rene Engelhard <rene@debian.org>
* weld ScTabBgColorDlgCaolán McNamara2018-05-281-3/+0
| | | | | | | | Change-Id: I864382bc55dead850c13faae9958fb660fd4f156 Reviewed-on: https://gerrit.libreoffice.org/54809 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* Typos in change 53934heiko tietze2018-05-091-1/+1
| | | | | | | | Change-Id: I7d2dd64beb70d44113c3c548ff6e13ff1d766614 Reviewed-on: https://gerrit.libreoffice.org/54017 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
* tdf#114006 - New default set of gradient presetsheiko tietze2018-05-091-229/+1
| | | | | | | | | New set of gradients incl. l10n and ui test Change-Id: Iee303a39ad721b5a4e8b9adb78ee5a82227b84f4 Reviewed-on: https://gerrit.libreoffice.org/53934 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: andreas_kainz <kainz.a@gmail.com>
* weld SmSymbolDialogCaolán McNamara2018-04-301-6/+0
| | | | | | | | Change-Id: I163a309fdf79e3eeadeb15b2a1c042666def339f Reviewed-on: https://gerrit.libreoffice.org/53633 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* weld SmFontTypeDialogCaolán McNamara2018-04-291-3/+0
| | | | | | | | Change-Id: I720196ce7359e6e571ecd26c544b9e6a61e17484 Reviewed-on: https://gerrit.libreoffice.org/53626 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* weld pages of the insert envelope dialogCaolán McNamara2018-04-271-3/+0
| | | | | | | | | | SwEnvPrtPage, SwEnvFormatPage, SwEnvPage Change-Id: I76b0298994fcd663c0b415ae6e29af054a335bbf Reviewed-on: https://gerrit.libreoffice.org/53503 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* weld SwLabPreviewCaolán McNamara2018-04-261-3/+0
| | | | | | | | Change-Id: I710eacd28f3b6c38890145cf82eeca8bec6ae1f6 Reviewed-on: https://gerrit.libreoffice.org/53328 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* tdf#116387 Autocorrect greek character σ (sigma) to ς (final sigma)László Németh2018-04-267-0/+54
| | | | | | | | | | when at the end of a word (τελικό σίγμα), also add Autocorrect exceptions to common Greek abbreviations. Change-Id: Id6722594ab72a21aeec77daf7571d142eebf20e8 Reviewed-on: https://gerrit.libreoffice.org/53372 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: László Németh <nemeth@numbertext.org>
* update emoji autocorrect files from po-filesChristian Lohmaier2018-04-2514-291/+1860
| | | | Change-Id: I5dc571f1e648bd6917ac8f19de597f8ac58ff40d
* weld SvxCharacterMap dialogCaolán McNamara2018-03-301-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | and SmSymDefineDialog There's a whole bunch of interrelated stuff which needs to work at the same time. add menu support, keyboard support, better mouse support, a gtk scrollable adaptor to support pseudo scrolling drawing bodge, plugable uitest support for custom widgets, plugable a11y support for custom widgets via the existing atk_object_wrapper_new wrapper for XAccessible In this specific case, change SvxCharacterMap from something that has an internal scrollbar to a scrolledwindow where the scrollbar is external, which drops the need for the a11y impl of SvxCharacterMap to emulate being a scrolled window and internal table and just needs the table a11y impl Change-Id: Ia2743d6958021c525a1900154dcbb69ae33fc400 Reviewed-on: https://gerrit.libreoffice.org/52084 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* tdf#114749 Replace fonts in templatesLaurent BP2018-03-216-36/+16
| | | | | | | | | | | | | Replace Arial with Liberation Sans Replace Times New Roman with Liberation Serif (except if does not make sense) Replace Roboto Bk with Liberation Sans Reduce number of fonts declared Change-Id: I967818dd6079d43c9b0616541c6c7a7ddac13886 Reviewed-on: https://gerrit.libreoffice.org/51464 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com> Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
* weld color pickerCaolán McNamara2018-03-111-9/+0
| | | | | | | | Change-Id: I487b9a0cc13b2b60a0f1e28667773b5d3b5c66cc Reviewed-on: https://gerrit.libreoffice.org/51001 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* weld SfxNewFileDialogCaolán McNamara2018-03-071-3/+0
| | | | | | | | Change-Id: I28b1aff90407bce7d04f10eed6a227c0970f9c0a Reviewed-on: https://gerrit.libreoffice.org/50878 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* update emoji autocorrect files from po-filesChristian Lohmaier2018-02-2233-2895/+12870
| | | | Change-Id: Iee7034c3800b159694c3d03a8eed665d3360e6b8
* Impress templates: build from XML codeLaurent BP2018-02-20219-1/+27793
| | | | | | | | | | | | | | | Mainting XML code is easier if we need to change a font name or font size for asian and complex. See tdf#114749 or tdf#114746 For Classy_red.otp, Object 1 was renamed Object1, as no space are allowed in file names. Change-Id: I6ed0b4df20943396640a9d9b749b77d5ba16ed2d Update: as suggested by Mark, add indentation with xmllint --format Reviewed-on: https://gerrit.libreoffice.org/47221 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Hung <marklh9@gmail.com> Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
* tdf#114817 new bitmap presets for Area Fillandreas kainz2018-02-18104-81/+66
| | | | | | | Change-Id: Icc48efc2f6c085ccf0754620dc1cbf5132a7f824 Reviewed-on: https://gerrit.libreoffice.org/49551 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
* tdf#114719 RYB based color paletteheiko tietze2018-02-081-117/+123
| | | | | | | | | | | | Base colors Red, Yellow, Blue / Orange, Green, Purple / Magenta, Indigo, Teal, Lime, Gold, Brick; Hues and shades modified with Gossett & Chen algorithm Change-Id: I71facf3b143bb8c922a84075df03ec00f7c55b6b Reviewed-on: https://gerrit.libreoffice.org/48887 Reviewed-by: V Stuart Foote <vstuart.foote@utsa.edu> Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> Tested-by: Heiko Tietze <tietze.heiko@gmail.com>
* tdf#115382 Hungarian autocorrect: help apostrophe usageLászló Németh2018-02-081-0/+27
| | | | | | | Change-Id: I1d3368c9acb7ddc90d84bde6db9940b76c3ad8d8 Reviewed-on: https://gerrit.libreoffice.org/49111 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: László Németh <nemeth@numbertext.org>
* 34 new autocorrect words pt_PTMarco A.G.Pinto2018-01-191-0/+34
| | | | | | | Change-Id: Ic5b13b2d21b7c429782a8c6cbb2be65be3a94aea Reviewed-on: https://gerrit.libreoffice.org/47405 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Aron Budea <aron.budea@collabora.com>
* tdf#95024 Add user dictionary for hu dict packageLászló Németh2018-01-052-0/+208
| | | | | | | | | | | supporting old Hungarian orthography optionally, according to the official 3-year transitional period in schools. Change-Id: Ifbc5583c1e53bc4ac07e73a90e0dd02e159f83e6 Reviewed-on: https://gerrit.libreoffice.org/47398 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
* tdf#95024 fix bad Hungarian autocorrection patternLászló Németh2018-01-051-1/+5
| | | | | | | | | and add a few correct ones, according to the new orthography. Change-Id: Id5a7d4803537f216f0f4f8939aa25b40ed4ea309 Reviewed-on: https://gerrit.libreoffice.org/47399 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
* Gallery-svg: shrink gallery svg filesandreas kainz2018-01-04322-40532/+322
| | | | | | | Change-Id: Idae797633952b0c8156b2ab043fb9ff2635084f5 Reviewed-on: https://gerrit.libreoffice.org/47203 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: andreas_kainz <kainz.a@gmail.com>
* tdf#103317 tdf#89676 clean-up Impress templatesLaurent BP2017-12-237-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blue_Curve - Remove unused fonts - Restore preview in Notes Master - Remove Autofit to outline of slide 2 - add Title in meta.xml Classy_Red - Remove unused fonts - Restore width in Notes Master 1 - add Title in meta.xml Forestbird - Remove unused fonts - Restore preview in Notes Master - add Title in meta.xml Lights - Remove unused fonts - Restore preview in Notes Master - add Title in meta.xml Lushgreen - Remove unused fonts - Restore preview in Notes - Restore preview in Notes Master - add Title in meta.xml Nature_Illustration - Remove unused fonts - add Title in meta.xml Piano - Remove unused fonts - Restore preview in Notes Master - add Title in meta.xml Change-Id: I7338332b6424161a7a11854b47dec6193b205b7c Reviewed-on: https://gerrit.libreoffice.org/45697 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com> Tested-by: Gabor Kelemen <kelemeng@ubuntu.com>
* tdf#103317 tdf#107027 tdf#113795 Impress TemplatesLaurent BP2017-12-2316-0/+0
| | | | | | | | | | | | | | | | | | | | | | | Improve Impress templates: - remove settings.xml, picture, colortable and configuration2 (update manifest.xml) - restore preview in Notes - restore preview in Notes Master - remove english language tag to date - remove user defined styles - remove errors detected by ODF Validator - styles.xml: set draw:fit-to-size at "false" instead of "shrink-to-fit" and add style:shrink-to-fit="true" (suggested by Regina) - change font-weight="250" to font-weight="200" - replace Open Sans font with Noto Sans Regular (Impress.otp and Vivid.otp) - replace Open Sans bold font with Noto Sans Bold (Impress.otp) - remove declaration of unused fonts - add Title in meta.xml (to get template name translated tdf#89676) Change-Id: Ibab7ec8f4b3ad828cd85fc9d975acb8e87e7780e Reviewed-on: https://gerrit.libreoffice.org/45623 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com> Tested-by: Gabor Kelemen <kelemeng@ubuntu.com> Reviewed-by: Laurent BP <laurent.balland-poirier@laposte.net>
* tdf#114088 tdf#113795 Improve Writer templatesLaurent BP2017-12-227-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main topic was to add Title in meta.xml to get names of templates localized Additionnal improvements: Businesscard-with-logo - set Title in meta.xml - remove configuration2 (update manifest.xml) - remove unused font - remove user defined styles - insert field Name instead of Name - remove language dependant information - links that need to be updated at the begining Modern business letter serif - remove configuration2 and settings.xml (update manifest.xml) - remove language dependant information Modern_business_letter_sans_serif - replace Open Sans font with Noto Sans - remove unused font - remove configuration2 and settings.xml (update manifest.xml) - remove language dependant information CV - set Title in meta.xml - remove unused font - remove configuration2 and settings.xml (update manifest.xml) - remove language dependant information Resume - remove unused font - remove configuration2 and settings.xml (update manifest.xml) - remove language dependant information - ODF validator does not accept 0in as first value of style:border-line-width-bottom, but seems valid in ODF 1.2 http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part1.html#property-style_border-line-width-bottom Default - set Title in meta.xml - add thumbnail.png (update manifest.xml) - remove language dependant information Modern - set Title in meta.xml - add thumbnail.png (update manifest.xml) - remove language dependant information Synchronize Templates names in strings.hxx Change-Id: I417c8398b0002a26e2f84d7efdaeddc0576f9a8c Reviewed-on: https://gerrit.libreoffice.org/46580 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com> Tested-by: Gabor Kelemen <kelemeng@ubuntu.com>
* remove empty line from emoji.ulf added by mistakeLászló Németh2017-12-191-1/+0
| | | | | | in commit 87ada8fe44c6caf21f1fd9a0f78aa2c26f1607f2 Change-Id: I33e17bc1625860370cf2d45832f77aff97100e94