Merge "Replace some string for Battery usage" into tizen

diff --cc resource/po/ar.po
index 914868e36db48e3e2622107753e14fdbc51e794c,3358c0b76d9849c7ce72829a2df6867e7204f32c..3358c0b76d9849c7ce72829a2df6867e7204f32c
mode 100644,100755..100644
--- 1/resource/po/ar.po
--- 2/resource/po/ar.po
+++ b/resource/po/ar.po

diff --cc resource/po/az.po
index af37ecb8bdd6c1562c17a0d57213b3473c60ca07,11783ccc9238ce74ef0975f9857ef434c6a5b570..11783ccc9238ce74ef0975f9857ef434c6a5b570
mode 100644,100755..100644
--- 1/resource/po/az.po
--- 2/resource/po/az.po
+++ b/resource/po/az.po

diff --cc resource/po/bg.po
index 81c600ae428796c527eda3225248778d62f6fe3b,76dd6b598daa7d84c8bb6fb779a8b009f52ea04c..76dd6b598daa7d84c8bb6fb779a8b009f52ea04c
mode 100644,100755..100644
--- 1/resource/po/bg.po
--- 2/resource/po/bg.po
+++ b/resource/po/bg.po

diff --cc resource/po/ca.po
index c47201853243cb4f77a924d72c803d85a5c98f1d,88fca3989d935c977fe1a96e050fd7bfcd7ef0de..88fca3989d935c977fe1a96e050fd7bfcd7ef0de
mode 100644,100755..100644
--- 1/resource/po/ca.po
--- 2/resource/po/ca.po
+++ b/resource/po/ca.po

diff --cc resource/po/cs.po
index 2f0857f0238333b3f29ab8228b5bc234f23152ae,7090d867b4978b88a4d1516e2315ab97aa7b7126..7090d867b4978b88a4d1516e2315ab97aa7b7126
mode 100644,100755..100644
--- 1/resource/po/cs.po
--- 2/resource/po/cs.po
+++ b/resource/po/cs.po

diff --cc resource/po/da.po
index fd71fec57ceed5d8fd1835caaf86555056aa874b,0648c8110ba17855ad4129f326dafceac6eac22e..0648c8110ba17855ad4129f326dafceac6eac22e
mode 100644,100755..100644
--- 1/resource/po/da.po
--- 2/resource/po/da.po
+++ b/resource/po/da.po

diff --cc resource/po/de.po
index 2fe67138e399938b94dfa0174d274803ca451296,db0f2c5ec34b32a236a2ccd88d766274190aecaf..db0f2c5ec34b32a236a2ccd88d766274190aecaf
mode 100644,100755..100644
--- 1/resource/po/de.po
--- 2/resource/po/de.po
+++ b/resource/po/de.po

diff --cc resource/po/el_GR.po
index b28a018a41d9fc222e174f970307ae59e4e90e01,92108954fb48b7001f21a193b2f2da1d1013656f..92108954fb48b7001f21a193b2f2da1d1013656f
mode 100644,100755..100644
--- 1/resource/po/el_GR.po
--- 2/resource/po/el_GR.po
+++ b/resource/po/el_GR.po

diff --cc resource/po/en.po
index 8b9bca679de7a7a81d4c80c5cb1d74c19c011075,a00d6aca516e3c20b737ef1d0775f0f867faf177..a00d6aca516e3c20b737ef1d0775f0f867faf177
mode 100644,100755..100644
--- 1/resource/po/en.po
--- 2/resource/po/en.po
+++ b/resource/po/en.po

diff --cc resource/po/en_PH.po
index 9a80082c6d1c2584608fb8cafa4dc3def42549a6,952d55504dabd60bfa58dea6e6939b23f72b868b..952d55504dabd60bfa58dea6e6939b23f72b868b
mode 100644,100755..100644
--- 1/resource/po/en_PH.po
--- 2/resource/po/en_PH.po
+++ b/resource/po/en_PH.po

diff --cc resource/po/en_US.po
index 3dd2e00fbfd5660844d187acd70f5b5fc970506e,62f1239a0606493a089a42b900022a09ac959d47..62f1239a0606493a089a42b900022a09ac959d47
mode 100644,100755..100644
--- 1/resource/po/en_US.po
--- 2/resource/po/en_US.po
+++ b/resource/po/en_US.po

diff --cc resource/po/es_ES.po
index 6186526153fdc459a60762ccba253f64df084cd9,dca3d0f01efe52f51afe33ddbadba6856317027b..dca3d0f01efe52f51afe33ddbadba6856317027b
mode 100644,100755..100644
--- 1/resource/po/es_ES.po
--- 2/resource/po/es_ES.po
+++ b/resource/po/es_ES.po

diff --cc resource/po/es_US.po
index 981965ce4746b2b460aca8988766fe98dc58d5d4,543a42f1aac0d1ee6a691e00b812f4ccc8660ae0..543a42f1aac0d1ee6a691e00b812f4ccc8660ae0
mode 100644,100755..100644
--- 1/resource/po/es_US.po
--- 2/resource/po/es_US.po
+++ b/resource/po/es_US.po

diff --cc resource/po/et.po
index ef31c5470d004fba35d300b865d82d76eba20602,7b8d4227bb8e6b10b049228c06ef2b7d580f74cb..7b8d4227bb8e6b10b049228c06ef2b7d580f74cb
mode 100644,100755..100644
--- 1/resource/po/et.po
--- 2/resource/po/et.po
+++ b/resource/po/et.po

diff --cc resource/po/eu.po
index 86c7b77f64059b96bf1bb86db89a9988cde122e8,bffc06903452d9d0688f3fd7929591702cc7ed97..bffc06903452d9d0688f3fd7929591702cc7ed97
mode 100644,100755..100644
--- 1/resource/po/eu.po
--- 2/resource/po/eu.po
+++ b/resource/po/eu.po

diff --cc resource/po/fi.po
index f6e11d1f056d2ef408f7115b87fe56d493422b40,d33edc932ff16d6c5f076f0cd580ef8632360d70..d33edc932ff16d6c5f076f0cd580ef8632360d70
mode 100644,100755..100644
--- 1/resource/po/fi.po
--- 2/resource/po/fi.po
+++ b/resource/po/fi.po

diff --cc resource/po/fr.po
index dee8ad24f3a700d80f7585407452f8d542440122,1be806e10d9b4b1eec6d5aaf90ffd7899d29b51a..1be806e10d9b4b1eec6d5aaf90ffd7899d29b51a
mode 100644,100755..100644
--- 1/resource/po/fr.po
--- 2/resource/po/fr.po
+++ b/resource/po/fr.po

diff --cc resource/po/fr_CA.po
index b16726ca868a670d2f103306d716a911c3acb5c1,4fa1b67dc6dcd4d6c2bfc786adc6479d45910ccd..4fa1b67dc6dcd4d6c2bfc786adc6479d45910ccd
mode 100644,100755..100644
--- 1/resource/po/fr_CA.po
--- 2/resource/po/fr_CA.po
+++ b/resource/po/fr_CA.po

diff --cc resource/po/ga.po
index 4b0fecca6f463a890563b7fe795cc90df90d6ea9,1e30e89d38599054da4ce127edc2508e72855615..1e30e89d38599054da4ce127edc2508e72855615
mode 100644,100755..100644
--- 1/resource/po/ga.po
--- 2/resource/po/ga.po
+++ b/resource/po/ga.po

diff --cc resource/po/gl.po
index 31d184bc0d703b9f52385c530dd089a5117bf3dc,1774bd7f208db7015be4d565d42f4b1ab96ca160..1774bd7f208db7015be4d565d42f4b1ab96ca160
mode 100644,100755..100644
--- 1/resource/po/gl.po
--- 2/resource/po/gl.po
+++ b/resource/po/gl.po

diff --cc resource/po/hr.po
index 9cfd3573a091f3319ee41529ad909e2ae437989f,3f82eeaddc43cfc7319acb2fa1f00b9a9b5a71b3..3f82eeaddc43cfc7319acb2fa1f00b9a9b5a71b3
mode 100644,100755..100644
--- 1/resource/po/hr.po
--- 2/resource/po/hr.po
+++ b/resource/po/hr.po

diff --cc resource/po/hu.po
index a37a4b70a3d9d8dd6be3b15177565ceb306faf86,ce8881dbd3e2e6856afd13f5038f837aaf28fd95..ce8881dbd3e2e6856afd13f5038f837aaf28fd95
mode 100644,100755..100644
--- 1/resource/po/hu.po
--- 2/resource/po/hu.po
+++ b/resource/po/hu.po

diff --cc resource/po/hy.po
index af5600c2332f2af613e11c40d721e4a59a43b579,59b3e5edc493f19549b7ff8500eb477ffa6e8803..59b3e5edc493f19549b7ff8500eb477ffa6e8803
mode 100644,100755..100644
--- 1/resource/po/hy.po
--- 2/resource/po/hy.po
+++ b/resource/po/hy.po

diff --cc resource/po/is.po
index 0e686064ebb2a20f0f587f7a114a119b68bc3d54,cd3ee27b508f17c4fc01ec9d3e2ef56376e83505..cd3ee27b508f17c4fc01ec9d3e2ef56376e83505
mode 100644,100755..100644
--- 1/resource/po/is.po
--- 2/resource/po/is.po
+++ b/resource/po/is.po

diff --cc resource/po/it_IT.po
index 2c0410134c8439b13e3b6ebf9716292d9e5b58fa,983effc98766333a33c897bb00a94b4732814145..983effc98766333a33c897bb00a94b4732814145
mode 100644,100755..100644
--- 1/resource/po/it_IT.po
--- 2/resource/po/it_IT.po
+++ b/resource/po/it_IT.po

diff --cc resource/po/ja_JP.po
index 7c7c9fd98cbe595253b0530048275a5b4fda9237,a79f7284309b6c361eefd1e0f510ab3f23c6d602..a79f7284309b6c361eefd1e0f510ab3f23c6d602
mode 100644,100755..100644
--- 1/resource/po/ja_JP.po
--- 2/resource/po/ja_JP.po
+++ b/resource/po/ja_JP.po

diff --cc resource/po/ka.po
index 317a62144255231d985e67f3356676bab5f7b4cf,8834c9000f903eb49df58e93ef59f6df2745a459..8834c9000f903eb49df58e93ef59f6df2745a459
mode 100644,100755..100644
--- 1/resource/po/ka.po
--- 2/resource/po/ka.po
+++ b/resource/po/ka.po

diff --cc resource/po/kk.po
index bec9a3155347b0ac7e591f47afe5ef48689fa39a,7283301059cbc4dda66b7462a56e7b45c2ecf9ab..7283301059cbc4dda66b7462a56e7b45c2ecf9ab
mode 100644,100755..100644
--- 1/resource/po/kk.po
--- 2/resource/po/kk.po
+++ b/resource/po/kk.po

diff --cc resource/po/ko_KR.po
index bf8cbf99cc39968db0971b3341838990edee0fa6,719d6128bbbff0e4343a41174e76e1f00de61395..719d6128bbbff0e4343a41174e76e1f00de61395
mode 100644,100755..100644
--- 1/resource/po/ko_KR.po
--- 2/resource/po/ko_KR.po
+++ b/resource/po/ko_KR.po

diff --cc resource/po/lt.po
index 4101a53377afd0452dd981d691c9e22585fbbd77,4c1dc976c8d1c86042f41f1eed4310e0051da418..4c1dc976c8d1c86042f41f1eed4310e0051da418
mode 100644,100755..100644
--- 1/resource/po/lt.po
--- 2/resource/po/lt.po
+++ b/resource/po/lt.po

diff --cc resource/po/lv.po
index b27ae465210cc960fbedc048398679b714266229,47dd5565d0a1d2f9e0b72207df5c755ddb318e4e..47dd5565d0a1d2f9e0b72207df5c755ddb318e4e
mode 100644,100755..100644
--- 1/resource/po/lv.po
--- 2/resource/po/lv.po
+++ b/resource/po/lv.po

diff --cc resource/po/mk.po
index 86490160222961cc5fb518cc48148c4924515bb3,224e6c3191f24d99349c186aae8e66c4d892eb22..224e6c3191f24d99349c186aae8e66c4d892eb22
mode 100644,100755..100644
--- 1/resource/po/mk.po
--- 2/resource/po/mk.po
+++ b/resource/po/mk.po

diff --cc resource/po/nb.po
index 48220473088745a1839c014a188c4cc70a70f4a7,6d88e86e408d5fa04f44b382e253f4116011511b..6d88e86e408d5fa04f44b382e253f4116011511b
mode 100644,100755..100644
--- 1/resource/po/nb.po
--- 2/resource/po/nb.po
+++ b/resource/po/nb.po

diff --cc resource/po/nl.po
index 705036bcc49ffc0f9905b7d0e17ee986de011156,315efa2bcad36f1c1d7e8585e0e35f3637122944..315efa2bcad36f1c1d7e8585e0e35f3637122944
mode 100644,100755..100644
--- 1/resource/po/nl.po
--- 2/resource/po/nl.po
+++ b/resource/po/nl.po

diff --cc resource/po/pl.po
index ceaa104a061e9ea62b1c50ec2db4db47f47e047f,4e99708a254170b9da178dedfc51cccc733184da..4e99708a254170b9da178dedfc51cccc733184da
mode 100644,100755..100644
--- 1/resource/po/pl.po
--- 2/resource/po/pl.po
+++ b/resource/po/pl.po

diff --cc resource/po/pt_BR.po
index 80faeb8b066f0200a827923416c3ec08ed91e7cd,ef275aaf8ca205e14a3a08d77321ac5123ab7eed..ef275aaf8ca205e14a3a08d77321ac5123ab7eed
mode 100644,100755..100644
--- 1/resource/po/pt_BR.po
--- 2/resource/po/pt_BR.po
+++ b/resource/po/pt_BR.po

diff --cc resource/po/pt_PT.po
index fb8883e5100a9c131e89e13c388056863dddbdc2,17e601e9a62020cbf865d82061d02e3adff2cea2..17e601e9a62020cbf865d82061d02e3adff2cea2
mode 100644,100755..100644
--- 1/resource/po/pt_PT.po
--- 2/resource/po/pt_PT.po
+++ b/resource/po/pt_PT.po

diff --cc resource/po/ro.po
index 57bfeb59713cb758319571b3624f9dd1e57638c1,e70058d43ebe04bc7e09c8b9cce0ced40ac6d83e..e70058d43ebe04bc7e09c8b9cce0ced40ac6d83e
mode 100644,100755..100644
--- 1/resource/po/ro.po
--- 2/resource/po/ro.po
+++ b/resource/po/ro.po

diff --cc resource/po/ru_RU.po
index b2b916ad4ed5cf5b25da67eeea2e56e2938d2511,47bc6cc451b441a9ffb1e9cf029e0ff5e99d4c8d..47bc6cc451b441a9ffb1e9cf029e0ff5e99d4c8d
mode 100644,100755..100644
--- 1/resource/po/ru_RU.po
--- 2/resource/po/ru_RU.po
+++ b/resource/po/ru_RU.po

diff --cc resource/po/sk.po
index e6f72354ee09d02b0f20db26065b644c28a9ec1e,287fb45e565dc051cdbb585d4f1188e3f88f9361..287fb45e565dc051cdbb585d4f1188e3f88f9361
mode 100644,100755..100644
--- 1/resource/po/sk.po
--- 2/resource/po/sk.po
+++ b/resource/po/sk.po

diff --cc resource/po/sl.po
index 55ae6e05b2c9a484e7a44f67812238209b63a807,098e577d0e18b6798328e9df5dbf8b8a4c4e0f03..098e577d0e18b6798328e9df5dbf8b8a4c4e0f03
mode 100644,100755..100644
--- 1/resource/po/sl.po
--- 2/resource/po/sl.po
+++ b/resource/po/sl.po

diff --cc resource/po/sr.po
index a79196f8e799e839a6c00d8240eb6b1392d3fc7e,2ac0ace3b18afb0d01c05a07f212ed87c879ac9c..2ac0ace3b18afb0d01c05a07f212ed87c879ac9c
mode 100644,100755..100644
--- 1/resource/po/sr.po
--- 2/resource/po/sr.po
+++ b/resource/po/sr.po

diff --cc resource/po/sv.po
index 65ace3826953cae431e0197faa0c3322c6068bc4,a9382825598a5c0979892bb75d22834bf2c759f2..a9382825598a5c0979892bb75d22834bf2c759f2
mode 100644,100755..100644
--- 1/resource/po/sv.po
--- 2/resource/po/sv.po
+++ b/resource/po/sv.po

diff --cc resource/po/tr_TR.po
index ae805282ec8b9b467192f2e220f88a71bb315a36,9ebb37483e3c735676f39b01d4e64275ecf73353..9ebb37483e3c735676f39b01d4e64275ecf73353
mode 100644,100755..100644
--- 1/resource/po/tr_TR.po
--- 2/resource/po/tr_TR.po
+++ b/resource/po/tr_TR.po

diff --cc resource/po/uk.po
index 21a017813efda24862cd5e1d141356fcfdc8bfe3,39eee8577cdd92ba57d61336af3f4badfcab169f..39eee8577cdd92ba57d61336af3f4badfcab169f
mode 100644,100755..100644
--- 1/resource/po/uk.po
--- 2/resource/po/uk.po
+++ b/resource/po/uk.po

diff --cc resource/po/uz.po
index 07d87ec16ba584a60f51710d608d7960da049b32,1dff14cd885398e2ec815aa38043a361b9c0311d..1dff14cd885398e2ec815aa38043a361b9c0311d
mode 100644,100755..100644
--- 1/resource/po/uz.po
--- 2/resource/po/uz.po
+++ b/resource/po/uz.po

diff --cc resource/po/zh_CN.po
index a31742f13c5f6aa1e59cdd9511838a2e8430083d,4247ccc7a6e66dc049e2018d75cb70519a2133d7..4247ccc7a6e66dc049e2018d75cb70519a2133d7
mode 100644,100755..100644
--- 1/resource/po/zh_CN.po
--- 2/resource/po/zh_CN.po
+++ b/resource/po/zh_CN.po

diff --cc resource/po/zh_HK.po
index f916d86f6cd605b776158c60826563cbdf9deac1,c4716cc65c070dbd50aab85bb42d08894a478065..c4716cc65c070dbd50aab85bb42d08894a478065
mode 100644,100755..100644
--- 1/resource/po/zh_HK.po
--- 2/resource/po/zh_HK.po
+++ b/resource/po/zh_HK.po

diff --cc resource/po/zh_TW.po
index 2090d0474e4d442635b56b134e3ce3303e5d021c,47ca22e75c2ab2e29ea57399fc71b5d9f0d5f047..47ca22e75c2ab2e29ea57399fc71b5d9f0d5f047
mode 100644,100755..100644
--- 1/resource/po/zh_TW.po
--- 2/resource/po/zh_TW.po
+++ b/resource/po/zh_TW.po

diff --cc setting-smartmanager/smartmanager-battery/src/smartmanager-battery-main.c
index d65cc9795a736bbc57628735d2d668de96466e59,29f3aade0af2a8a7c110029e6db7ead0bde2b15f..33d7d9bbc93fa20b98e5d9883a27073726355880
mode 100644,100755..100644
--- 1/setting-smartmanager/smartmanager-battery/src/smartmanager-battery-main.c
--- 2/setting-smartmanager/smartmanager-battery/src/smartmanager-battery-main.c
+++ b/setting-smartmanager/smartmanager-battery/src/smartmanager-battery-main.c