CM9-Phone-Update Russian Translation
Adding Phone Plus Settings like Vibrate 45 and Trackball Answer

Change-Id: I7bd82bfcda2809338be4fb1ac06a2dbe7c52f28d

Conflicts:

	src/com/android/phone/InCallScreen.java
	src/com/android/phone/PhoneApp.java (reverse-merged from commit 1e51c2fbfe57e55fda89eac1ad737d3c94e08c83)
Forward-ports CM7 Advanced Phone Settings

Forward ports the following CM7 Advanced Phone Settings: Vibrate on Answer,
Vibrate 45, Vibrate End and Vibrate on Call Waiting. You can find these
options on Call Settings

Overhauled the Advanced Phone Settings code as suggested by Danny Baumann.
- Vibration is now threaded
- Preferences are now persistent
- PhoneUtils includes a method to access preferences

Updated some Portuguese Strings contributed by Celso Miranda and Matheus Ribeiro

Also includes the CM7 Translations.

*** Advanced Settings by Cytown

From bdb590063b5d04029e8c3abf71b845922344b57f Mon Sep 17 00:00:00 2001
From: cytown <cytown@gmail.com>
Date: Tue, 28 Dec 2010 14:23:42 +0800
Subject: [PATCH] porting from modified Phone App Froyo version

*** Advanced Settings Czech Translations by Ondrej Zima

From 60b4bee4a3e03e580981ee080e57c088e64c017e Mon Sep 17 00:00:00 2001
From: Ondrej Zima <keltuv.email@gmail.com>
Date: Tue, 10 Jan 2012 13:09:48 +0100
Subject: [PATCH] Czech: fixed translation, added missing strings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

And removed untranslatable strings. Thanks Ricardo.

Please, translate this extensive text is not easy and it is
very important the translation be well organized. Therefore, was
made ​​more changes.

Change-Id: I8face661bc096d4b2d7213cceed1f048fd1bc784

*** Advanced Settings German Translation 1/3 by Danny Baumann

From 1179d9ae9cc6ebb15dcd31d065e8f515332bc95a Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Tue, 7 Feb 2012 09:36:53 +0100
Subject: [PATCH] Improve German translation.

Change-Id: I87590376dd74e4cb44dd852528fb398239d54ad0

*** Advanced Settings German Translation 2/3 by thiasB

From 0fb7860abbfc908ed914d23da06585cefdcc1078 Mon Sep 17 00:00:00 2001
From: thiasB <m.buechner@gmail.com>
Date: Tue, 18 Jan 2011 17:33:45 +0100
Subject: [PATCH] German: TrackBall answer and hangup German: Voicemail
 notification

*** Advanced Settings German Translation 3/3 by Hawkeyexp

From b088359e075694bfb817905ac3ff3b155f2623ce Mon Sep 17 00:00:00 2001
From: Hawkeyexp <hawkeyexp@googlemail.com>
Date: Sat, 6 Aug 2011 23:08:05 +0200
Subject: [PATCH] extend translation (de)

Change-Id: I16bfbb10d278f25e99e71798c669e8f99aea34c3

*** Advanced Settings Spanish Translation by Chuckycrx

From 07931389928b109f48b167c72cb4143bdce541b2 Mon Sep 17 00:00:00 2001
From: KalimochoAz <calimochoazucarado@gmail.com>
Date: Sun, 20 Mar 2011 14:26:50 +0100
Subject: [PATCH] Added missing Spanish translations to the phone ( by
 Chuckycrx )

Change-Id: I6b8ce8ba90ce00316d38be088fedec6d7e5eef9a

*** Advanced Settings French Translation 1/2 by Tanguy Pruvot

From d7b89d1f0d176a2a6bf1243e3a1f3c02656ab2c0 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date: Sat, 30 Jul 2011 15:20:22 +0200
Subject: [PATCH] french: translation of phone settings

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>

Change-Id: Icd7d83c467ccc7925b5a5aa9986b5effd5df299f

*** Advanced Settings French Translation 2/2 by Sebastien Vaucher

From c9ffe66eddbbb8df1d0a215a5dbe3fbafff1d338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Vaucher?= <seb.vaucher@gmail.com>
Date: Mon, 17 Jan 2011 21:32:45 +0100
Subject: [PATCH] French: Update translations

Change-Id: If0a4a3a33ddb75a35f68cd6414d02675552495da

*** Advanced Settings Hungarian Translation by the Spica Community

From 2476b3894f0f0db556aad4c54884e42ed9740d4d Mon Sep 17 00:00:00 2001
From: dh-harald <github@criminal.hu>

Change-Id: I5b65a32e53c32472b3e98aa4ff7ae84ddfabc431
Date: Fri, 4 Mar 2011 10:31:07 +0100
Subject: [PATCH] Added missing HU translations from Hungarian Spica Community

Change-Id: Id22f6f042750dd0ace42e3b87f1025347144fb17

*** Advanced Settings Korean Translation by Inseok

From 0bd1739d2316011dfb07d5d8c82c4aa1e61cb932 Mon Sep 17 00:00:00 2001
From: Inseok Lee <dlunch@gmail.com>
Date: Tue, 11 Jan 2011 16:02:20 +0900
Subject: [PATCH] Update korean translation

Change-Id: Id089d141c29fc7b2713d63abca636733cd03802d

*** Advanced Settings Dutch Translation by ottuh

From 95d0647b5b68bf0d60f6eec112b86cf26eac3e3c Mon Sep 17 00:00:00 2001
From: ottuh <michel91@gmail.com>
Date: Sat, 25 Jun 2011 12:59:59 +0200
Subject: [PATCH] Phone: Dutch translation updated!

*** Advanced Settings Portuguese Translation 1/3 by Eduardo Martins

From 479264b5a36a41b1ffe491108122965bb0fb0415 Mon Sep 17 00:00:00 2001
From: Eduardo Martins <eduardo@martins>
Date: Tue, 24 Aug 2010 11:44:40 -0700
Subject: [PATCH] Update Portuguese translation: Advanced Setting in Call
 Settings

*** Advanced Settings Portuguese Translation 2/3 by Dillinger

From 60d8be2b476cd51b08e8b705eb5a6d7eb2231a17 Mon Sep 17 00:00:00 2001
From: Gustavo <gustavogyn@gmail.com>
Date: Fri, 25 Feb 2011 11:56:49 -0800
Subject: [PATCH] Added missing PT-BR translations

Change-Id: I0521d073c97f8ed02a4e11bfd0477912bdcb1aea

*** Advanced Settings Portuguese Translation 3/3 by Dillinger

From 7228293548bd227285da41b026f7ab1108102f21 Mon Sep 17 00:00:00 2001
From: Gustavo <gustavogyn@gmail.com>
Date: Sat, 19 Mar 2011 09:50:26 -0700
Subject: [PATCH] PT-BR: Improve translation

Change-Id: I786dbc0aa5d6a2b30f79362da2652c7f3d2ace27

*** Advanced Settings Russian Translation 1/2 by OlegKrikun

From e5fcb87dd95395ce0aa99945ff24284dc41e8a9e Mon Sep 17 00:00:00 2001
From: OlegKrikun <oleg@android-dev.krikun.ru>
Date: Sat, 16 Oct 2010 12:44:52 +0400
Subject: [PATCH] Update Russia translation

*** Advanced Settings Russian Translation 2/2 by Pvolkov

From 0e9d5f623de4fceb42768961db9cd9ccdadce08c Mon Sep 17 00:00:00 2001
From: pvolkov <marshmollow@gmail.com>
Date: Thu, 3 Feb 2011 20:20:54 +0300
Subject: [PATCH] Update Russian translation: Phone

Remove array and spaces in line end.

*** Advanced Settings Slovak Translation by jjsan

From 61da03f512db8939b41be022e9fd5efad47f7030 Mon Sep 17 00:00:00 2001
From: jjsan <juraj.janecek@gmail.com>
Date: Mon, 19 Sep 2011 21:47:51 +0200
Subject: [PATCH] Updated Slovak Language

Change-Id: I6fdbe8301f53bd59be72542137fca8b22487820a

*** Advanced Settings Swedish Translation by Patrik Kullman

From 4f4325b2d5c3f4bd33bda844d71088d99878b175 Mon Sep 17 00:00:00 2001
From: Patrik Kullman <patrik.kullman@gmail.com>
Date: Tue, 8 Feb 2011 18:25:26 +0100
Subject: [PATCH] Updated Swedish translations

Change-Id: I01017b84536dd4e8430e6b52f0f9b1d4d1c6ae98

*** Advanced Settings Turkish Translation by Hep Happy

From e26b7ba0136e34de8737fa962f5a1cd79dffecb0 Mon Sep 17 00:00:00 2001
From: Hep Happy <hephappy@gmail.com>
Date: Tue, 7 Feb 2012 19:27:02 +0200
Subject: [PATCH] Phone: tr: CM Turkish Translations

Change-Id: I8555f71cdaf3fbbfbc4b0ac84c9e5a93829c33bd

*** Advanced Settings Ukranian Translation by evgenln

From b2201bae6b33b977215124536b987f0440033b3b Mon Sep 17 00:00:00 2001
From: evgenln <evgenln4@gmail.com>
Date: Sun, 20 Mar 2011 19:00:08 +0200
Subject: [PATCH] Update Ukrainian translation - Add missing translations -
 Replace unneeded reductions - Fix terminology

Signed-off-by: evgenln <evgenln4@gmail.com>

*** Advanced Settings Simplified Chinese 1/2 by Yang Hong

From 944d6519ce6d4dc207c8d9666ea60a51ca6f2d81 Mon Sep 17 00:00:00 2001
From: Yang Hong <yangh.cn@gmail.com>
Date: Sat, 30 Oct 2010 00:08:25 +0800
Subject: [PATCH] Update zh-CN translate for Phone setting UI

Change-Id: I0816204850249c9d33c0149a2908fe7ea05408fb

*** Advanced Settings Simplified Chinese 2/2 by Longer.Chan

From b30bf1d823dc945efd08c1ae754dfeaaf39090eb Mon Sep 17 00:00:00 2001
From: "Longer.Chan" <longer.chan@gmail.com>
Date: Sat, 28 May 2011 18:58:27 +0800
Subject: [PATCH] Add some Chinense strings of Phone Project.

Change-Id: Ica0c110e9098a1e83fc4bcb14c0422d17583ee52

*** Advanced Settings Traditional Chinese by Ladios

From bfd9daefcdefa9b99e45bfc302ff82c34aa348c3 Mon Sep 17 00:00:00 2001
From: ladios <ladios.jonquil@gmail.com>
Date: Thu, 3 Mar 2011 04:15:03 +0800
Subject: [PATCH] Traditional Chinese: Translation updated.

 - all extra strings

Change-Id: I9b98852f4fea47b204ad91fd7735aef461ad31e8

Change-Id: I7bd82bfcda2809338be4fb1ac06a2dbe7c52f28d