OSDN Git Service
isimobile [Sun, 14 Apr 2013 16:16:40 +0000 (18:16 +0200)]
Afrikaans: Add missing translations & plurals
Change-Id: Ifca2bf09f0435e4a7260368b79aa581296d04622
Marco Brohet [Sat, 4 May 2013 16:34:05 +0000 (09:34 -0700)]
Merge "Apollo: EL translation" into cm-10.1
Marco Brohet [Fri, 3 May 2013 23:33:17 +0000 (16:33 -0700)]
Merge "Apollo : FR translation" into cm-10.1
Michael Bestas [Thu, 2 May 2013 20:59:02 +0000 (23:59 +0300)]
Apollo: EL translation
Signed-off-by: Michael Bestas <mikeioannina@gmail.com>
Change-Id: Ibd6a060bc06a6cb5867eb5e78ee9b935b09cc181
Marco Brohet [Mon, 29 Apr 2013 18:54:17 +0000 (11:54 -0700)]
Merge "Apollo: HU update translations" into cm-10.1
Darren Salt [Mon, 29 Apr 2013 14:42:37 +0000 (15:42 +0100)]
en_GB localisation.
Change-Id: I229f07bea760a43a5a13a5ab75f05b3e19033f7e
Danny Baumann [Mon, 29 Apr 2013 07:58:43 +0000 (00:58 -0700)]
Merge "Add support for playing files and playlists via intent." into cm-10.1
Tamás Tóth [Mon, 29 Apr 2013 07:41:39 +0000 (09:41 +0200)]
Apollo: HU update translations
Change-Id: I7f802eb497a470a5cb08e5638bf9fafbb11a8e55
Marco Brohet [Sun, 28 Apr 2013 07:54:00 +0000 (00:54 -0700)]
Merge "Apollo: Update italian translation" into cm-10.1
Francesco [Sat, 27 Apr 2013 11:22:13 +0000 (13:22 +0200)]
Apollo: Update italian translation
Change-Id: I5ffc45e1ac255daeec9e98b17d33acf13422be67
djMesias [Fri, 26 Apr 2013 23:14:22 +0000 (01:14 +0200)]
Apollo: ES translations
- Singular favorite translation
Change-Id: I5b3ff05cbff992c5834f4665965202b5f4cfa85f
Andrew Neal [Sat, 27 Apr 2013 03:43:57 +0000 (20:43 -0700)]
Merge "Improve app widget layouts." into cm-10.1
DelPETER [Fri, 26 Apr 2013 14:03:31 +0000 (16:03 +0200)]
Apollo : FR translation
Change-Id: Iefddb7e18ca5955d46a23055e9d9d37291a1954e
Danny Baumann [Fri, 26 Apr 2013 13:17:44 +0000 (06:17 -0700)]
Merge "Make sure to not overflow thread pool." into cm-10.1
Danny Baumann [Fri, 26 Apr 2013 13:16:47 +0000 (06:16 -0700)]
Merge "Init loader manager in main thread." into cm-10.1
Danny Baumann [Mon, 22 Apr 2013 07:33:04 +0000 (09:33 +0200)]
Fix applying the lockscreen controls setting on startup.
settings.xml and PreferenceUtils.java were in disagreement about the key
name.
Change-Id: I59ab7c4a543619a00ba568fc810f72c62bd09b8f
JIRA:CYAN-900
Danny Baumann [Mon, 22 Apr 2013 08:48:37 +0000 (10:48 +0200)]
Init loader manager in main thread.
It may initialize static handlers as a side effect, which are supposed
to run in the main thread.
Change-Id: I0b92e5b9e9baa78fc453884c6898421220d7f9f7
JIRA:CYAN-704
Danny Baumann [Mon, 22 Apr 2013 07:44:42 +0000 (09:44 +0200)]
Assorted typo fixes.
Change-Id: I57f2200ea2dea6109751fb6774f93262573c7b49
Danny Baumann [Fri, 26 Apr 2013 13:13:51 +0000 (06:13 -0700)]
Merge "Don't assume the difference between the singular and plural is only 1 character." into cm-10.1
Danny Baumann [Thu, 25 Apr 2013 12:20:54 +0000 (14:20 +0200)]
Improve app widget layouts.
Make them cope with larger-than-usual font sizes, and simplify them in
the process.
Change-Id: Iee42b68bb9907838b6c933f046503aacb8259daf
JIRA:CYAN-779
Andrew Neal [Fri, 26 Apr 2013 04:22:55 +0000 (21:22 -0700)]
Merge "Fix up app widget background drawables." into cm-10.1
Marco Brohet [Wed, 24 Apr 2013 18:59:56 +0000 (11:59 -0700)]
Merge "Apollo: Danish translation" into cm-10.1
Danny Baumann [Tue, 23 Apr 2013 09:33:41 +0000 (11:33 +0200)]
Add support for playing files and playlists via intent.
Change-Id: I3a4be1d2eec159f47adcd9d7e9dae529ba1dbf35
Danny Baumann [Tue, 23 Apr 2013 07:27:20 +0000 (09:27 +0200)]
Don't assume the difference between the singular and plural is only 1
character.
E.g. in German, it's Favorit vs. Favoriten.
Change-Id: I39780574ab69d0c3f9e51343e37ec9540510025c
Danny Baumann [Mon, 22 Apr 2013 07:30:17 +0000 (09:30 +0200)]
Make sure to not overflow thread pool.
When the image fetcher tasks are paused, adding new tasks can lead to
thread pool overflow. Avoid adding new tasks in that case.
Change-Id: I5b97ab8bd204b22af7eb57c388e2bb2796cde193
JIRA:MC-1
Danny Baumann [Mon, 22 Apr 2013 08:58:18 +0000 (10:58 +0200)]
Fix up app widget background drawables.
There was a mixup when converting Apollo to API 14+ only: The drawables
targeted for API level < 11 were incorrectly used. Fix that by restoring
the drawables targeted for API level >= 11.
Change-Id: I8d2dee470ec949c905b8a9e4b5f64317cddc911b
JIRA:CYAN-779
Marco Brohet [Sun, 21 Apr 2013 20:22:42 +0000 (22:22 +0200)]
Apollo: Fix aapt warnings
Change-Id: Id86788a0c07c866e7c0f460fb13b4f3782f0348d
Jacob Overgaard Madsen [Fri, 19 Apr 2013 16:30:44 +0000 (18:30 +0200)]
Apollo: Danish translation
Patchset 2: Changes based on reviews. Thanks for spotting 2 obvious errors.
Change-Id: I2e7df9f082ce1e05ed3a3f44f58c681d21413270
Marco Brohet [Fri, 19 Apr 2013 21:11:12 +0000 (14:11 -0700)]
Merge "Add Apollo uk_UA translation" into cm-10.1
Michael Bestas [Thu, 18 Apr 2013 13:22:13 +0000 (16:22 +0300)]
Apollo: Remove non-translatable strings
Signed-off-by: Michael Bestas <mikeioannina@gmail.com>
Change-Id: I3607dc6028cd37d259059564f5982f48477736d0
Danny Baumann [Thu, 18 Apr 2013 07:23:03 +0000 (00:23 -0700)]
Merge "Adding translatable false tag to some lines" into cm-10.1
Tamás Tóth [Thu, 18 Apr 2013 07:07:40 +0000 (09:07 +0200)]
Adding translatable false tag to some lines
Change-Id: Ib6fc41c9825cb1cd79974934ac34df5393627df7
Vasilis Akritas [Sat, 30 Mar 2013 16:15:26 +0000 (18:15 +0200)]
Apollo: Add Greek Translation
Patchset 3: Some spelling fixes & finish translation
Minor corrections to align with overrall system translation
Patchset 4: Remove comments as part of the new translation policy
Correct playlist_last_added
Patchset 5: Final corrections
Change-Id: Ic744f0b717602276094b930d6917872af00177ea
Odin Ugedal [Mon, 15 Apr 2013 18:20:10 +0000 (20:20 +0200)]
Apollo: Added Norwegian translation
Added Norwegian translation for Apollo
Patch Set 2: Fixed some typos...
Patch Set 3: Added a missing 'e'
Change-Id: I0022c8ee211bbd2adf05542930010721cd3bb37d
Vavooon [Sun, 14 Apr 2013 21:16:23 +0000 (00:16 +0300)]
Add Apollo uk_UA translation
Change-Id: If4cf2780cbff48a2cf8fb5812d74b2cd392f7ea6
Marco Brohet [Fri, 12 Apr 2013 21:23:33 +0000 (14:23 -0700)]
Merge "Apollo: updated Finnish translation" into cm-10.1
Gustavo [Thu, 11 Apr 2013 14:15:16 +0000 (07:15 -0700)]
PT-BR: Update translation
Change-Id: I123e5ff20ba17a32a87faa3c60bbedff5acb2804
Marco Brohet [Wed, 10 Apr 2013 18:58:54 +0000 (11:58 -0700)]
Merge "PT-BR: Update translation" into cm-10.1
Marco Brohet [Wed, 10 Apr 2013 18:57:11 +0000 (11:57 -0700)]
Merge "Apollo: NL translations" into cm-10.1
Gustavo [Mon, 8 Apr 2013 09:04:47 +0000 (02:04 -0700)]
PT-BR: Update translation
Change-Id: I4e317518340d32ad2194bc9aaa9daf737e7b0b0c
Andrew Neal [Sun, 7 Apr 2013 01:48:39 +0000 (18:48 -0700)]
Merge "Apollo: Disable hardware acceleration in ColorPickerView" into cm-10.1
Marco Brohet [Sat, 30 Mar 2013 20:51:54 +0000 (21:51 +0100)]
Apollo: NL translations
Change-Id: I9cd84c71207a4fbb5346becc2e130f9b82af84a9
Marco Brohet [Fri, 5 Apr 2013 23:43:12 +0000 (16:43 -0700)]
Merge "Update Russian Translation-Apollo-CM10.1" into cm-10.1
Francesco [Fri, 5 Apr 2013 19:11:43 +0000 (21:11 +0200)]
Apollo: Update italian translation
Change-Id: I4763885cc4473987e83eff5af39357f0a7c5488a
pvolkov [Thu, 4 Apr 2013 16:34:29 +0000 (20:34 +0400)]
Update Russian Translation-Apollo-CM10.1
Update Russian Translation-CM10.1
Marco Brohet [Thu, 4 Apr 2013 14:15:19 +0000 (07:15 -0700)]
Merge "Apollo: improve default translations" into cm-10.1
Danny Baumann [Thu, 4 Apr 2013 13:17:05 +0000 (06:17 -0700)]
Merge "Apollo: Add Simplified Chinese Translations" into cm-10.1
Marco Brohet [Tue, 2 Apr 2013 13:35:36 +0000 (15:35 +0200)]
Apollo: improve default translations
Change-Id: I77ddc4bd3b347707ea429542721f2c55fee3c880
jackmu95 [Tue, 2 Apr 2013 09:04:03 +0000 (11:04 +0200)]
Apollo: Update German translation
Patch Set 1: * make strings more consistens to
Google Play Music and other well known music apps
Patch Set 2: * revert some changes
Change-Id: I8bdc298deb2261a9e5f2a65465bdbccdbaf0d1b9
Jorge Ruesga [Sun, 31 Mar 2013 21:55:41 +0000 (23:55 +0200)]
Apollo: Disable hardware acceleration in ColorPickerView
http://developer.android.com/guide/topics/graphics/hardware-accel.html
<< ComposeShader can only contain shaders of different types (a BitmapShader and a
LinearGradient for instance, but not two instances of BitmapShader)'. But, 'If your
application is affected by any of these missing features or limitations, you can turn
off hardware acceleration for just the affected portion of your application by calling
setLayerType(View.LAYER_TYPE_SOFTWARE, null). >>
Patchset 2: Move setLayerType to ApolloUtils
Patchset 3: Untouch ColorPickerView
Change-Id: I6979051a8d8e4f6cd3dc5ad5dc4736c3adf8ec79
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Jorge Ruesga [Sun, 31 Mar 2013 22:01:05 +0000 (00:01 +0200)]
Apollo: Fix afrikaans aapt warning
Change-Id: Ic3eef27501ae1de759ac3c4a670a2d8b1964981b
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Marco Brohet [Sat, 30 Mar 2013 19:41:21 +0000 (12:41 -0700)]
Merge "Add Afrikaans translation" into cm-10.1
Buga Dániel [Tue, 26 Mar 2013 12:06:31 +0000 (13:06 +0100)]
Fix notification widget start
When starting playback first from a widget, the notification controls aren't
displayed. This commit should fix that and also clean up the code a bit.
Change-Id: Ic8463a16dd1d930540eb8d4c2ff2e1be26666b94
isimobile [Tue, 26 Mar 2013 19:10:23 +0000 (21:10 +0200)]
Add Afrikaans translation
Translated new version of Apollo to Afrikaans
Change-Id: I701cab6ee73741a6e5f57c1737a0b374f7d8e53a
Danny Baumann [Fri, 22 Mar 2013 09:28:23 +0000 (02:28 -0700)]
Merge "Japanese : Initial Japanese translation for new Applo." into cm-10.1
Danny Baumann [Fri, 22 Mar 2013 08:13:54 +0000 (09:13 +0100)]
Fix up bitmap config check.
Instead of throwing away (otherwise valid) bitmaps if their config
doesn't fit any predefined one, convert them on the fly.
Change-Id: I2842a59fdc68f2f954c189ba6925eeeab33d4633
Buga Dániel [Thu, 21 Mar 2013 18:30:28 +0000 (19:30 +0100)]
Invert Play/Pause buttons in Notification widget
The logical behaviour of the "Play" button is to actually play a song
when pressed. The current behaviour is to pause the song and the "Pause"
button resumes the playback.
Change-Id: Ib432bfe6c214e38196a25b00fbbc8fbfbc031ca7
Jani Kinnunen [Thu, 21 Mar 2013 18:29:01 +0000 (20:29 +0200)]
Apollo: updated Finnish translation
Change-Id: I593fd642a596c43e5a6cf99fdb74e0ebb35bb863
Buga Dániel [Thu, 21 Mar 2013 17:51:05 +0000 (18:51 +0100)]
Fix NPE
Prevent ImageFetcher to return a Bitmap with null Config.
Change-Id: I8c9ace7ffa6f851524ce5c7b098ecf2c6768ac52
Takuo Kitame [Thu, 21 Mar 2013 09:22:59 +0000 (18:22 +0900)]
Japanese : Initial Japanese translation for new Applo.
patch-2: revise and add plurals.xml
Change-Id: Ifa935ebc99e04225584967766eaaf37eb34f5407
Marco Brohet [Wed, 20 Mar 2013 19:32:02 +0000 (12:32 -0700)]
Merge "Added Russian Translation-Apollo-CM10.1" into cm-10.1
Danny Baumann [Wed, 20 Mar 2013 09:02:17 +0000 (02:02 -0700)]
Merge "es_ES: Add spanish translations" into cm-10.1
Danny Baumann [Wed, 20 Mar 2013 09:01:45 +0000 (02:01 -0700)]
Merge "Apollo: Update italian translation" into cm-10.1
Danny Baumann [Wed, 20 Mar 2013 09:01:36 +0000 (02:01 -0700)]
Merge "Apollo: Update italian translation" into cm-10.1
Danny Baumann [Wed, 20 Mar 2013 09:01:17 +0000 (02:01 -0700)]
Merge "Apollo: Added Polish language" into cm-10.1
Danny Baumann [Wed, 20 Mar 2013 09:00:43 +0000 (02:00 -0700)]
Merge "Apollo: Add French translation" into cm-10.1
Danny Baumann [Mon, 18 Mar 2013 10:39:27 +0000 (11:39 +0100)]
Add German translation.
Change-Id: I4614e58cea699b333990783dfbd7120b8921a126
YuanQY [Sun, 17 Mar 2013 05:08:07 +0000 (13:08 +0800)]
Apollo: Add Simplified Chinese Translations
Patch Set 2: Modified translationss for better accuracy, as well as
updated the copyright header as per Marco's request.
Patch Set 4: Merge http://review.cyanogenmod.org/34016, clean up unused
string.
Patch Set 5: Merge http://review.cyanogenmod.org/#/c/34016/ and
http://review.cyanogenmod.org/#/c/34020/, add translation for
plurals.xml
Patch Set 6: Merge the translation in Patch Set 3 and fix some incorrectness translation.
Change-Id: I8d26ef1d887b40a1d058441cb0985a3dcbeb50d4
pvolkov [Sun, 17 Mar 2013 10:45:06 +0000 (14:45 +0400)]
Added Russian Translation-Apollo-CM10.1
Added Russian Translation-Fixes-CM10.1
Added Russian Translation-Fixes-CM10.1
Update Russian Translation-CM10.1
Update Russian Translation-CM10.1
Update Russian Translation-Added plurals.xmlCM10.1
Update Russian Translation-CM10.1
Update Russian Translation-CM10.1
Update Russian Translation-CM10.1
tompopielarczyk [Sun, 17 Mar 2013 21:30:05 +0000 (22:30 +0100)]
Apollo: Added Polish language
Patch Set 2: Formating and headers synced with latest merged changes of values
Patch Set 3: Correction
Patch Set 4: Fixed a typo
Patch Set 5: Synced with latest merged changes
Patch Set 6: Fixed a typo
Patch Set 7: Fixed a typo
Change-Id: I84350b3440e379f20345d4ec9d1d40e816f98395
Danny Baumann [Tue, 19 Mar 2013 13:05:15 +0000 (14:05 +0100)]
Fix crash
Change-Id: I1e8e693676d14ebca6f1c54773ed36e20c465c00
Buga Dániel [Tue, 19 Mar 2013 12:55:14 +0000 (13:55 +0100)]
Convert line endings
Change-Id: I16eeea17b850f411e7031c79da06de628675e977
djMesias [Sun, 17 Mar 2013 20:19:24 +0000 (21:19 +0100)]
es_ES: Add spanish translations
Change-Id: I687d4fc310b74046cb878dec20778a5e6f5a04cf
Buga Dániel [Sun, 17 Mar 2013 16:52:55 +0000 (17:52 +0100)]
Apollo: Hungarian translations
Patch Set 2: Corrections based on Danny Baumann's changes.
Change-Id: I930db39f2ce4b8a73b03a8cdf5561626263e6d5d
Francesco [Mon, 18 Mar 2013 18:26:27 +0000 (19:26 +0100)]
Apollo: Update italian translation
Change-Id: I54746a77b658187dfceeaeee56d89fabe418291a
xavihernandez [Sun, 17 Mar 2013 21:23:16 +0000 (22:23 +0100)]
Apollo: Add French translation
* Patch Set 1: initial commit
* Patch Set 2: correction
* Patch Set 3: update
* Patch Set 4: correction
* Patch Set 5: correction (sry Delphin)
Change-Id: I4dcdae1bf85e5dc4ba0c9e7eb043c865ad32f9aa
Danny Baumann [Mon, 18 Mar 2013 15:08:56 +0000 (08:08 -0700)]
Merge "Apollo: Don't reduce visibility of hasDividerBeforeChildAt" into cm-10.1
Danny Baumann [Mon, 18 Mar 2013 14:44:47 +0000 (15:44 +0100)]
Improve translability of some items.
In particular, don't assume a certain word order, e.g. in 'Delete
album?'.
Change-Id: I8271ea80c36763869a2c4643509b773e17d10e6c
Danny Baumann [Mon, 18 Mar 2013 10:49:48 +0000 (11:49 +0100)]
Remove unused strings.
Change-Id: If2a554cd41bf1fb1524d1a39f4d92bb861bdf693
Francesco [Sun, 17 Mar 2013 11:56:06 +0000 (12:56 +0100)]
Apollo: Update italian translation
Change-Id: Iaa66535fa8bea0c17cc7ba5c5fd327ae8af61295
Jorge Ruesga [Sun, 17 Mar 2013 11:47:44 +0000 (12:47 +0100)]
Apollo: Don't reduce visibility of hasDividerBeforeChildAt
Change-Id: I0e01f63ad21cab0c82ef5ff91bf86ce03812226b
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Marco Brohet [Sun, 17 Mar 2013 08:53:44 +0000 (09:53 +0100)]
Apollo: update resources
- Update/add copyright
- UNIX/Linux line endings
Change-Id: Ia4db414ce7e824b0056a979197238585988a54e5
Ricardo Cerqueira [Sat, 16 Mar 2013 12:15:05 +0000 (12:15 +0000)]
Merge remote-tracking branch 'github/master' into HEAD
Change-Id: If25d2cdeb0a2a912faff62f95a0d282cbdb33b4c
Thiago Vinícius Freire de Araújo Ribeiro [Fri, 13 Jul 2012 01:10:50 +0000 (22:10 -0300)]
Send com.android.music prefixed sticky broadcasts
For the sake of backwards compatibility. See issue 5803.
(cherry picked from commit
a22c64e786d7819b28897028c73fbfae1e8fea80)
Change-Id: Icdd29fc783e420ac836b1e4677d8d3decbb6c360
Danny Baumann [Mon, 11 Mar 2013 08:16:23 +0000 (09:16 +0100)]
Put play state information in the sticky broadcast again.
For backwards compatibility to 3rd party apps.
Change-Id: I607cd197b3e6d0d3f9c6961cf150f1f91d028c91
Danny Baumann [Thu, 7 Mar 2013 15:06:17 +0000 (16:06 +0100)]
Replace the music app again.
Change-Id: I6f3017db1419b67572e8a4e2f64e6083dc88dfd0
Danny Baumann [Sun, 3 Mar 2013 11:37:09 +0000 (12:37 +0100)]
Fix typo.
We have to notify the potentially waiting AsyncTasks when unpausing, not
when pausing.
Change-Id: I413cbcf41f2e4962395c8122901502bced788a0e
DvTonder [Sat, 2 Mar 2013 17:50:54 +0000 (12:50 -0500)]
Apollo: Update Afrikaans translation
Follow AOSP style and tone
Change-Id: Ic1d5c305d74afba34051573c1bc7613dd08f9d4a
Danny Baumann [Sun, 24 Feb 2013 12:32:05 +0000 (13:32 +0100)]
Bump version number to 1.1.
Change-Id: Id0a89bea98b60f96327d262ba10d9b936ba91f17
Danny Baumann [Sun, 24 Feb 2013 11:51:49 +0000 (12:51 +0100)]
Some cleanup.
Change-Id: I5c3b0693e11bb7eac667b4fc25f8e8086fe07dd2
Danny Baumann [Sat, 23 Feb 2013 13:49:17 +0000 (14:49 +0100)]
Fix state handling of play/pause icon in the notification.
Change-Id: I1c4581f83a0e329674c2d5a4846c1e4310984614
Danny Baumann [Sat, 23 Feb 2013 13:24:41 +0000 (14:24 +0100)]
Take a cleaner approach at foreground tracking.
Change-Id: Ic9ad3920ca1fe303d799d250166a3a3d1d938d85
Danny Baumann [Sat, 23 Feb 2013 12:53:02 +0000 (13:53 +0100)]
Clean up 'cache pause' handling.
Change-Id: I192a8aaa8a25938017e4bce75bd7a36fc8084966
Danny Baumann [Sat, 23 Feb 2013 12:29:12 +0000 (13:29 +0100)]
Remove remainders of pre-ICS support.
Change-Id: I9f5bdde528fd67eee2dea61791cbf2c492446392
Danny Baumann [Sat, 23 Feb 2013 12:27:25 +0000 (13:27 +0100)]
Remove support library jar.
We build it from source anyway.
Change-Id: Ia3eb430616b0ec157333ed675f2fdc385968b9ba
Danny Baumann [Sat, 23 Feb 2013 12:27:07 +0000 (13:27 +0100)]
Remove lyrics support.
Change-Id: Ifa74380c0136a903965bda17ccc9b40e95b822af
Danny Baumann [Sat, 23 Feb 2013 12:22:27 +0000 (13:22 +0100)]
Cleanup: Treat IDs, counts and durations as numbers, not as strings.
Change-Id: Ia589b3ae1bdff11d049ee0ff4ddb654331d95682
Danny Baumann [Sat, 23 Feb 2013 12:19:44 +0000 (13:19 +0100)]
CheckBoxPreference already saves internally, no need to do it twice.
Change-Id: Iac2a0f5faf5c3d8bb69d5b30514530849ca6990c
Danny Baumann [Sat, 23 Feb 2013 12:19:00 +0000 (13:19 +0100)]
Make Apollo compile and adapt to min API level 14 (ICS).
Change-Id: I6aa5288c5f72f6c79e1a51efb82c894b206b94e6
Danny Baumann [Wed, 20 Feb 2013 16:57:44 +0000 (17:57 +0100)]
Import AppMsg.
Change-Id: Ie5240242a9206b78bb1dcb2d07da41c65f6d7131