Squashed commit of the following:

commit 7d7707b4256f779456ccd5fcf38c094bca97023d
Merge: 90885ef 6ae40e2
Author: Wizard0f0s <jamie.gilmer@gmail.com>
Date:   Tue Jul 2 00:30:06 2013 -0400

    Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Camera into cm-10.1

    Conflicts:
    	res/values-af/cm_strings.xml
    	res/values-da/cm_strings.xml
    	res/values-de/strings.xml
    	res/values-el/cm_strings.xml
    	res/values-es/cm_strings.xml
    	res/values-fr/cm_strings.xml
    	res/values-hu/cm_strings.xml
    	res/values-it/cm_strings.xml
    	res/values-pt/cm_strings.xml
    	res/values-ru/strings.xml
    	res/values-zh-rCN/cm_strings.xml
    	res/values/arrays.xml
    	res/values/cm_arrays.xml
    	res/values/cm_strings.xml
    	res/values/config.xml
    	res/xml/camera_preferences.xml
    	src/com/android/camera/CameraSettings.java
    	src/com/android/camera/ComboPreferences.java
    	src/com/android/camera/PhotoModule.java
    	src/com/android/camera/Util.java

    Change-Id: Ic65cd5ace8b67ef8a68d0c48bccacc2d35733361

commit 6ae40e27790e1097fb7f3011e34823b22f53daf6
Author: Eddy Witkamp <eddywitkamp@gmail.com>
Date:   Thu Jun 27 22:13:25 2013 +0200

    Camera: NL translation

    Change-Id: Icb28da995aeaf1a2b619875933bb1fa679ded07b

commit 20cb023aa39c98b02236a748742a53731f7cc8b8
Author: Danny Baumann <dannybaumann@web.de>
Date:   Thu Jun 27 09:16:47 2013 +0200

    Update German translation.

    Change-Id: Ic5e8b0e00117047b7cec29d30f1a8a135243ff30

commit 32ae723ff7501600020cc0ece9b32b0fe20d2387
Author: prescott66 <prescott66@gmail.com>
Date:   Fri May 31 11:50:14 2013 +0200

    Camera: SK Translations

    Change-Id: I957d8e9791224ccabb2ce08009e78b072c762fa6

commit b88e06cd213048856565014213d5b5934d6cd959
Author: djMesias <djmesias@yahoo.es>
Date:   Tue Jun 25 21:04:54 2013 +0200

    Camera: Add translatables

    Change-Id: I040f13a61d9db8e9bbc2a2af4ed83f178a3b60a5

commit 20aae58ff977c13fd4b3a10658f30fefda4a5b81
Author: Chirayu Desai <cdesai@cyanogenmod.org>
Date:   Sat Jun 22 18:34:29 2013 +0530

    HDR video

    * Toggles a parameter (string videoHdrParam in config.xml) on/off.

    Change-Id: Iafedf74b7191ce35ab982c52f3188dc566de9d7b

commit 77f67be253e794e101d3247101b616b9bd6aac54
Merge: 4c84169 7176027
Author: Danny Baumann <dannybaumann@web.de>
Date:   Wed Jun 19 03:51:57 2013 -0700

    Merge "Camera: Add a GPS indicator" into cm-10.1

commit 4c841690b195676c2e1651587a459ad5a06a5043
Merge: edac7ca ef7a417
Author: Danny Baumann <dannybaumann@web.de>
Date:   Tue Jun 18 23:56:52 2013 -0700

    Merge "Camera: Update Polish translation" into cm-10.1

commit edac7caf736fb14a5cd1c78c12cbb52807cdb448
Merge: 5fd0e70 bfb1a34
Author: Danny Baumann <dannybaumann@web.de>
Date:   Sun Jun 16 23:28:57 2013 -0700

    Merge "Camera: Simplified Chinese Translations" into cm-10.1

commit 5fd0e703565bece5dd2da2f769fa571c1011fe69
Merge: ff2f2f7 8aa5b5b
Author: Danny Baumann <dannybaumann@web.de>
Date:   Fri Jun 14 00:06:33 2013 -0700

    Merge "Camera: RU translation" into cm-10.1

commit ff2f2f740a83590408e4cb493d361aa50a99b19d
Merge: db3f4c2 3b7401d
Author: Danny Baumann <dannybaumann@web.de>
Date:   Fri Jun 14 00:06:01 2013 -0700

    Merge "Camera: CS translation" into cm-10.1

commit db3f4c2ddf8bb7e24791bda62de61cab6b5657dd
Merge: 4f6a0ad 9e3c3f8
Author: Danny Baumann <dannybaumann@web.de>
Date:   Thu Jun 13 23:49:26 2013 -0700

    Merge "Camera: EL translations" into cm-10.1

commit 4f6a0ad3032bf0db0d4a56db5e65c9011b27601f
Merge: e7c944d 102c01b
Author: Danny Baumann <dannybaumann@web.de>
Date:   Thu Jun 13 23:49:09 2013 -0700

    Merge "Camera: NL translation" into cm-10.1

commit e7c944dbd474af06794820fc8bfb87dddd9baca0
Author: isimobile <isimobile@ismaakit.com>
Date:   Thu Jun 13 20:44:45 2013 +0200

    Camera : Af translation

        -Add new translation

    Change-Id: Ie98a05d3b3f129f0345c28284c687c837ec4ff63

commit 79260f34d3c5db789cb7bcf72e44bc07ca2b2f19
Author: DelPETER <delphinpeter@gmail.com>
Date:   Thu Jun 6 23:07:29 2013 +0200

    Camera : FR translation

    -Add new translation

    Change-Id: Ia8f5c051b810c40e4f09f8e48b3efda01bbd78e7

commit 215bdd74f835668197f018f9883ccafae960f66c
Author: Tamas Toth <syman@babulus.hu>
Date:   Wed Jun 5 15:39:53 2013 +0200

    Camera: HU translation update

    Change-Id: I3123c557d42c448653d181f4ee6fe5faab5fc808

commit 9e3c3f8dd0b782d65ff7620b344a26027654819d
Author: Michael Bestas <mikeioannina@gmail.com>
Date:   Tue Jun 4 22:09:44 2013 +0300

    Camera: EL translations

    Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

    Change-Id: I55057633cde1bfb3486e535adf5e4bf41e274664

commit 102c01ba13b6e2dba061e08c6b4d9faaf2f6afa1
Author: Eddy Witkamp <eddywitkamp@gmail.com>
Date:   Tue Jun 4 22:55:25 2013 +0200

    Camera: NL translation

    + adding arrays to complete Dutch translation in TTools

    Change-Id: I8799b0837cf3a7f030cc32ef9f7aed4350070492

commit 71760271ca07e57985c4c14cb6a8786aa8417858
Author: Pascal Pollet <paspol@gmx.de>
Date:   Thu May 23 00:11:27 2013 +0200

    Camera: Add a GPS indicator

    This will add a GPS indicator to the preview of the photo camera.
    The indicator is placed as an overlay at the upper top corner
    of the photo camera preview.

    It shows one of three icons depending on the GPS state:
        - acquiring fix
        - GPS fix acquired
        - GPS disallowed in system settings

    The icon will only be shown in the preview of the photo module,
    not in the video or panorama module, and not in the gallery view.

    Drawables by blunden.

    Change-Id: I0686ef4ee1fe9b34ac9beaaa2bd43555234f4f4d

commit 24657019741c857b4637ef30d4388d319734838e
Author: Francesco <francescoforesta@email.it>
Date:   Sun Jun 9 10:59:40 2013 +0200

    Camera: IT translations

    Change-Id: I868cd5760cb051bc7551fc525051355b7c74f850

commit 8aa5b5b3b046c5027e069a91e358d8c813bd9398
Author: pvolkov <marshmollow@gmail.com>
Date:   Wed May 29 22:44:21 2013 +0400

    Camera: RU translation

    Change-Id: I4c3fad57e7a4639ed1279b15068045f67fb9c086

    Patch Set 2: Update translation

    Change-Id: Ie4d7ba51c566e130654583964ace04c71e744aa8

    Patch Set 3: Update translation

    Change-Id: I22198bb1f85c58208cd3893ed479d4a5a6a1f5c0

    Patch Set 4: Update translation

    Change-Id: Ic4c61f73b28234c2fd7907fd0b21ad5c6e0fe499

commit ef7a4179ce89c934e7228187a1d8f5cb1d358523
Author: Tomasz Popielarczyk <popielarczyktomasz@gmail.com>
Date:   Wed May 29 18:59:37 2013 +0200

    Camera: Update Polish translation

    Change-Id: I901738a9ced063de2cc1a5b51e2d86f1f1ce59cc

commit 7973d2e40486874da70b79a5221043a1814be2ce
Merge: aa4ae80 4633438
Author: Danny Baumann <dannybaumann@web.de>
Date:   Thu Jun 6 05:30:03 2013 -0700

    Merge "Camera: Update German translation" into cm-10.1

commit 4633438cced863b8c6f12f846e1a88b6055e1586
Author: jackmu95 <jacob.mueller.elz@gmail.com>
Date:   Tue Jun 4 17:33:18 2013 +0200

    Camera: Update German translation

    Change-Id: I36acd2f7c107c79c0b43b13fa8f97ddab1adc126

commit aa4ae80a41fbab763891c5ef6d67a9e5b4bb981b
Author: Danny Baumann <dannybaumann@web.de>
Date:   Thu Jun 6 11:05:48 2013 +0200

    Don't mess around with pref local ID for power shutter initialization.

    It confuses the pref initialization, causing the back facing camera resolution
    being overwritten by the front facing camera resolution.
    Instead, make power shutter a global (camera independent) setting.

    JIRA:CYAN-752
    Change-Id: I5b1c89bcb42ed64feb06a8562ee5e468183f30f0

commit 3b7401d90c12eb2768f7e8206282b83ee634274e
Author: Ondrej Zima <keltuv.email@gmail.com>
Date:   Thu Jun 6 00:40:39 2013 +0200

    Camera: CS translation

    - added new Mpx values

    Change-Id: Id15e615adc733bf915ebfe2b1eb4e4edb1eeaea1

commit bfb1a34a3a301b0709107a73b230d47767c5bed2
Author: Andrew Jiang <sam.andrew.jiang@gmail.com>
Date:   Fri May 31 13:02:47 2013 -0400

    Camera: Simplified Chinese Translations

    Added new strings and fixed a typo.

    Patch Set 2: Added some more strings.

    Change-Id: Ieffd215e30053ca9ed73346da28964a80269b1b3

commit fdb2bb70dc3b29271c77842d8f463cff51e2b75f
Author: djMesias <djmesias@yahoo.es>
Date:   Tue Jun 4 17:15:22 2013 +0200

    Camera: ES translations

    Change-Id: I045fc4be69848a2881233d7d09573928c36c49e3

commit 0356b2297562fbfc6c1c517abcb28c60195f2392
Author: Francesco <francescoforesta@email.it>
Date:   Sat Jun 1 10:31:15 2013 +0200

    Camera: Update italian translation

    Change-Id: I5461cc295bd9f6f38ab1e9cf91f86675bb80b909

commit bb2a0de0aedf4ff1501b334449b1b4eec93f7eec
Author: DelPETER <delphinpeter@gmail.com>
Date:   Sun Jun 2 21:12:06 2013 +0200

    Camera : FR translation

    -add missing translation

    Change-Id: I47290a4af81e7e821a49b9108332bbc139f19ee8

commit 0a8bc987b8a3f1fd662f044173ed2337e03bd956
Author: Michael Bestas <mikeioannina@gmail.com>
Date:   Tue Jun 4 01:15:43 2013 +0300

    Add 6mp, 4.5mp, 3.7mp, 2mp, WXGA & WQVGA resolutions

    Used in SEMC 2011 devices

    Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

    Change-Id: I691739020eb32a19b7e46165be73dff4952f2c3e

commit ada55fe18ac754dbeb97b8c5df550eafe0888eed
Merge: d122c5e e0ea464
Author: Daniel Hillenbrand <codeworkx@cyanogenmod.org>
Date:   Mon Jun 3 16:59:18 2013 -0700

    Merge "Add missing resources for MDPI devices" into cm-10.1

commit d122c5e8c2091fdc416e908862fe8958c768b385
Author: Tamas Toth <syman@babulus.hu>
Date:   Sun Jun 2 22:11:38 2013 +0200

    Camera: HU translation update

    Change-Id: I24ac601aa50b40c5761e481555be4742edb6e3ba

commit 409f4a656f3d35f607837ed9f7a2572756103a62
Author: Eddy Witkamp <eddywitkamp@gmail.com>
Date:   Sun Jun 2 14:52:02 2013 +0200

    Camera: NL translation

    added 1.9 Mpixels

    ps2: trigger Cid

    Change-Id: Ic15e7d5fa312b83fc2afeed6b8df7927fb1f8ec8

commit bde756647ae118db3b0317c4f45f1b2fb11dac6d
Merge: 451525c 4e86872
Author: Marco Brohet <therbom@gmail.com>
Date:   Sun Jun 2 02:12:08 2013 -0700

    Merge "Camera: CS translation" into cm-10.1

commit 451525cc9d626ca4e8dc77ea7c71507d31305910
Merge: 254958d 6ca8581
Author: Marco Brohet <therbom@gmail.com>
Date:   Sun Jun 2 02:07:48 2013 -0700

    Merge "Camera : PL translation" into cm-10.1

commit 254958dd80b14b066cb1d71895ef1ca628149525
Author: Eddy Witkamp <eddywitkamp@gmail.com>
Date:   Wed May 29 19:47:36 2013 +0200

    Camera: NL translation

    Add 2.4MP, 6MP, 7MP resolution strings

    PS2: Add 1.9MP

    Change-Id: Id97624e14d4315f14d3c48ddb16eb8802fb437b9

commit 6949f37d2ce276b46c8ef38a7c4a752c16fefbd8
Author: Ondrej Zima <keltuv.email@gmail.com>
Date:   Fri May 31 15:58:22 2013 +0200

    Camera: CS translation - AOSP

    - fixed AOSP strings

    Change-Id: Icb51e7b45fe06811f735c9e7617a7f9927e5b550

commit b2415b87e96816696ce48c0a074e6ad7df425d85
Author: Michael Bestas <mikeioannina@gmail.com>
Date:   Thu May 30 21:58:27 2013 +0300

    Camera: EL translations

    Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

    Change-Id: I42c7cb80216d692f307c7712a3fa61c248d4365c

commit 4e86872784ee1fc300686537da0ddcee1631b1ab
Author: Ondrej Zima <keltuv.email@gmail.com>
Date:   Thu May 30 00:40:25 2013 +0200

    Camera: CS translation

    - added new resolutions
    - fixed too long on/off translation
    - fixed total nonsence about location
    - reverted changes to AOSP strings to use separate commit

    Change-Id: I7939e0e699518b47431f6fd00820c4f50ac8745f

commit 15ddf42557ab8c8e358d9da987a7c9cd181da53a
Merge: 009f5bd 88a2b6d
Author: Danny Baumann <dannybaumann@web.de>
Date:   Wed May 29 23:26:12 2013 -0700

    Merge "Camera: Update German translation" into cm-10.1

commit 009f5bd5e3e4f55592f43f3293c7946a052fcf70
Merge: 1349d53 b58b220
Author: Marco Brohet <therbom@gmail.com>
Date:   Wed May 29 10:45:49 2013 -0700

    Merge "Camera: ES translations" into cm-10.1

commit 88a2b6d1fe1bcfe810e05f7175a35a24685749ad
Author: jackmu95 <jacob.mueller.elz@gmail.com>
Date:   Wed May 29 15:30:55 2013 +0200

    Camera: Update German translation

    Forgot one value in http://review.cyanogenmod.org/#/c/43302/

    Change-Id: I004f2f4d44bc8f0286a8cc212f04748b2c078f84

commit 1349d53d5e9be11639d706b56a30bce26cd97f93
Author: jackmu95 <jacob.mueller.elz@gmail.com>
Date:   Wed May 29 14:48:22 2013 +0200

    Camera: Update German translation

    Change-Id: If9ea824ee8403196be0c8a29f09720f02e6a5a5c

commit 18576930ec322d870507a894fb10b6124fd410b8
Merge: 8b9b909 073208f
Author: Danny Baumann <dannybaumann@web.de>
Date:   Wed May 29 03:54:04 2013 -0700

    Merge "Camera: Wait for camera initialization" into cm-10.1

commit b58b2201c4018b41106695dfc512e79ab1b5b6e9
Author: djMesias <djmesias@yahoo.es>
Date:   Wed May 29 11:34:37 2013 +0200

    Camera: ES translations

    - Add 2.4MP, 6MP & 7MP resolution strings
    - Fix lowercase

    Change-Id: Id936ea34204b783b960f29773bb9feee10e2c7ad

commit 8b9b9090d9405ae7e18bfde4771ed3106415ee7b
Merge: e6b68c8 f75b2f3
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue May 28 22:38:14 2013 -0700

    Merge "camera: Add 2.4MP, 6MP, 7MP resolution strings" into cm-10.1

commit f75b2f3af04e883a5764bc1d4cba46970b9ce53c
Author: detule <ogjoneski@gmail.com>
Date:   Tue May 28 15:54:19 2013 -0400

    camera: Add 2.4MP, 6MP, 7MP resolution strings

    Change-Id: Ic2e4d4ef1345743150d5be1fb9a0f17c909a2ff8

commit e6b68c8f2f07a6f41bbec097b7f48977d78b5f02
Author: jackmu95 <jacob.mueller.elz@gmail.com>
Date:   Sun May 26 21:11:02 2013 +0200

    Camera: Update German translation

    Patch Set 1:   * add missing strings
                   * some cleanup

    Change-Id: I07b0f8ae4deb3b67258595d5046c22933738e657

commit 6ca85813d8656f5e6d945cd67a28b67f62d0f959
Author: DelPETER <delphinpeter@gmail.com>
Date:   Mon May 27 23:21:54 2013 +0200

    Camera : PL translation

    -Remove unused translation

    Change-Id: I593df6c6259b73599e68698d2a913f070c77cbbd

commit e08de93a97717fa32813255ccb4be2f77d088766
Author: Gustavo <gustavo@gustavo.ca>
Date:   Sun May 26 05:53:23 2013 -0700

    Camera: PT-BR update translations

    Change-Id: Iec5a56023faee61660e0b4da5011b1149a27c3e9

commit b79274e9bedd0e957c9e41d41cfc631254740d47
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat May 25 23:52:42 2013 +0200

    Camera: NL translations

    Change-Id: I6176f95b76470a6458a32902e938cc397d5ee876

commit 073208f94af26c15f6efd1606bdcea3bbcd6c7b0
Author: Jorge Ruesga <jorge@ruesga.com>
Date:   Sat May 25 21:46:43 2013 +0200

    Camera: Wait for camera initialization

    Patchset 2: Capture specific exceptions instead of a generic exception

    Change-Id: Id62d0dedc630c3815dca7b101fdbf731154be3ca
    JIRA: CYAN-1190
    Issue: https://jira.cyanogenmod.org/browse/CYAN-1190
    Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

commit c3c16942252ee172f8763d65ac740edd062ee8a4
Merge: 0dad7b9 751f964
Author: Marco Brohet <therbom@gmail.com>
Date:   Thu May 23 15:11:15 2013 -0700

    Merge "Camera : FR translation" into cm-10.1

commit 0dad7b95e1095679066b7b67f609215727192146
Merge: f3188c8 22d083e
Author: Marco Brohet <therbom@gmail.com>
Date:   Thu May 23 15:06:49 2013 -0700

    Merge "Camera: HU translation update" into cm-10.1

commit 22d083e949b8b7cabc11d93fe20e9af84ddac48a
Author: Tamas Toth <syman@babulus.hu>
Date:   Thu May 23 09:03:06 2013 +0200

    Camera: HU translation update

    Change-Id: I4f53183301d9ca5defa65e0660d0756670cc60bf

commit 751f964a93d7ea8c7d675a6d5b4370118504153f
Author: DelPETER <delphinpeter@gmail.com>
Date:   Wed May 22 23:41:53 2013 +0200

    Camera : FR translation

    Add missing translation

    Change-Id: I8fa2967fb7f10f72674edd61d72a2e41eb95ef9b

commit f3188c8581e2d4a1b331e067e6ba5636e1c8ab3c
Merge: a9ef43f 49d57c3
Author: Marco Brohet <therbom@gmail.com>
Date:   Wed May 22 11:57:21 2013 -0700

    Merge "Camera: ES translations" into cm-10.1

commit a9ef43f331d5f719b0b60beac179d7f7f3f36328
Merge: fe83840 621a20f
Author: Danny Baumann <dannybaumann@web.de>
Date:   Wed May 22 05:02:10 2013 -0700

    Merge "Camera: Update timer and voice activation drawables" into cm-10.1

commit 49d57c3b756415df280bf714c7f6c850200cea34
Author: djMesias <djmesias@yahoo.es>
Date:   Wed May 22 00:22:13 2013 +0200

    Camera: ES translations

    - Add 1,9MP
    - Minor correction

    Change-Id: I259e0f0b002c0d363ecfae17193d5d5827e929b9

commit fe83840ff04a8a3d352e4cdc7d3e516c00dd374c
Merge: 7e72eb3 9f9f72a
Author: Marco Brohet <therbom@gmail.com>
Date:   Tue May 21 09:08:26 2013 -0700

    Merge "Camera: CS translation" into cm-10.1

commit 7e72eb365ae02bb246809fbe5043e1d2f32bc84f
Author: Daniel Hillenbrand <codeworkx@cyanogenmod.org>
Date:   Mon May 20 14:16:15 2013 +0200

    camera: add 1392x1392 resolution for galaxys s3 front cams

    Change-Id: I990737403cad61eaaa75b1f958f722c5f017e35c

commit d07bdb1f64bd956451f5c61e330e851153c1052e
Merge: 6765c6c c3a4d74
Author: Marco Brohet <therbom@gmail.com>
Date:   Sun May 19 02:08:48 2013 -0700

    Merge "Camera: ES translation" into cm-10.1

commit 6765c6c4db3a8e7cfdfa53b6d7ae12ddcd8fca06
Merge: c02b20a 8297eec
Author: Marco Brohet <therbom@gmail.com>
Date:   Sun May 19 01:54:54 2013 -0700

    Merge "Camera: DA translation" into cm-10.1

commit 621a20f7e02fbc5de620600d8e385a8234230581
Author: blunden <blunden2@gmail.com>
Date:   Sat May 18 18:29:08 2013 +0200

    Camera: Update timer and voice activation drawables

    Replace drawables with newer version with proper
    size, shadows etc.

    Change-Id: I6c20403a6645463f86ac75190c0be74705cd1554

commit c02b20a175d12ccc1e58bff8253c503367cd23a7
Merge: 09a1c80 ba93485
Author: Daniel Hillenbrand <codeworkx@cyanogenmod.org>
Date:   Sat May 18 06:42:48 2013 -0700

    Merge "Camera: Update exposure drawables to fix various problems" into cm-10.1

commit c3a4d7471f6f411b464011b83c3d6881170cf569
Author: djMesias <djmesias@yahoo.es>
Date:   Sat May 18 09:19:41 2013 +0200

    Camera: ES translation

    PS2: Triggering Cid

    Change-Id: I814fafdd05bbf37785fe556f342276001092b853

commit 8297eecd8f1eec9557635973f55696ef54c708f6
Author: Jacob Overgaard Madsen <u2jacob@gmail.com>
Date:   Tue May 14 19:50:05 2013 +0200

    Camera: DA translation

    From staging branch

    Change-Id: I8828957baa9ce33fe4f672624b614bf18240494e

commit 09a1c8021c2507bc910ac91ef09ff4fe87b7c286
Merge: 330b65b 0cdcaf8
Author: Marco Brohet <therbom@gmail.com>
Date:   Thu May 16 12:26:30 2013 -0700

    Merge "Camera : FR translation" into cm-10.1

commit 330b65b018aff03b2d700045e0d571b193d1d9dd
Merge: 3617422 a47f671
Author: Marco Brohet <therbom@gmail.com>
Date:   Thu May 16 12:26:03 2013 -0700

    Merge "Camera: Update Polish translation" into cm-10.1

commit 3617422249dd631bc525442773a847ad761e0ba6
Author: Tamas Toth <syman@babulus.hu>
Date:   Thu May 16 13:50:26 2013 +0200

    Camera: HU update translation

    PS2: Triggering Cid

    Change-Id: I90b04f472fb2aceaf7158a4ccf05f1a36ddb91ae

commit a47f67186d9ed0df6eeca790a15399568972a41b
Author: Tomasz Popielarczyk <popielarczyktomasz@gmail.com>
Date:   Mon May 13 22:25:17 2013 +0200

    Camera: Update Polish translation

    Change-Id: I02a2aa947868d8202fa8ff6a549fdd9e4066cb1f

commit 9f9f72a18823fc7ec1159743fd3865ce344baaf1
Author: Ondrej Zima <keltuv.email@gmail.com>
Date:   Mon May 13 23:58:45 2013 +0200

    Camera: CS translation

    - added missing Voice
    - fixed long sentence for voice shutter
    - CID: please reexamine

    Change-Id: I734e487be01495845aef57235460b060220762ab

commit 0cdcaf8ba89afa2651fe13a7824a04f17439367c
Author: DelPETER <delphinpeter@gmail.com>
Date:   Tue May 14 14:29:51 2013 +0200

    Camera : FR translation

    Change-Id: I7d9305696c3dad5fc195cfe545b2e2c635511d72

commit ba93485a704063e6ff20a8e09afaada37162ad35
Author: blunden <blunden2@gmail.com>
Date:   Tue May 14 03:21:22 2013 +0200

    Camera: Update exposure drawables to fix various problems

    Updates exposure drawables to new ones more similar to the
    original AOSP drawables. Also makes them visible on light
    backgrounds.

    They were previously changed in change 28836.

    Change-Id: I1c628980e809e48646c7a6a68a546255e2a09b80

commit 3845b5c91bb0fd544432cf42fa9f4c80c58966d3
Merge: 31c9282 d47dfb1
Author: Danny Baumann <dannybaumann@web.de>
Date:   Sun May 12 03:31:57 2013 -0700

    Merge "Update German translation" into cm-10.1

commit d47dfb110bc7769aa40f3842b4bda22a1e28a837
Author: Danny Baumann <dannybaumann@web.de>
Date:   Wed May 8 10:29:58 2013 +0200

    Update German translation

    Change-Id: I881dc44421160979fc1185302aa1b2e0ba3dab35

commit 31c9282f16e102b4d4b22aa592085b859f2de0b0
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Sat May 11 23:39:09 2013 +0200

    Camera: fix preview in panorama mode

    Change-Id: I2fefcf81ec0fc3c3dcfb246c73c405350661dc27

commit 5b8be56bdbedf9c97df8edd3c578e39d368439ad
Merge: fb31e12 2eed061
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat May 11 09:37:54 2013 -0700

    Merge "Camera : FR Translation" into cm-10.1

commit 2eed061d848b7d9ecbb211ecfbe7e81d730fa4f1
Author: DelPETER <delphinpeter@gmail.com>
Date:   Fri May 10 23:29:39 2013 +0200

    Camera : FR Translation

    Patch set 2 : add cm-10.1-staging translation
    Patch set 3 : correction

    Change-Id: I5c38b2bf55c71a5fb1f6cb298cd43b7f36470804

commit fb31e12d8ad40e64d1a8825eaea0b1793926b077
Author: Odin Ugedal <odinuge@gmail.com>
Date:   Thu May 9 21:32:57 2013 +0200

    Camera: NB translation

    PS2: Trying to make Cid happy!

    Commit for staging: http://review.cyanogenmod.org/#/c/37283/

    Change-Id: I135bf8d339c3bb81cd2d0ed9645fea4559af39ed

commit 186b074e2b3eaa9dbcaf7e37f88ba5c744bbb9ec
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu May 9 13:53:41 2013 -0700

    Revert all recent changes to preview orientation handling

     * Will revisit after the release.

    Revert "Camera: Add supportsOrientationResizePreview configuration"

    This reverts commit 1d12cab88c5c1b8ae6bb016f08e95068448cafec.

    Revert "camera: Clean up code for restarting the preview"

    This reverts commit 917a193a4a7736ac7657a6ac7f15a978bfe3732a.

    Revert "camera: Fix hang when changing picture size"

    This reverts commit d1a3d5d99006f274955b444c62c4354b425ac081.

    Revert "Fix preview state machine after it's restarted due to ratio changes"

    This reverts commit 5c40119365eefc1b2d9aef3c0b36cf60c44a33a8.

    Revert "Camera: Fix for stretched preview in front camera"

    This reverts commit b568826506d5555ee04d0a536c4687e34e648eeb.

commit 3bb3e49ea12f7f574af9e758af16a9e14005a5ec
Author: Jorge Ruesga <jorge@ruesga.com>
Date:   Thu May 9 01:55:13 2013 +0200

    Camera: Add supportsOrientationResizePreview configuration

    Current orientation resize preview patch is broken some devices (xe: tf700t). This patch adds
    a new configuration for device that doesn't handle properly the orientation resize preview
    detection.
    Also, the patch adds some styling fixed:
    - Avoice call requestLayout twice
    - Avoid create variables if mOrientationResize is not going to be used

    Change-Id: Ia8ad7a58b9418eedc5edde6b23eb995f5ecfdabd
    Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

commit 14baf529a8f69e72639a36d5593b5203f9c633a6
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu May 9 10:58:59 2013 -0700

    camera: Clean up code for restarting the preview

     * Fix another ZSL hang and remove redundant code.

    Change-Id: I8075829bfc82bc94a8ae8d49234cecc4e3ca1faf

commit 3be9d26095eef9c9ca43341dece0908b8279d73d
Merge: d1a3d5d c0c7bd6
Author: Marco Brohet <therbom@gmail.com>
Date:   Wed May 8 23:59:36 2013 -0700

    Merge "Camera: Add Missing AF translations & do some cleanup" into cm-10.1

commit d1a3d5d99006f274955b444c62c4354b425ac081
Author: Steve Kondik <shade@chemlab.org>
Date:   Wed May 8 11:35:20 2013 -0700

    camera: Fix hang when changing picture size

    Change-Id: I46d060d470b96be56d84f273accf54702e72b321

commit c0c7bd6f2a97e62aca0263cf5d58c792056cdf1d
Author: isimobile <isimobile@ismaakit.com>
Date:   Sat May 4 12:43:47 2013 +0200

    Camera: Add Missing AF translations & do some cleanup

    Change-Id: Ie83478460d1dab00beefeccff63d07bc05fab212

commit c6745b0554f23aa56d6f42b05a222234fb23a97a
Merge: 1eb28fa 6fe8974
Author: Marco Brohet <therbom@gmail.com>
Date:   Mon May 6 02:43:48 2013 -0700

    Merge "Camera: DA translation" into cm-10.1

commit 1eb28fa06d615c9fdf4a73b8e15fce010350f2e1
Merge: 7c13b47 c26cd7b
Author: Marco Brohet <therbom@gmail.com>
Date:   Mon May 6 02:43:27 2013 -0700

    Merge "Camera: CS translation" into cm-10.1

commit 7c13b4728ac7fa95f49d174a051527c7af5d0fb0
Merge: a5d2849 dbab0ba
Author: Marco Brohet <therbom@gmail.com>
Date:   Mon May 6 02:40:46 2013 -0700

    Merge "Camera : refactor translation" into cm-10.1

commit a5d2849ef7623a94145f8e143e72189dda80e900
Author: Gary Mathews <gary.mathews.93@gmail.com>
Date:   Sat May 4 23:05:07 2013 +0100

    camera: Fix camera storage location

    Patch Set #1 - Updated 'ActivityBase.java' to use 'startStateNow', this updates the gallery storage location.
    Patch Set #2 - Removed random character (dont know how that got there...)
    Patch Set #3 - Fixed storage location not being set correctly on first load
    Patch Set #4 - Fixed 'NullException' for 'mCameraScreenNail'

    NOTE : This NEEDS http://review.cyanogenmod.org/#/c/29154/ to be re-merged.

    Change-Id: Ia7a703a7fca8074075e98380c4ca0711a9a1ad4f

commit dbab0ba4e82cc4ff2cfe00072924ee8230b3afd9
Author: DelPETER <delphinpeter@gmail.com>
Date:   Sun May 5 00:45:56 2013 +0200

    Camera : refactor translation

    All others translators are in progress

    Patch set 3 : Cid checking

    Change-Id: Idecb505880a46a7b70986b64b31b1e21f0532210

commit 36d24d9973a571eb7fd7d139cd0815dc0c4aadf8
Merge: c858b8a d444a87
Author: Marco Brohet <therbom@gmail.com>
Date:   Sun May 5 03:21:44 2013 -0700

    Merge "Camera: NB translation" into cm-10.1

commit c858b8ac84be68935abce4d7bbe41dcf3e93c76c
Merge: ccbb653 0d971be
Author: Marco Brohet <therbom@gmail.com>
Date:   Sun May 5 03:15:30 2013 -0700

    Merge "Camera: fix NL AOSP translation" into cm-10.1

commit ccbb653112f65bda1cc93caad1318983e5736721
Merge: 5c40119 31ae28b
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat May 4 15:54:50 2013 -0700

    Merge "Camera: NL translation" into cm-10.1

commit 5c40119365eefc1b2d9aef3c0b36cf60c44a33a8
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Sat May 4 23:06:22 2013 +0100

    Fix preview state machine after it's restarted due to ratio changes

    The camera state was being set to PREVIEW_STOPPED by the restart,
    and the lack of a completion message was leaving it in that state,
    breaking other checks down the line (changing scene/balance modes,
    for instance, failed miserably)

    Change-Id: Ia5bc6b1aab5ee85582c4c4c3d09646892e669454

commit 31ae28b466667f1e670fc57587029c4ee12721e9
Author: Eddy Witkamp <eddywitkamp@gmail.com>
Date:   Thu May 2 01:22:08 2013 +0200

    Camera: NL translation

    -translation for Merge voice and timer options into a single 'no-hands shutter' option

    Change-Id: Ied06a6a03344f097936c20720648e1c45bbfec7e

commit b568826506d5555ee04d0a536c4687e34e648eeb
Author: Shwetha Kotekar <skotekar@codeaurora.org>
Date:   Fri Jan 25 00:20:03 2013 -0800

    Camera: Fix for stretched preview in front camera

    Stretched preview is observed due to front camera's mount angle.
    This patch resizes preview frame using aspect ratios so preview is not
    stretched when using the front camera in still and camcorder mode.

    Change-Id: I70b5534dd3020bdf46afdfdcefc39d89a2b2e450
    CRs-fixed: 435942

    Camera: Fixes stretched preview in camera application

    - The preview screen nail is getting set with the
      preview frame layout size, which depending on the
      preview resolution might lead to aspect ratio
      mismatches.

    Change-Id: Ifdc436feffefa4ad95d3915f48724b0fc3684d9d

    Camera: Updates preview screen nail correctly

    - Querying the width and height of the screen nail
      currently will return the render width and height
      which in turn depend on the preview frame layout
      size. In cases where both sizes match the screen
      nail will not get updated properly. Instead of
      using the render width and height this change
      uses the actual size of the nail itself.
      This way changes to the resolutions are
      recognized properly and the nail is updated.
    - This patch also removes 'updateCameraScreenNailSize()'
      and extends the functionality of 'startPreview()'
      in order to update the screen nail for the cases
      where the preview and the nail size don't match.

    Change-Id: Ib99f47f4094e01724725098847f42197b4442c03

commit 84d5ab5bc8ee42acc0fbb3fdfd83a8b16f84d2c1
Merge: 7265837 9466393
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat May 4 03:26:49 2013 -0700

    Merge "camera: Add support for ZSL on new Samsung devices" into cm-10.1

commit 72658377f015dad8972c793854d3f4e1dca55097
Merge: 32707b5 da78fb4
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat May 4 03:25:14 2013 -0700

    Merge "camera: Fix parameter dumping" into cm-10.1

commit 9466393eee8abe82ec1ceee4e13e48ef8f0222f5
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat May 4 03:17:08 2013 -0700

    camera: Add support for ZSL on new Samsung devices

     * The camera driver on new Samsung devices requires that we send a
       magic command to the hardware in order to get ZSL behavior with
       continuous preview. On previous devices, this worked as long as the
       "cam_mode" parameter was zero (instead of null) and "camera-mode" is
       set to 1. On JF, we need to do all of these things.
     * The command we need to send is 1508, but I do not know what this
       value actually corresponds to. It was discovered by reverse
       engineering.

    Change-Id: I6bccc9cd228784045eef81719892121749af4fa5

commit 32707b539f5d6692d54ddc23317e90f6ceaecec3
Merge: 0bf8a58 89096e3
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat May 4 01:23:01 2013 -0700

    Merge "Camera: Simplified Chinese Translations" into cm-10.1

commit 0bf8a5827d8966c7d307353f82cb9888c1c6db0f
Merge: 595f849 7551525
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat May 4 01:18:54 2013 -0700

    Merge "Camera: RU translation" into cm-10.1

commit da78fb4fd0790d8a2ffc6951d18b1964b3394524
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat May 4 00:07:38 2013 -0700

    camera: Fix parameter dumping

     * Chop up the logging so we don't create a line that's too long

    Change-Id: I59e60de584d2b5007c6a7777d5e2427af275ec01

commit 0d971be91257412ba64fc3886323b997a63b1f0a
Author: Eddy Witkamp <eddywitkamp@gmail.com>
Date:   Fri May 3 22:11:41 2013 +0200

    Camera: fix NL AOSP translation

    Change-Id: I3ac4b7f6d222ada43d57f20bc347a982a23e4a44

commit d444a875035bd560cec671cc163fb40c40859ad0
Author: Odin Ugedal <odinuge@gmail.com>
Date:   Fri May 3 14:11:18 2013 +0200

    Camera: NB translation

    Added the new strings for the Hands-free shutter.
    I also did other minor changes.

    Change-Id: I41fa958c0dbedfdb531922283c353c7bbd390d55

commit c26cd7b0084f885a29d0db6d40105c6ad88daf3f
Author: Ondrej Zima <keltuv.email@gmail.com>
Date:   Mon Apr 29 21:22:20 2013 +0200

    Camera: CS translation

    - reorganized strings for new CM layout
    - added missing strings for hands-free shutter
    - fixed typo

    Change-Id: I812e1ec0cca3cd3a858b36d27005ae2bb36667b9

commit 595f8491765b7f00e67a6c996df7de30ddfd9e3b
Merge: d84bfeb 2067225
Author: Marco Brohet <therbom@gmail.com>
Date:   Thu May 2 12:09:56 2013 -0700

    Merge "Camera: Update italian translation" into cm-10.1

commit d84bfebe5c4f886122a1419c19feccc70eeb1c31
Author: XpLoDWilD <xplodgui@gmail.com>
Date:   Wed May 1 22:34:12 2013 +0000

    Camera: HDR: Read parameters for hardware HDR support

    On mako (and soon find5), HDR mode is a scene-mode. Software HDR
    uses Util.isCameraHdrSupported to check whether or not hardware
    already supports it, which should also set software HDR flag.
    However, this method is not called soon enough to set this flag
    on time, so we call it before checking for software HDR status.

    Change-Id: I24375f290d6c2cde782c43373a07e78ba5d806ff

commit 20672250c43557b02dd3e2f8e75980ce63883256
Author: Francesco <francescoforesta@email.it>
Date:   Wed May 1 23:17:45 2013 +0200

    Camera: Update italian translation

    Change-Id: I57bbd1d08f323387265f12e21401b8f058d1aab9

commit 10cadf81f7bb1f2781c6e4fd2c31a05ca0bedefc
Merge: 72d8a09 5206390
Author: Marco Brohet <therbom@gmail.com>
Date:   Tue Apr 30 15:29:03 2013 -0700

    Merge "Camera: AF translation" into cm-10.1

commit 72d8a099a2cb144035bd7100a329c13707822f46
Merge: 3a4ab87 dc97633
Author: Marco Brohet <therbom@gmail.com>
Date:   Tue Apr 30 15:20:50 2013 -0700

    Merge "Camera: Update italian translation" into cm-10.1

commit 3a4ab873c3cec846efabcfe47716ab59b74de5d5
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Tue Apr 30 02:25:48 2013 +0100

    Fix NPE in SecureCameraActivity init

    Change-Id: I2632d7baff0e08c0533157b149972466cedb679b

commit 6fe8974d8fbda1470f32814c9f48008ebb57639a
Author: Jacob Overgaard Madsen <u2jacob@gmail.com>
Date:   Mon Apr 29 22:57:46 2013 +0200

    Camera: DA translation

    Latest merge: handsfree shutter

    Change-Id: Iad1d7ada2cecd0928e534beac61ae8c6ae01e500

commit 732d910de81b15dc8a76a05193de2d06382c0cfe
Merge: ea77c7d a395455
Author: Marco Brohet <therbom@gmail.com>
Date:   Mon Apr 29 11:59:09 2013 -0700

    Merge "Camera: HU translations update" into cm-10.1

commit a39545591c96373249375ae024e8beb5078144c4
Author: Tamás Tóth <syman@babulus.hu>
Date:   Mon Apr 29 12:41:05 2013 +0200

    Camera: HU translations update

    Change-Id: Ib77f408b541953b3d3948bc239eb7a06b7d344d5

commit ea77c7d3306a8d9e65ca963a3989170aa2502e1f
Author: Marco Brohet <therbom@gmail.com>
Date:   Mon Apr 29 13:01:35 2013 +0200

    Camera: Set untranslatable

    Change-Id: I37fcb36534b73dfb163affb1e81c165808b6d6ec

commit 70c611b895a89699ad91cecae91b222ee8a25341
Merge: 727a741 3b2a7b7
Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Apr 29 00:31:03 2013 -0700

    Merge "Camera: PT-BR update translations" into cm-10.1

commit 89096e38b9548c67e087b2352d493417b8b7cc05
Author: Andrew Jiang <sam.andrew.jiang@gmail.com>
Date:   Sun Apr 28 17:42:07 2013 -0400

    Camera: Simplified Chinese Translations

    Added translations for voice shutter and timer mode.

    Change-Id: I4b8cffcb02daf117f496ec5d5ad388cc33b19d43

commit 3b2a7b7e29b27dc17ea62613659af12418f25260
Author: Gustavo <gustavo@gustavo.ca>
Date:   Sun Apr 28 00:32:33 2013 -0700

    Camera: PT-BR update translations

    Change-Id: I3a7758300ba29020e0aa3bf36f59f0cd4812747a

commit 727a74193d1014547877c1b2401d360c2c06c8fc
Merge: 7359e29 a5609ed
Author: Marco Brohet <therbom@gmail.com>
Date:   Sun Apr 28 00:57:02 2013 -0700

    Merge "Camera: Update Polish translation" into cm-10.1

commit 7359e298e3ac503ae97bdabdd146986bfbcdeddd
Merge: 2c07944 ffe0919
Author: Marco Brohet <therbom@gmail.com>
Date:   Sun Apr 28 00:55:07 2013 -0700

    Merge "Camera: ES translations" into cm-10.1

commit 75515253dc8cb945e078b87dcd03f2fc482d82ef
Author: pvolkov <marshmollow@gmail.com>
Date:   Sat Apr 27 10:53:09 2013 +0400

    Camera: RU translation

    Patch Set 2: Update translation

    Patch Set 3: Update translation

commit 2c0794433605ef1a513d1fbcc2080bdee1f4fbd2
Author: sbrissen <sbrissen@hotmail.com>
Date:   Wed Apr 24 13:01:40 2013 -0400

    Fix pinch to zoom for some devices

    This fixes the pinch to zoom for t0lte devices and possible others

    credit goes to erishasnobatter

    Change-Id: Id386da2036d68997f45dd789c7bd152fe9b00bac

commit a5609ed4165d1b2a3d3ebab55d798dbdf15e2222
Author: Tomasz Popielarczyk <popielarczyktomasz@gmail.com>
Date:   Sat Apr 27 12:38:54 2013 +0200

    Camera: Update Polish translation

    PS2: Fixed minor bug
    PS3: Another fixes

    Change-Id: I94b5c133864d1d84e13814ea048534c1df4e749a

commit 520639034b9219075a6ece4ca3f4a879192a1790
Author: isimobile <isimobile@ismaakit.com>
Date:   Sun Apr 14 19:40:53 2013 +0200

    Camera: AF translation

    Change-Id: I742867175f9f0abe480cba313c86096b6cc29878

commit dc97633baa7a78a5959130a8396e5a4faaefbdac
Author: Francesco <francescoforesta@email.it>
Date:   Sat Apr 27 13:55:28 2013 +0200

    Camera: Update italian translation

    Change-Id: I5e13c7c17eae0c9f12ac96a7ed73954f600720a3

commit e6308d9cc43180a17d6de2ac3bec0d24506fe68e
Merge: 8f9e293 6daff5e
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat Apr 27 04:34:33 2013 -0700

    Merge "Camera: Norwegian translation" into cm-10.1

commit ffe09194f8830f168d9ae4717dd4e78db2225a63
Author: djMesias <djmesias@terra.es>
Date:   Sat Apr 27 11:01:04 2013 +0200

    Camera: ES translations

    - No-hands shutter
    - Reorganize strings

    Change-Id: I66239c2d7bc0d8b45c692a2b7113bd093415870e

commit 8f9e293f419a5060fa35e71f74f643ccaf433579
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Fri Apr 19 15:16:27 2013 +0100

    Merge voice and timer options into a single "no-hands shutter" option

    ... and add a first-use hint to VS listing the hotwords

    Usage of handsfree modes can be made continuous by flipping a switch
    in the settings pane. The default behavior is to reset the shutter
    mode to normal after a picture is taken

    Change-Id: I271c7ba71f320e19be5d1a6a8d98dafeb4b8385a

commit 23c70affe4a362d7224f852aafc66b8b4b05e9ba
Author: Danesh Mondegarian <daneshm90@gmail.com>
Date:   Tue May 1 15:10:12 2012 -0400

    Camera : Timer Snapshot

    Allow user to take a snapshot after a certain amount of time.
    Credits : Michael Simon for the base port
    	  David Van Tonder for indicator icon

    Change-Id: Ic50bf1c1f7fd85d8c48dac3e51766aeff2b381ea

commit c24b725ab48005352b971d0b69c6dd9c841fe62f
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Sun Apr 7 20:09:13 2013 +0100

    Voice Shutter: Voice triggered snapshots

    If one of the pre-specified hotwords is detected, fire the shutter
    and take a picture

    Change-Id: I8fc716c836728f82fd69741a6c1c7864d86934c4

commit 6daff5e47f9d4543a00aa7af4d96d83a76796e59
Author: Odin Ugedal <odinuge@gmail.com>
Date:   Fri Apr 26 17:11:06 2013 +0200

    Camera: Norwegian translation

    Patch Set 2:
        - Pastel-->Pastell(From inline comment)
    Change-Id: Iff099d9c8b6e83f1245bdf6d83de1ef66dc1ea8e

commit 7f5a54bb56969cd68d533a966a144d2c6117edad
Author: Odin Ugedal <odinuge@gmail.com>
Date:   Fri Apr 26 17:32:53 2013 +0200

    Fixed wrong copyright owner in license

    Removed 'AOSP 2007' as copyright owner from some cm strings.
    Added '2012-2013 The CyanogenMod Project' instead.

    Change-Id: Idf5acbd468f292744cc5d933b1ad3e8bd2703064

commit 31e6caecfc818fbbfa89fa44a82416fbdbab37ad
Merge: aa6ffaa 0904ed6
Author: Marco Brohet <therbom@gmail.com>
Date:   Wed Apr 24 11:11:10 2013 -0700

    Merge "Camera: NL translations" into cm-10.1

commit aa6ffaa67ca0bf31035b7721707c952dbb01f920
Merge: ae7aad8 d49bee2
Author: Marco Brohet <therbom@gmail.com>
Date:   Wed Apr 24 11:02:36 2013 -0700

    Merge "Camera: RU translation + reorganization" into cm-10.1

commit ae7aad88673c77585ad51279e265cc61bbfcfe7d
Merge: f30d773 48ed6d0
Author: Marco Brohet <therbom@gmail.com>
Date:   Wed Apr 24 10:38:27 2013 -0700

    Merge "Camera: EL translations" into cm-10.1

commit 0904ed6300fd563ea2b31571c729893d854a05fe
Author: Marco Brohet <therbom@gmail.com>
Date:   Sun Apr 21 16:58:36 2013 +0200

    Camera: NL translations

    Change-Id: I182ccd0065779254c86e7a9d1de69f7f43a79b20

commit f30d773c66d07acd997f22d159087ab7eec4ed28
Merge: 461a152 c79bf92
Author: Marco Brohet <therbom@gmail.com>
Date:   Tue Apr 23 11:20:38 2013 -0700

    Merge "Camera: PT-BR update translations" into cm-10.1

commit 461a152e70eede57c7e67fa52a8dc4018beb8bf4
Merge: ee7588a b5cbd5b
Author: Marco Brohet <therbom@gmail.com>
Date:   Tue Apr 23 04:14:59 2013 -0700

    Merge "Camera: Refactor AF translations" into cm-10.1

commit 48ed6d0668a06231241eb5bf9463e003cb02d3d7
Author: Michael Bestas <mikeioannina@gmail.com>
Date:   Mon Apr 22 14:12:34 2013 +0300

    Camera: EL translations

    Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

    Change-Id: I9ee8064f91d03a89adcc271fadfc626c5df8568c

commit ee7588a9856a124e82f6890faf3731c5d7b9fa5b
Author: Jacob Overgaard Madsen <u2jacob@gmail.com>
Date:   Sun Apr 21 20:10:04 2013 +0200

    Camera Danish translation: transition to cm_ format

    Change-Id: Icac664b4acbf85808df84f2e15ff14df02316014

commit 0e4d76183dc69daca0626e946de868f87e1fe227
Author: Marco Brohet <therbom@gmail.com>
Date:   Sun Apr 14 18:54:15 2013 +0200

    Camera: Refactor default translations

    Change-Id: I464e4a4833e29afe00873dca6b2cd3986342f8c9

commit d6d6e4080110daed35c8abf6e7888c4a27928991
Author: Tobias Breitwieser <tobias.breitwieser@gmail.com>
Date:   Wed Apr 17 12:36:42 2013 -0700

    Camera: fix pinch to zoom for some devices

    Change-Id: I421f29e120de640ed47543df689a680aa2d6b7bf

commit 87f1d013ed6ff582804d825ce46b7d3e3a845e08
Merge: ded9c61 de2a7cb
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat Apr 20 12:39:59 2013 -0700

    Merge "Camera: Update italian translation" into cm-10.1

commit ded9c61fc9ac502c12cbe5c08c457783518aa9e1
Merge: 9aca6a3 e39fd3a
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat Apr 20 05:39:21 2013 -0700

    Merge "Camera: EL translations" into cm-10.1

commit d49bee219977c4883e813041e95337fb03e7f7f9
Author: pvolkov <marshmollow@gmail.com>
Date:   Sat Apr 20 16:26:55 2013 +0400

    Camera: RU translation + reorganization

commit 9aca6a37daf996babaf97e4805812649ffc377e2
Merge: 3748afe 8c936e1
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat Apr 20 04:35:51 2013 -0700

    Merge "Camera : Fr translation" into cm-10.1

commit c79bf92ad6d3a841e564a6828d92c6f50c87cb52
Author: Gustavo <gustavo@gustavo.ca>
Date:   Sat Apr 20 03:57:18 2013 -0700

    Camera: PT-BR update translations

    Change-Id: I4652be9cecf76983e3428ea5bf7d8c0cdce58e4e

commit de2a7cbe95ba8a5af94f0cb785ab8455728ade96
Author: Francesco <francescoforesta@email.it>
Date:   Sat Apr 20 10:09:10 2013 +0200

    Camera: Update italian translation

    Change-Id: I7a092aced6153888c8a24e8deb6447917eb97020

commit 3748afe0548ee3c2031cf9bafda1c6a8725cfd9e
Merge: 6bd0c79 5b8ce98
Author: Danny Baumann <dannybaumann@web.de>
Date:   Fri Apr 19 00:19:00 2013 -0700

    Merge "Camera: ES translations" into cm-10.1

commit 6bd0c79654f40aa6de319c4dff8e99b052be1e07
Author: Andrew Jiang <sam.andrew.jiang@gmail.com>
Date:   Tue Apr 16 17:08:14 2013 -0400

    Camera: Simplified Chinese Translations

    Updated translations, moved all CM translations to cm_strings.xml, and
    deleted all comments as per the new translation policy.

    Patch Set 2: Added 12.8MP translation.

    Patch Set 3: Added 4MP translations.

    Change-Id: I967269c5da2357ed86ea81d04f54532303e0dbdb

commit 5ef42ba717b7fe1082233e94e7fed10efccb0f00
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Thu Apr 18 22:44:48 2013 +0100

    Add an option to maintain the focus mode when using touch-to-focus

    There's at least one family of camera HALs that gets "confused" when
    the focus mode forcefully changes to auto after setting focus /
    exposure area options.

    Sticking with the current focus mode still results in effective use
    of the focus region, so don't force a switch to auto. The default
    behavior remains the original, this needs to be explicitly enabled
    on affected devices

    Change-Id: Icdb1eb628f5ae4432bf03a64b38bbf054ba005a0

commit e39fd3acd9b99e016cf7617d27de0858e9e4fb0f
Author: Michael Bestas <mikeioannina@gmail.com>
Date:   Thu Apr 18 16:35:39 2013 +0300

    Camera: EL translations

    Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

    Change-Id: If36360610fb252801132887e7e80ecd91d1d413e

commit 5b8ce98a43645e3b92d22c2469b4eee4e590febe
Author: djMesias <djmesias@terra.es>
Date:   Thu Apr 18 12:27:39 2013 +0200

    Camera: ES translations

    - New ISO modes
    - 12.8MP support

    Change-Id: I25bcc99be61fd55c3bafbc24b68979b6273f2c4d

commit df2774c78726aa1f5e0e776f557d526bc0b528f9
Author: Tamás Tóth <syman@babulus.hu>
Date:   Thu Apr 18 11:49:38 2013 +0200

    Added hungarian translation

    Change-Id: If38da39cfecd6e46d39196cf985c9d6460a9d152

commit b8da7f1b62408fa540dfd747f468969df2c0089b
Merge: efabce4 67ff567
Author: Danny Baumann <dannybaumann@web.de>
Date:   Thu Apr 18 00:41:34 2013 -0700

    Merge "Camera: latest merges" into cm-10.1

commit efabce43b1bc77decb6d026f9e431c89b3972972
Merge: e293e72 64d51cc
Author: Danny Baumann <dannybaumann@web.de>
Date:   Thu Apr 18 00:40:55 2013 -0700

    Merge "Camera: Update Polish Translation" into cm-10.1

commit e293e729d8dfa7a77d214cc70ab492e7a990af81
Merge: 085c678 af13c1b
Author: Danny Baumann <dannybaumann@web.de>
Date:   Thu Apr 18 00:33:46 2013 -0700

    Merge "Camera: Update italian translation" into cm-10.1

commit 085c67884e86c91a2e8a40f466dc02479ece5b8d
Merge: 418e2c2 93e0a61
Author: Danny Baumann <dannybaumann@web.de>
Date:   Thu Apr 18 00:32:29 2013 -0700

    Merge "Camera: Reorganize Hungarian translations" into cm-10.1

commit 8c936e1208a7264a615b166d654e1bc12ed50fa2
Author: DelPETER <delphinpeter@gmail.com>
Date:   Sat Apr 13 18:57:59 2013 +0200

    Camera : Fr translation

    Patch set 1 : add translation and split custom/AOSP strings
    Patch set 2 : rebase, add 1 line

    Change-Id: Ic9a4c26bdf66b0450a1a5bb7243316f44f59a52b

commit 418e2c2208c43a6ef94fe604158e36e5bf1cc2e9
Merge: 3d3cdfa 675f96f
Author: Daniel Hillenbrand <codeworkx@cyanogenmod.org>
Date:   Wed Apr 17 14:02:33 2013 -0700

    Merge "camera: german translations for resolutions" into cm-10.1

commit 675f96fd893589e2c3ad6ebcf54926be573b6569
Author: Daniel Hillenbrand <codeworkx@cyanogenmod.org>
Date:   Wed Apr 17 22:52:21 2013 +0200

    camera: german translations for resolutions

    Change-Id: I4472c630a6743b27a105b5c627c11a335f61bd76

commit 3d3cdfa8e80acdc859f6181f72b3541de1b82c1a
Merge: 2bb0437 3653359
Author: Daniel Hillenbrand <codeworkx@cyanogenmod.org>
Date:   Wed Apr 17 13:50:09 2013 -0700

    Merge "Add support for 12.8 MP resolution in Camera" into cm-10.1

commit 93e0a619f4c8d78a9725b69ab6644760ae8f652d
Author: Tamás Tóth <syman@babulus.hu>
Date:   Wed Apr 17 10:18:58 2013 +0200

    Camera: Reorganize Hungarian translations

    PS1: added missing translations
    PS2: reorganizing
    PS3: added missing translations (storage selection)
    PS4: correcting copyright
    PS5: correcting copyright

    Change-Id: I20eed1bfc7a8cd64ef8c7aa8ab025021a9d48891

commit 2bb04373fab181d0298f7773d2e6ea39674d7df6
Author: Steve Kondik <shade@chemlab.org>
Date:   Wed Apr 17 02:35:26 2013 -0700

    camera: Fix several issues with storage configuration

     * Undo startStateNow from original patch, it isn't necessary.
     * Remove use of custom preference type and simplify.
     * Fixes: pref not saved, goofy orientation bug, back button flow.

    Change-Id: Ie2fb77e83360bbd07e44e16a31c2a9b14d590e88

commit 286617346e36a72502e76f22919b07d70b7dab55
Merge: b695970 f745fb6
Author: Marco Brohet <therbom@gmail.com>
Date:   Tue Apr 16 15:50:09 2013 -0700

    Merge "Camera: CS translations" into cm-10.1

commit b695970a1f7e72d1f8bf7aa5ff96d780bcb9b328
Merge: 158b9c8 017368f
Author: Marco Brohet <therbom@gmail.com>
Date:   Tue Apr 16 15:33:18 2013 -0700

    Merge "PT-BR: Update translation" into cm-10.1

commit 158b9c856c46f27650ff9c22ddf5f4a3a020d0f4
Author: Pawit Pornkitprasan <p.pawit@gmail.com>
Date:   Tue Apr 16 12:44:01 2013 +0700

    Camera: fix crash from storage selection patch

    Storage selection moves patch resuseNail down further than preview
    start, which causes a race condition and the Camera will crash if
    preview is started before nail is created.

    I'm not sure why it was moved down.

    Change-Id: I2f747d8fa9e00ac0d0869bb19a32620294ef21b4

commit 67ff5670208baf89982c19b058a6cd80b9917eb4
Author: Jacob Overgaard Madsen <u2jacob@gmail.com>
Date:   Mon Apr 15 20:27:48 2013 +0200

    Camera: latest merges

    Change-Id: I3af28535108ab24c7a038105c7df15839fb31c9d

commit 3653359c8ffbc1edc4dd66591bbdef820c572850
Author: Hendrik Borghorst <hendrikborghorst@gmail.com>
Date:   Mon Apr 15 11:11:46 2013 +0200

    Add support for 12.8 MP resolution in Camera

    This patch adds support for the 12.8MP (4128x3096) resolution of Sony Exmor RS sensor.

    Change-Id: Ic7009d9a0ba058b587b0a373789c6de339261e1a

commit f745fb6507dec7a6c71aeb067c30fc3f75e74ff1
Author: Ondrej Zima <keltuv.email@gmail.com>
Date:   Mon Apr 15 16:22:08 2013 +0200

    Camera: CS translations

    added missing strings, merge from CM7/CM10, reordered according new
    rules

    Change-Id: Ic1aee4e58a7078aa818b394374ed083773c17fdf

commit af13c1bc15d114161d23f8370d92103838700bca
Author: rheeze <mauro.bazzano@gmail.com>
Date:   Sun Apr 14 20:30:01 2013 +0200

    Camera: Update italian translation

    	Add storage selection strings

    Change-Id: I571c3ad16c0db705a95838c853f7172f5e4a066d

commit b5cbd5bb5f8d935d4117aa7785f892dd4c508c4d
Author: DvTonder <david.vantonder@gmail.com>
Date:   Sun Apr 14 08:31:11 2013 -0400

    Camera: Refactor AF translations

    Change-Id: I0c4c45e99e13b76c0656bd26e150b77fb990aba0

commit 017368f62d294a76acd2926a16c9a7567a29b3ff
Author: Gustavo <gustavo@gustavo.ca>
Date:   Sat Apr 13 08:33:12 2013 -0700

    PT-BR: Update translation

    Change-Id: Ic6207b0574b7d5cdea2bee09c7c461e1f5d6b625

commit f279bbac1afe437e9c8798e7b5104f37559efc04
Author: djMesias <djmesias@terra.es>
Date:   Sat Apr 13 23:32:41 2013 +0200

    Camera: ES translations

    - Storage
    - Move CM Additions to new file

    Change-Id: I997e982a0fe5e3b1de2299830635c01b5d467140

commit 64d51ccd173da0bc7732ad779621dae7b34b6c55
Author: tompopielarczyk <popielarczyktomasz@gmail.com>
Date:   Sat Apr 13 22:24:11 2013 +0200

    Camera: Update Polish Translation

    Change-Id: I1ee8bf55dfc9e7690bb8be5d287d420a4d864994

commit f1fe6599bc4baa98fc2665b4164e0ec3675bf271
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Apr 13 05:36:17 2013 -0700

    Remove dead code

    Change-Id: I3e387acda9b519252e545ae10778312ef3d86500

commit 9284adf9567154f4fdedde5a1a1ea79dfd68088f
Merge: 5b84d5e d050f80
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Apr 13 05:33:06 2013 -0700

    Merge "Add storage selection (1/2)" into cm-10.1

commit 5b84d5ed36125323ba951503774114de165bbe65
Author: Daniel Hillenbrand <codeworkx@cyanogenmod.org>
Date:   Sat Apr 13 12:42:45 2013 +0000

    Camera: german translations for picturesize entries

    Change-Id: Ibb8584f7f89684080860a1acd0aef96c8a4fc459

commit d050f806d17b0f04ca090247f0be1cf7524abbdf
Author: Gary <gary.mathews.93@gmail.com>
Date:   Wed Dec 26 09:15:46 2012 -0800

    Add storage selection (1/2)

    Patch Set 2 : Cleaned a few very minor things up.

    Patch Set 3 : Fixed indentation.

    Patch Set 4 : Changed how 'sStorage' is accessed, it is now a private static member.

    Patch Set 5/6 : Fixed indentation. (yet again...)

    Patch Set 7 : Refactor and cleanup (cyanogen)

    Change-Id: I3a86a4698d07cede8f93f5fbd8f92b9464d82b90

commit f9c4705a0aca02b3948b7037ad4f1e0e3b3aa146
Merge: 678a03a b97ffd1
Author: Marco Brohet <therbom@gmail.com>
Date:   Fri Apr 12 14:17:55 2013 -0700

    Merge "Camera : add french translation" into cm-10.1

commit 678a03a444e40af74c9ef8f6ba562f1776b12f28
Merge: 3d02c95 ee1ba79
Author: Marco Brohet <therbom@gmail.com>
Date:   Fri Apr 12 14:16:00 2013 -0700

    Merge "Update Russian Translation-Camera-CM10.1" into cm-10.1

commit 3d02c956740e2101450daed6b50469687a405948
Merge: 558cdc8 2311183
Author: Marco Brohet <therbom@gmail.com>
Date:   Fri Apr 12 14:14:09 2013 -0700

    Merge "Camera: Update italian translation" into cm-10.1

commit 558cdc8515750668c5633a804c3f19186de8eb8c
Merge: 0eda837 8f13912
Author: Marco Brohet <therbom@gmail.com>
Date:   Fri Apr 12 13:54:12 2013 -0700

    Merge "es_ES: Add spanish translations" into cm-10.1

commit 0eda837724e8a9bc1b86df419be10a93162bdfd8
Author: Gustavo <gustavo@gustavo.ca>
Date:   Mon Apr 8 18:40:51 2013 -0700

    PT-BR: Update translation

    Change-Id: I89aeb20afcde0b0ff92b1f8ab54b44b1a319515e

commit 2311183b96a42838cf4a4f46be66f84dd68b3992
Author: rheeze <mauro.bazzano@gmail.com>
Date:   Mon Apr 8 22:47:05 2013 +0200

    Camera: Update italian translation

    	Add a few missing resolutions
            Patchset 2: small corrections

    Change-Id: Ice872288d6247dbb01c26b02b7037dd17ed5c64c

commit f2579757a8b3ced3c96e8a62957ef3a99c517bcc
Author: Michael Bestas <mikeioannina@gmail.com>
Date:   Mon Apr 8 16:49:38 2013 +0300

    Camera: Reorganize Greek translations

    Revert AOSP strings & rearrange CM additions.

    Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

    Change-Id: I724ab581e555c33e35e5df4763b9a735086adb22

commit d14d4a0f73376ea2a06ad666549d981f1922955e
Author: Daniel Hillenbrand <codeworkx@cyanogenmod.org>
Date:   Sun Apr 7 12:43:05 2013 +0000

    Camera: fix scene mode breakage caused by soft-hdr feature

    Change-Id: Ic01645afaeb973f799b39dbea7d9ce347d3d59dd

commit 8f13912357ba28fbdc4afe81adaea2a35a53ca5a
Author: djMesias <djmesias@terra.es>
Date:   Sun Apr 7 12:38:25 2013 +0200

    es_ES: Add spanish translations

    - More picturesize entries

    Change-Id: I14dbaa43cbe0e4d8eb6952e479dd3dffa4f7579b

commit 2c535ae90ce40cf4c7b7193b77a4615d6da7b944
Merge: 5233130 13a9daa
Author: Daniel Hillenbrand <codeworkx@cyanogenmod.org>
Date:   Sun Apr 7 01:02:15 2013 -0700

    Merge "Fix camera extra settings menu" into cm-10.1

commit ee1ba79b888c13430784adf93b77ac38d286173c
Author: pvolkov <marshmollow@gmail.com>
Date:   Sun Apr 7 09:58:17 2013 +0400

    Update Russian Translation-Camera-CM10.1

commit b97ffd186050b26c5916564a9a6fc0e1981ed8ab
Author: DelPETER <delphinpeter@gmail.com>
Date:   Sat Apr 6 14:36:55 2013 +0200

    Camera : add french translation

    Change-Id: Ibe2c6126ee0438aff3329e9e8689a36b6de3988a

commit 13a9daae27680c5a85f2fc89450053de1b294bd4
Author: Martin Johnson <M.J.Johnson@massey.ac.nz>
Date:   Sat Apr 6 04:48:41 2013 -0400

    Fix camera extra settings menu

    If the list of settings entries is scrolled, the adapter returns a
    reused View instead of creating a new one. This makes the last
    entries unusable. This has been broken for ages but only shows up
    if the camera has more than a few settings (which the stock camera
    doesn't).

    Ported from CM10.

    Change-Id: I076202bd228b76c82af65a06f94134c46ef7ac59

commit 5233130185149b5eb9e6303ba783a00cf47b8093
Author: jt1134 <jt1134@gmail.com>
Date:   Thu Apr 4 18:53:56 2013 -0500

    Camera: add additional picture resolutions

    - Adds WGVA, SVGA, XGA, 1.5MP, and 4MP resolutions

    Change-Id: I92b8cafdb514de2dc6c99c01a5783540b8c695d6

commit 0635e3844e9973271a24942c5d59c241d938056f
Merge: 59613f3 aaf7bf0
Author: Marco Brohet <therbom@gmail.com>
Date:   Fri Apr 5 16:42:39 2013 -0700

    Merge "Update Russian Translation-Camera-CM10.1" into cm-10.1

commit 59613f37a1c62642989b5d94b99a4e7baf645942
Merge: 1bcbb00 4f69c9f
Author: Marco Brohet <therbom@gmail.com>
Date:   Fri Apr 5 16:23:31 2013 -0700

    Merge "Camera : reorganize and add french translation" into cm-10.1

commit 1bcbb002ec1dc36f4cbda3f169ce6130c758f1e0
Author: jt1134 <jt1134@gmail.com>
Date:   Sat Mar 30 04:16:33 2013 -0500

    CameraSettings: fix the filtering of unsupported settings

    Color effects were not filtered for the video camera, and
    the focus mode filtering logic for the camera was broken.

    Change-Id: I85a68ec992b7c6efaed4dddbf836cf00b20a8f89

commit 4f69c9f411c8b9bfc02dca75c42e7d53c3f0ad94
Author: DelPETER <delphinpeter@gmail.com>
Date:   Tue Apr 2 10:25:55 2013 +0200

    Camera : reorganize and add french translation

    Patch set 2 : correction

    Change-Id: I3ff2b2056b86b47cb10bd09997b90683c716c40b

commit de39edb1f007f81f7ed67acfc401d3a70664e193
Author: Tamás Tóth <syman@babulus.hu>
Date:   Mon Apr 1 22:19:22 2013 +0200

    Added hungarian translation

    Change-Id: I29d0117c4b25f099acdf9a6523806ed70b3c2e40

commit aaf7bf00b877fe97a9997ada39d75b513242864f
Author: pvolkov <marshmollow@gmail.com>
Date:   Mon Apr 1 20:28:28 2013 +0400

    Update Russian Translation-Camera-CM10.1

commit 43ed885cf92bd3eb5408ae39e469685a79949dda
Merge: acb746b 9f421bd
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Apr 1 07:38:54 2013 -0700

    Merge "Fix picture size tables" into cm-10.1

commit 9f421bd40c73b9b3d7e7535074453793de71ef27
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Apr 1 14:47:56 2013 +0100

    Fix picture size tables

    Correct 3920x2940's description to 11.5, and add 4208x3120 for 13MPx

    Change-Id: Ie88122e6b622baabd3023f1194fa62e1e3c252a2

commit acb746b0ca1d5ed3ddd15eb71223fc33b34ec2a5
Author: isimobile <isimobile@ismaakit.com>
Date:   Wed Mar 27 15:27:14 2013 +0200

    Afrikaans translations: Added missing items

    Change-Id: I9ffd44964c698b6599e9c606685cdc0fec3623ac

commit f6a993202c6a538389994929b0e6945cf0b05702
Author: DelPETER <delphinpeter@gmail.com>
Date:   Sun Mar 17 15:09:20 2013 +0100

    Camera : add french translation

    Patch set 1 : add french translation, correction unit

commit 92659b1de468a8f1edb12b20ba801ce42012fb08
Merge: b5be75b f6b2599
Author: Marco Brohet <therbom@gmail.com>
Date:   Thu Mar 21 08:58:04 2013 -0700

    Merge "Camera: Latest Danish strings" into cm-10.1

commit b5be75b9048f6ff0edc4cfed5da00f185bc7664a
Merge: d6b3a86 66b0837
Author: Marco Brohet <therbom@gmail.com>
Date:   Thu Mar 21 08:08:25 2013 -0700

    Merge "Added hungarian translation" into cm-10.1

commit d6b3a8622d67c848f461d52331b5205c64d16c09
Merge: b905a68 109a467
Author: Marco Brohet <therbom@gmail.com>
Date:   Thu Mar 21 08:07:04 2013 -0700

    Merge "Added Russian Translation-Camera-CM10.1" into cm-10.1

commit 66b08373f8803e489774a7eaef2a20ef5d4d3222
Author: Tamás Tóth <syman@babulus.hu>
Date:   Tue Mar 19 12:34:26 2013 +0100

    Added hungarian translation

    PS2: Seperating AOSP and CM strings

    Change-Id: Iaa0f826ed4a7ebb320aef3fd0715b44259ee403e

commit f6b25996cfe03db15ac0d08500760733ed509054
Author: Jacob Overgaard Madsen <u2jacob@gmail.com>
Date:   Thu Mar 21 09:35:38 2013 +0100

    Camera: Latest Danish strings

    Change-Id: I9f1cc7fa1fe08886897bc30c4072eab01541c0f2

commit 109a467bea1478deb86af3a4c4d41c42f600e40e
Author: pvolkov <marshmollow@gmail.com>
Date:   Sun Mar 17 17:37:00 2013 +0400

    Added Russian Translation-Camera-CM10.1

    Update Russian Translation-CM10.1

    Update Russian Translation-CM10.1

    Update Russian Translation-CM10.1

commit b905a68097f8efa7deffd856abb44e6e3e5bf752
Merge: d3893fa c55eac5
Author: Marco Brohet <therbom@gmail.com>
Date:   Wed Mar 20 12:30:14 2013 -0700

    Merge "Camera: Update Italian translation" into cm-10.1

commit d3893faf7be14f51a3060a96c96642d723f17f43
Merge: 1977411 18de5eb
Author: Marco Brohet <therbom@gmail.com>
Date:   Wed Mar 20 12:29:09 2013 -0700

    Merge "es_ES: Add spanish translations" into cm-10.1

commit 18de5ebf2f6f66730334f3913349b37216a6a498
Author: djMesias <djmesias@terra.es>
Date:   Sun Mar 17 21:24:01 2013 +0100

    es_ES: Add spanish translations

    Change-Id: Ia4d69a77f035c230c8d927f16f3a1806eadf82ea

commit c55eac518c13f03bdb41bfdbfab21c8708ce98c1
Author: rheeze <mauro.bazzano@gmail.com>
Date:   Tue Mar 19 12:30:03 2013 +0100

    Camera: Update Italian translation

    	Add translations for new picture sizes
    	Extract cyanogenmod strings in cm_strings.xml

    Change-Id: I1f924546764dbfb65629e3a986c09e112e40ac51

commit 1977411eeb8daa97dd03f3cd4f6edac456b20118
Author: tompopielarczyk <popielarczyktomasz@gmail.com>
Date:   Sun Mar 17 22:34:15 2013 +0100

    Camera: Updated Polish translation

    Patch Set 2: Minor change
    Patch Set 3: Another minor change
    Patch Set 4: Set for Verify by Cid

    Change-Id: I74de8ba001407048fa0677a6f49ea1ba52d2de6d

commit e0ea464e1ddf121ef1ddb6a03f0f0924ca186ba6
Author: Rashed Abdel-Tawab <rashedabdeltawab@gmail.com>
Date:   Mon Dec 24 09:44:07 2012 -0500

    Add missing resources for MDPI devices

    These do not produce build errors, but Gallery crashes on Camera
    launch since these drawables are missing. This fixes that.

    Change-Id: Idb05f3624b914677e61e6cf87774f5ff75bd6108

Change-Id: I480b7b5e69fed879072c465a23faa826b2a663e5
Camera: remove duplicate string definitions

Change-Id: Id20cd7eed65cc5f94b6654edb53c442a47bcb63b