diff --git a/locale/fi/BOINC-Android.po b/locale/fi/BOINC-Android.po
index a25d20d99b..43c0963817 100644
--- a/locale/fi/BOINC-Android.po
+++ b/locale/fi/BOINC-Android.po
@@ -6,24 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
 "PO-Revision-Date: 2014-01-17 17:20+0000\n"
-=======
-"POT-Creation-Date: 2014-01-17 00:00-0800\n"
-"PO-Revision-Date: 2013-11-26 19:45+0000\n"
->>>>>>> 4466458c80bf0e28650da070adb73f01e7581276
 "Last-Translator: Sami Nordlund <sami.nordlund@kolumbus.fi>\n"
 "Language-Team: fi <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< HEAD
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.5.0\n"
-=======
->>>>>>> 4466458c80bf0e28650da070adb73f01e7581276
 "Generated-By: Babel 1.0dev\n"
 "X-POOTLE-MTIME: 1389979204.0\n"
 
@@ -101,12 +93,12 @@ msgid "Android:"
 msgstr "Android:"
 
 msgctxt "attachproject_login_platform_supported"
-msgid "Device type is supported by this project"
-msgstr ""
+msgid "This project supports Android devices"
+msgstr "Tämä projekti tukee Android-laitteita"
 
 msgctxt "attachproject_login_platform_not_supported"
-msgid "Device is not supported by this project"
-msgstr ""
+msgid "This project does not support Android devices"
+msgstr "Tämä projekti ei tue Android-laitteita"
 
 msgctxt "attachproject_login_category_terms_of_use"
 msgid "Terms of use for"
@@ -347,15 +339,9 @@ msgid "Synchronize"
 msgstr "Synkronoi"
 
 #. main activity
-#, fuzzy
 msgctxt "main_noproject_warning"
-<<<<<<< HEAD
 msgid "Tab here to choose a project."
 msgstr "Napauta tähän valitaksesi projektin."
-=======
-msgid "Tap here to choose a project."
-msgstr "Valitse projekti:"
->>>>>>> 4466458c80bf0e28650da070adb73f01e7581276
 
 msgctxt "main_error"
 msgid "Whooops"
@@ -500,30 +486,9 @@ msgctxt "prefs_show_advanced_header"
 msgid "Show advanced preferences and controls…"
 msgstr "Näytä lisäasetukset ja ohjaimet…"
 
-msgctxt "prefs_power_source_header"
-msgid "Power sources for computation"
-msgstr ""
-
-msgctxt "prefs_power_source_description"
-msgid "Selects power sources BOINC is allowed to use for computation."
-msgstr ""
-
-msgctxt "prefs_power_source_ac"
-msgid "Wall socket"
-msgstr ""
-
-#, fuzzy
-msgctxt "prefs_power_source_usb"
-msgid "USB connection"
-msgstr "Ei internet-yhteyttä"
-
-msgctxt "prefs_power_source_wireless"
-msgid "Wireless charger"
-msgstr ""
-
-msgctxt "prefs_power_source_battery"
-msgid "Battery"
-msgstr ""
+msgctxt "prefs_run_on_battery_header"
+msgid "Compute on Battery"
+msgstr "Laskenta akkukäytöllä"
 
 msgctxt "battery_charge_min_pct_header"
 msgid "Min. battery level"
@@ -532,8 +497,7 @@ msgstr "Pienin varaustaso"
 msgctxt "battery_charge_min_pct_description"
 msgid "BOINC suspends computation below defined battery charge level."
 msgstr ""
-"BOINC hyllyttää laskennan kun asetettu akun varaustason alaraja "
-"saavutetaan."
+"BOINC hyllyttää laskennan kun asetettu akun varaustason alaraja saavutetaan."
 
 msgctxt "battery_temperature_max_header"
 msgid "Max. battery temperature"
@@ -544,8 +508,8 @@ msgid ""
 "BOINC suspends computation above defined battery temperature. It is not "
 "recommended to change this value."
 msgstr ""
-"BOINC hyllyttää laskennan kun asetettu akun lämpötilaraja saavutetaan. "
-"Tätä arvoa ei suositella muutettavaksi."
+"BOINC hyllyttää laskennan kun asetettu akun lämpötilaraja saavutetaan. Tätä "
+"arvoa ei suositella muutettavaksi."
 
 msgctxt "prefs_disk_max_pct_header"
 msgid "Max. used storage space"
@@ -1157,19 +1121,12 @@ msgstr ""
 "© 2003–2013 Kalifornian yliopisto, Berkeley.\n"
 "Kaikki oikeudet pidätetään."
 
-#~ msgctxt "attachproject_login_platform_supported"
-#~ msgid "This project supports Android devices"
-#~ msgstr "Tämä projekti tukee Android-laitteita"
-
-#~ msgctxt "attachproject_login_platform_not_supported"
-#~ msgid "This project does not support Android devices"
-#~ msgstr "Tämä projekti ei tue Android-laitteita"
-
+#, fuzzy
 #~ msgctxt "main_noproject_warning"
-#~ msgid "Tab here to choose a project."
-#~ msgstr ""
-
-#~ msgctxt "prefs_run_on_battery_header"
-#~ msgid "Compute on Battery"
-#~ msgstr "Laskenta akkukäytöllä"
+#~ msgid "Tap here to choose a project."
+#~ msgstr "Napauta tähän valitaksesi projektin."
 
+#, fuzzy
+#~ msgctxt "prefs_power_source_usb"
+#~ msgid "USB connection"
+#~ msgstr "Ei internet-yhteyttä"