summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Settings: RU translation" into cm-10.1Marco Brohet2013-08-031-2/+10
|\
| * Settings: RU translationVladimir Belkov2013-08-011-2/+10
| | | | | | | | Change-Id: I619648668eb2698e00ed47d894f93a5804e2f28f
* | Merge "Settings: IT translations" into cm-10.1Marco Brohet2013-08-031-0/+8
|\ \ | |/ |/|
| * Settings: IT translationsFrancesco2013-07-311-0/+8
| | | | | | | | Change-Id: Ide2f67fdfcbe805f11e77ef2f9aea075ef640386
* | Merge "Settings: HU translation" into cm-10.1Marco Brohet2013-08-011-0/+8
|\ \
| * | Settings: HU translationTamas Toth2013-07-301-0/+8
| | | | | | | | | | | | | | | | | | | | | PS2: Typo PS3: Typo Change-Id: I042f3ccfe4fd1992b94719239c57f1a21f5dd196
* | | Settings: ES translationsdjMesias2013-07-311-0/+8
| |/ |/| | | | | | | | | - Notification drawer behavior Change-Id: I04c99b172e83831ee0c0ed1b1d51b8613c0229c9
* | Merge "Settings: NL translation" into cm-10.1Marco Brohet2013-07-311-1/+9
|\ \
| * | Settings: NL translationEddy Witkamp2013-07-301-1/+9
| |/ | | | | | | | | | | | | | | Make notification-shade-collapse-after-dismiss behaviour configurable. ps2: rebase Change-Id: I8e9542afa6097efe171c7e71e4c91387e85178c2
* | Merge "Minor typo fix Wi-FI -> Wi-Fi" into cm-10.1Marco Brohet2013-07-312-5/+5
|\ \
| * | Minor typo fix Wi-FI -> Wi-FiJose Villegas2013-07-292-5/+5
| | | | | | | | | | | | Change-Id: I457a5cab6de706ab6fd05bf1b9c6c2531cdab4d1
* | | Settings: PT-BR translationsGustavo2013-07-301-1/+9
| |/ |/| | | | | Change-Id: I67f3655927bac23bd40a6f7b508927ac850b0964
* | Merge "Make notification-shade-collapse-after-dismiss behaviour ↵Danny Baumann2013-07-3027-38/+47
|\ \ | |/ |/| | | configurable." into cm-10.1
| * Make notification-shade-collapse-after-dismiss behaviour configurable.Danny Baumann2013-07-2727-38/+47
| | | | | | | | Change-Id: Icbf706a582279b86d901fb727b58663713606521
* | Merge "Settings: CS translation" into cm-10.1Marco Brohet2013-07-281-1/+1
|\ \
| * | Settings: CS translationOndrej Zima2013-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - fixed aapt warning - added lock screen rotation - CID rebuild Change-Id: Ie6a51e0829d32e355542f0adaf4cc9b7f75aced5
* | | Merge "Settings: CS AOSP translation" into cm-10.1Marco Brohet2013-07-281-1/+1
|\ \ \
| * | | Settings: CS AOSP translationOndrej Zima2013-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added Privacy guard - slightly tuned - fixed - just another tuning Change-Id: I22318867d04994e44e215e503228b56d9d8f06f9
* | | | Merge "Settings: update Japanese translation." into cm-10.1Marco Brohet2013-07-281-0/+53
|\ \ \ \
| * | | | Settings: update Japanese translation.Takuo Kitame2013-07-211-0/+53
| |/ / / | | | | | | | | | | | | | | | | | | | | - Add missing translation entries. Change-Id: Ie75276d7994a486e784dc67eb92f02506bf904c9
* | | | Merge "Settings : FR translation" into cm-10.1Marco Brohet2013-07-281-0/+1
|\ \ \ \
| * | | | Settings : FR translationDelphin PETER2013-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Add new translation Change-Id: If8c045e3b6e5e03f3621b753a9b9da2d043d1655
* | | | | Merge "Settings: EL translations" into cm-10.1Marco Brohet2013-07-281-2/+45
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Settings: EL translationsMichael Bestas2013-07-231-2/+45
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: Ibc616eceede964fa4556f6f585d78131713b8f23
* | | | Merge "Settings: ES translations" into cm-10.1Jorge Ruesga2013-07-241-5/+6
|\ \ \ \
| * | | | Settings: ES translationsdjMesias2013-07-231-5/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | - Rotate lock screen - Minor changes Change-Id: Ia493de6b30315e695072d92a6ddef9c4f250e4ba
* | | | Hide the AM/PM preference completely if using a 24-hour clockVeeti Paananen2013-07-231-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition, this commit also fixes a bug where the switch would not be disabled on a fresh 24-hour clock install, as the preference value would be null. This is avoided by using a higher-level method from DateFormat to check the clock mode. Patch Set 2: improve code styling Patch Set 3: remove pointless application context retrieval Change-Id: I80de938df61803649688723843439905e9909b07
* | | Merge "Settings: NL translations" into cm-10.1Marco Brohet2013-07-221-2/+5
|\ \ \ | |_|/ |/| |
| * | Settings: NL translationsMarco Brohet2013-07-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ps1: Storage Settings: Allow user to trigger a volume rescan ps2: Add lockscreen rotation as an optional rotation setting ps3: fix typo: selecteer -> selecteert ps4: fix typo: netwek -> netwerk Change-Id: Iefd0acc943f3c93c58fb567601949b741ac57ef6
* | | Merge "Settings: Update Polish translation" into cm-10.1Marco Brohet2013-07-202-6/+63
|\ \ \
| * | | Settings: Update Polish translationtompopielarczyk2013-07-142-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PS2: Added missing strings and latest updates PS5: Minor fix and latest updates Change-Id: Ie339402f41a31a7d3823bd8f86d4c0ded6b7d250
* | | | Merge "Settings: Update italian translation" into cm-10.1Marco Brohet2013-07-141-0/+23
|\ \ \ \
| * | | | Settings: Update italian translationrheeze2013-07-131-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Privacy guard and other things Change-Id: I10796b69482546cb81ffcfb6eed53a32f4ac6609
* | | | | Merge "Settings: CS translation" into cm-10.1Marco Brohet2013-07-141-22/+61
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Settings: CS translationOndrej Zima2013-07-081-22/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added profile from Wi-Fi activation - rebased and completition, revisiting of profile triggers - revised new strings for stylus gestures - sorry about this is not included in previous patchset... - rebased, added new strings for Provacy Guard - tuned previous translation a bit - rebased, added new for Privacy Guard manager, lock screen widgets and notification vibration - rebased, added new Media scan, fixed Provacy guard - unified Privacy guard strings Change-Id: I7e8aa5f9cdf9aa9b1c86383907945f7628e3172f
* | | | | Merge "Settings: HU translation" into cm-10.1Marco Brohet2013-07-121-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Settings: HU translationTamas Toth2013-07-111-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I8bb82b003486674caaaaca80e3cef3f2989e1815
* | | | | Settings: RU translationpvolkov2013-07-111-0/+1
| |_|_|/ |/| | | | | | | | | | | Change-Id: I45b12b4e7d42f571f6ef5b9f05f1f874c02d01cb
* | | | Settings: PT-BR translationsGustavo2013-07-111-0/+1
|/ / / | | | | | | | | | Change-Id: Ic04c79170b4f19147a6b9768e229db09cbbd69bd
* | | Add lockscreen rotation as an optional rotation setting (2/2)Kelly2013-07-102-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow the user to select wether or not to use the rotation settings for the lockscreen. This is dependent upon the rotation setting being checked. Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: If45c13a395e0d71b7c4cdcf484a6b8cef964ee37 JIRA: CYAN-339
* | | Merge "Update German translation." into cm-10.1Danny Baumann2013-07-101-1/+22
|\ \ \
| * | | Update German translation.Danny Baumann2013-07-061-1/+22
| | | | | | | | | | | | | | | | Change-Id: I002ec3755ea8b7ad5989f842387e13c289883f0d
* | | | Settings: ES translationsdjMesias2013-07-082-1/+23
| |/ / |/| | | | | | | | Change-Id: I68739e3af0d1f43e31da035d8c427ddef872bbb4
* | | Merge "Settings: RU translation" into cm-10.1Marco Brohet2013-07-071-0/+2
|\ \ \
| * | | Settings: RU translationpvolkov2013-07-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I64489bec3944571fafa2519d6b3d90a804ab7dbc Patch set 2: Update translation Change-Id: I1aed8306a622776472d39f94603549900958d9fc
* | | | Settings: SK translationsprescott662013-07-071-0/+17
|/ / / | | | | | | | | | Change-Id: I86303bb4c119a82e2614d0eb1d95d50a7793e9ba
* | | Merge "Settings: HU translation" into cm-10.1Marco Brohet2013-07-071-0/+2
|\ \ \
| * | | Settings: HU translationTamas Toth2013-07-071-0/+2
| | | | | | | | | | | | | | | | Change-Id: I64b8989fa560d320ac4909c4dcb63f0b7611d316
* | | | Settings : FR translationDelphin PETER2013-07-061-0/+21
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Add new translation Patch set 2 : rebase and add new translation Patch set 3 : correction Patch set 4 : correction Patch set 5 : correction Patch set 6 : Better translation Patch set 7 : rebase and add new translation Change-Id: I11387f21fa3c58d502cafe2cdfb2165f511946a9
* | | Settings: PT-BR update translationsGustavo2013-07-062-1/+7
|/ / | | | | | | Change-Id: I47bcc64f69884397ed53de82ac45f439a07f377e