diff --git a/README.md b/README.md
index 54d9bb092a..a9dd5a41f4 100644
--- a/README.md
+++ b/README.md
@@ -6,4 +6,6 @@
 [![Gitter](https://badges.gitter.im/MilosKozak/AndroidAPS.svg)](https://gitter.im/MilosKozak/AndroidAPS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build status](https://travis-ci.org/MilosKozak/AndroidAPS.svg?branch=master)](https://travis-ci.org/MilosKozak/AndroidAPS)
 [![codecov](https://codecov.io/gh/MilosKozak/AndroidAPS/branch/master/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)
-dev: [![codecov](https://codecov.io/gh/MilosKozak/AndroidAPS/branch/dev/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)
\ No newline at end of file
+dev: [![codecov](https://codecov.io/gh/MilosKozak/AndroidAPS/branch/dev/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)
+
+[![Donate via PayPal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=Y4LHGJJESAVB8)
diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml
new file mode 100644
index 0000000000..2e44a58f76
--- /dev/null
+++ b/app/src/main/res/values-ga/strings.xml
@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="openaps_short">OAPS</string>
+    <string name="MM640g">MM640g</string>
+    <string name="mmol">mmol/l</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="yes">Tá</string>
+    <string name="no">Níl</string>
+    <string name="combo_pump_connected_now">Anois</string>
+    <string name="ga_lang">Gaeilge</string>
+    <string name="food">Bia</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="oaps_shortname">OAPS</string>
+    <string name="nsalarm_high">Ard</string>
+    <string name="nsalarm_low">Íseal</string>
+    <string name="danar_stats_amount_days"># Lá</string>
+    <string name="xdrip">xDrip</string>
+    <string name="danar_alarm">aláraim</string>
+    <string name="pump_battery_label">Ceallraí</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="button1">Cnaipe 1</string>
+    <string name="button2">Cnaipe 2</string>
+    <string name="button3">Cnaipe 3</string>
+    <string name="cancel">Cuir ar ceal</string>
+    <string name="mdtp_cancel">Cuir ar ceal</string>
+    <string name="connected">Nasctha</string>
+    <string name="connecting">Ag nascadh</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="danarpump">DanaR</string>
+    <string name="days">lá</string>
+    <string name="date">Dáta</string>
+    <string name="device">Gléas</string>
+    <string name="disconnected">Dínasctha</string>
+    <string name="combo_pump_state_disconnected">Dínasctha</string>
+    <string name="overview_quickwizard_item_edit_button">In eagar</string>
+    <string name="en_lang">Bearla (English)</string>
+    <string name="danar_error">earráid</string>
+    <string name="nav_exit">Scoir</string>
+    <string name="overview_shortname">BAILE</string>
+    <string name="combo_reservoir_low">Íseal</string>
+    <string name="mute">Balbh</string>
+    <string name="nsclient">NSClient</string>
+    <string name="nsclientinternal">NSClient</string>
+    <string name="nsclientinternal_title">NSClient</string>
+    <string name="virtualpump_resultok">OK</string>
+    <string name="ok">OK</string>
+    <string name="mdtp_ok">OK</string>
+    <string name="openaps">OpenAPS</string>
+    <string name="openapsama">OpenAPS AMA</string>
+    <string name="openapsma">OpenAPS MA</string>
+    <string name="careportal_newnstreatment_other">Eile</string>
+    <string name="othersettings_title">Eile</string>
+    <string name="combo_refresh">Athnuachan</string>
+    <string name="restart">Atosaigh</string>
+    <string name="careportal_sensorage_label_short">SAGE</string>
+    <string name="save">Sábháil</string>
+    <string name="objectives_button_start">Tosaigh</string>
+    <string name="overview_bolusprogress_stop">Stad</string>
+    <string name="nsclientinternal_url">URL:</string>
+    <string name="up">Suas</string>
+    <string name="result">Toradh</string>
+    <string name="el_lang">Gréigis</string>
+    <string name="configbuilder_general">Ginearálta</string>
+    <string name="danar_glucose">glúcóis</string>
+    <string name="glucose">Glúcóis</string>
+    <string name="danar_history_glucose">Glúcóis</string>
+    <string name="shortgramm">g</string>
+    <string name="ultrafastactinginsulincomment">Fiasp</string>
+    <string name="shortfat">Saill</string>
+    <string name="careportal_exercise">Cleachtadh</string>
+    <string name="combo_reservoir_empty">Folamh</string>
+    <string name="tempbasals_realduration_label_string">Fad:</string>
+    <string name="duration">Fad</string>
+    <string name="careportal_newnstreatment_duration_label">Fad</string>
+    <string name="careportal_newnstreatment_duration_min_label">Fad [nóim.]</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_stats_date">Dáta</string>
+    <string name="openapsma_profile_label">Próifíl</string>
+    <string name="configbuilder_profile">Próifíl</string>
+    <string name="careportal_newnstreatment_profile_label">Próifíl</string>
+    <string name="profile">Próifíl</string>
+    <string name="careportal_pbage_label_short">PBAGE</string>
+    <string name="configbuilder_pump">Caidéil</string>
+    <string name="pump">Caidéil</string>
+    <string name="careportal_pump_label">CAIDÉIL</string>
+    <string name="rate">Ráta</string>
+    <string name="danar_stats_ratio">Cóimheas</string>
+    <string name="tempbasals_netratio_label_string">Cóimheas:</string>
+    <string name="reason">Cúis</string>
+    <string name="pump_reservoir_label">Taiscumar</string>
+    <string name="resume">Atosú</string>
+    <string name="openapsma_run">Reáchtáil anois</string>
+    <string name="combo_pump_state_running">Ag reáchtáil</string>
+    <string name="careportal_newnstreatment_sensor">Braiteoir</string>
+    <string name="glucosetype_sensor">Braiteoir</string>
+    <string name="careportal_sensorage_label">Braiteoir aois</string>
+    <string name="success">Rathúlacht</string>
+    <string name="nsprofileview_units_label">Aonaid</string>
+    <string name="units">Aonaid:</string>
+    <string name="treatments_wizard_unit_label">A</string>
+    <string name="suspendloopfor10h">Fionraí lúb do 10 u</string>
+    <string name="suspendloopfor1h">Fionraí lúb do 1 u</string>
+    <string name="suspendloopfor2h">Fionraí lúb do 2 u</string>
+    <string name="suspendloopfor3h">Fionraí lúb do 3 u</string>
+    <string name="danar_history_syspend">Fionraí</string>
+    <string name="careportal_question">Ceist</string>
+    <string name="language">Teanga</string>
+    <string name="treatments_newtreatment_insulinamount_label">Inslin</string>
+    <string name="tempbasals_netinsulin_label_string">Ins:</string>
+    <string name="insulin_shortname">INS</string>
+    <string name="careportal_newnstreatment_insulin_label">Inslin</string>
+    <string name="configbuilder_insulin">Inslin</string>
+    <string name="treatments_insulin_label_string">Inslin:</string>
+    <string name="careportal_insulinage_label">Inslin aois</string>
+    <string name="careportal_insulinage_label_short">IAGE</string>
+    <string name="nsclientinternal_devicename_title">Gléas ainm</string>
+    <string name="child">Páiste</string>
+    <string name="overview_calculator_label">Áireamhán</string>
+    <string name="careportal_canulaage_label_short">CAGE</string>
+    <string name="danar_bluetooth_status">Bluetooth stádas</string>
+    <string name="configbuilder_aps">APS</string>
+    <string name="loop_aps_label">APS</string>
+    <string name="androidaps_start">AndroidAPS thosaigh</string>
+    <string formated="false" name="sms_minago">%dnóim ó shin</string>
+    <string formated="false" name="minago">%d nóim ó shin</string>
+    <string formated="false" name="hoursago">%.1fu ó shin</string>
+    <string formated="false" name="pump_basebasalrate">%.2f A/u</string>
+    <string formated="false" name="combo_tbr_remaining">%d%% (%d nóim fágtha)</string>
+    <string name="actions">Gníomhartha</string>
+    <string name="actions_shortname">GNÍ</string>
+    <string name="overview_editquickwizardlistactivity_add">Cuir</string>
+    <string name="adult">Duine fásta</string>
+    <string name="overview_calibration">Calabrú</string>
+    <string name="overview_calibration_bg_label">Calabrú</string>
+    <string name="danar_carbohydrate">carbaihiodráit</string>
+    <string name="danar_history_carbohydrates">Carbaihiodráití</string>
+    <string name="closedloop">Lúb dúnta</string>
+    <string name="treatments_wizard_correction_label">Cear</string>
+    <string name="correctionbous">Cear</string>
+    <string name="overview_bolusprogress_delivered">Seachadta</string>
+    <string formated="false" name="bolusdelivering">Seachadadh %.2fA</string>
+    <string name="deliver_now">Seachadadh anois</string>
+    <string name="disconnectpumpfor10h">Dhícheangal Caidéil do 10 u</string>
+    <string name="disconnectpumpfor1h">Dhícheangal Caidéil do 1 u</string>
+    <string name="disconnectpumpfor2h">Dhícheangal Caidéil do 2 u</string>
+    <string name="disconnectpumpfor3h">Dhícheangal Caidéil do 3 u</string>
+    <string name="disconnectpumpfor30m">Dhícheangal Caidéil do 30 nóim</string>
+    <string name="disconnecting">Dícheangal</string>
+    <string name="nl_lang">Ollainnis</string>
+    <string name="free_peak_oref">Free-Peak Oref</string>
+    <string name="about_link_urls">"  http://www.androidaps.org http://www.androidaps.de (de)  facebook: http://facebook.androidaps.org http://facebook.androidaps.de (de)"</string>
+    <string name="it_lang">Iodáilis</string>
+    <string name="ko_lang">Cóiréis</string>
+    <string name="loop">Lúb</string>
+    <string name="configbuilder_loop">Lúb</string>
+    <string name="loop_shortname">LÚB</string>
+    <string name="emptyreservoir">Taiscumar folamh</string>
+    <string name="openapsma_glucosestatus_label">Glúcóis stádas</string>
+    <string name="de_lang">Gearmáinis</string>
+    <string name="Glimp">Glimp</string>
+    <string name="combo_history">Stair</string>
+    <string name="loopenabled">Lúb cumasaithe</string>
+    <string name="key_ns_create_announcements_from_errors">ns_create_announcements_from_errors</string>
+    <string name="nsclientinternal_shortname">NSCI</string>
+    <string name="nsclientinternal_secret_dialogtitle">NS API secret</string>
+    <string name="nsclientinternal_secret_title">NS API secret</string>
+    <string name="openloop">Lúb oscailte</string>
+    <string name="careportal_newnstreatment_percent_label">Faoin gcéad</string>
+    <string name="percent">Faoin gcéad</string>
+    <string name="rapid_acting_oref">Rapid-Acting Oref</string>
+    <string name="danar_refill">athlán</string>
+    <string name="danar_history_refill">Athlán</string>
+    <string name="danar_historyreload">Athlódáil</string>
+    <string name="reloadprofile">Athlódáil próifíl</string>
+    <string name="ro_lang">Rómáinis</string>
+    <string name="ru_lang">Rúisis</string>
+    <string name="sensitivityoref0">Sensitivity Oref0</string>
+    <string name="es_lang">Spainnis</string>
+    <string name="sv_lang">Sualainnis</string>
+    <string name="teenage">Déagóirí</string>
+    <string name="treatments">Cóireálacha</string>
+    <string name="configbuilder_treatments">Cóireálacha</string>
+    <string name="visible">Infheicthe</string>
+    <string name="overview_editquickwizard_valid">Bailí:</string>
+    <string name="objectives_button_verify">Fhíorú</string>
+    <string formated="false" name="loopsuspendedfor">Ar fionraí (%d n)</string>
+    <string name="combo_pump_state_suspended_by_user">Ar fionraí ag úsáideoir</string>
+    <string name="objectives_1_objective">Tosaigh ag lúb oscailte</string>
+    <string name="status">Stádas:</string>
+    <string name="combo_pump_state_label">Stáit</string>
+    <string name="overview_bolusprogress_stoped">Stopadh</string>
+    <string name="serialnumber">Sraithuimhir</string>
+    <string name="combo_pump_action_refreshing">Athnuaigh</string>
+    <string name="combo_activity_checking_pump_state">Athnuaigh caidéil stáit</string>
+    <string name="combo_pump_never_connected">Riamh</string>
+    <string name="combo_pump_state_initializing">Tosaithe</string>
+    <string name="combo_reservoir_normal">Gnáth</string>
+    <string formated="false" name="combo_tdd_average">Meán: %3.1f A</string>
+    <string formated="false" name="combo_tdd_maximum">Uasmhéid: %3.1f A</string>
+    <string formated="false" name="combo_tdd_minimum">Íosmhéid: %3.1f A</string>
+    <string name="combo_pump_state_suspended_due_to_error">Ar fionraí ag earráid</string>
+    <string name="initializing">Tosaithe ...</string>
+    <string name="combo_actvity_reading_basal_profile">Léigh próifíl bunaidh</string>
+    <string name="combo_activity_reading_pump_history">Léigh stair caidéil</string>
+    <string name="enabled">Cumasaithe</string>
+    <string formated="false" name="combo_pump_action_setting_tbr">Socrú BRS (%d%% / %d nóim)</string>
+    <string name="combo_pump_action_initializing">Tosaithe</string>
+    <string name="combo_pump_action_cancelling_tbr">Cealú BRS</string>
+    <string name="combo_pump_battery_low_warrning">Is ceallraí Caidéil íseal</string>
+    <string name="combo_pump_cartridge_low_warrning">Is leibhéal cartús íseal</string>
+    <string formated="false" name="combo_pump_action_bolusing">Ag bólas (%.1f A)</string>
+    <string name="carbs">Carbí</string>
+    <string name="careportal_newnstreatment_carbs_label">Carbí</string>
+    <string name="treatments_newtreatment_carbsamount_label">Carbí</string>
+    <string name="treatments_wizard_carbs_label">Carbí</string>
+    <string name="overview_editquickwizard_carbs">Carbí:</string>
+    <string name="treatments_carbs_label_string">Carbí:</string>
+    <string name="careportal_carbsandbolus_label">CARBÍ &amp; BÓLAS</string>
+    <string formated="false" name="danar_history_connectingfor">Ag nascadh le %d s</string>
+    <string name="circadian_percentage_profile_shortname">CPP</string>
+    <string name="comment">Tuairim</string>
+    <string name="danar_bt_name_title">DanaR Bluetooth gléas</string>
+    <string name="cs_lang">Seice</string>
+    <string name="danarkoreanpump">DanaR Cóiréis</string>
+    <string name="danar_stats">DanaR staiti</string>
+    <string name="smscommunicator_loopresumed">Lúb atógáil</string>
+    <string name="smscommunicator_loophasbeenenabled">Is lúb cumasaithe</string>
+    <string name="smscommunicator_loopisenabled">Is lúb cumasaithe</string>
+    <string name="smscommunicator_loopisdisabled">Is lúb díchumasaithe</string>
+    <string name="smscommunicator_loophasbeendisabled">Is lúb díchumasaithe</string>
+    <string name="loopsuspended">Lúb ar fionraí</string>
+    <string name="smscommunicator_loopsuspended">Lúb ar fionraí</string>
+    <string name="disabledloop">Lúb díchumasaithe</string>
+    <string name="loopdisabled">LÚB DÍCHUMASAITHE LE SRIANTA</string>
+    <string name="lowbattery">Ceallraí Íseal</string>
+    <string name="nsclientinternal_url_title">Nightscout URL</string>
+    <string name="nightscout">Nightscout</string>
+    <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
+    <string name="careportal_note">Nóta</string>
+    <string name="careportal_newnstreatment_notes_label">Nótaí</string>
+    <string name="fastactinginsulinprolonged">Fast Acting Insulin Prolonged</string>
+    <string name="DexcomG5">DexcomG5 App (patched)</string>
+    <string name="disableloop">Díchumasaigh lúb</string>
+    <string name="enableloop">Cumasaigh lúb</string>
+    <string name="objectives_gate_label_string">Geata:</string>
+    <string name="careportal_newnstreatment_glucosetype">Glúcóis cineál</string>
+    <string name="careportal_insulincartridgechange">Athrú Cartús Inslin</string>
+    <string name="invalidprofile">Próifíl neamhbhailí !!!</string>
+    <string formated="false" name="zerovalueinprofile">Próifíl neamhbhailí: %s</string>
+    <string name="pump_lastbolus_label">Bólas deiridh</string>
+    <string name="openapsma_lastrun_label">Reáchtáil deiridh</string>
+    <string name="openapsma_lastenact_label">Achtaíodh deiridh</string>
+    <string name="pump_lastconnection_label">Nasc deiridh</string>
+    <string name="sms_lastbg">GF deiridh:</string>
+    <string name="glucosetype_finger">Méar</string>
+    <string name="fastactinginsulin">Fast Acting Insulin</string>
+    <string name="danar_history_errors">Earráidí</string>
+    <string name="danar_history_dailyinsulin">Inslin lá</string>
+    <string name="danar_dailyunits">Aonaid lá</string>
+    <string name="delta">Deilte</string>
+    <string name="sms_delta">Deilte:</string>
+    <string name="prefs_delta_title">Socruithe Deilte</string>
+    <string name="app_name">AndroidAPS</string>
+    <string name="bolus">Bólas</string>
+    <string name="bolusstopped">Bólas stopadh</string>
+    <string name="bolusstopping">Ag stopadh bólas</string>
+    <string formated="false" name="bolusrequested">Ag dul a sheachadadh %.2fA</string>
+    <string name="combo_activity_setting_basal_profile">Socrú próifíl bunaidh</string>
+    <string name="combo_activity_checking_for_history_changes">Ag féachaint d\'athruithe stair</string>
+    <string formated="false" name="combo_no_pump_connection">Níl nasc le haghaidh %d nóim</string>
+    <string name="combo_notification_check_time_date">Is nuashonrú gá clog Caidéil</string>
+    <string name="combo_programming_bolus">Cláir Caidéil bólas</string>
+    <string name="combo_pump_alerts">Foláirimh</string>
+    <string name="combo_pump_activity_label">Gníomhaíocht</string>
+    <string name="treatments_activity_string">Gníom.:</string>
+    <string name="activity">Gníomhaíocht</string>
+    <string name="activity_duration">Gníomhaíocht fad</string>
+    <string name="activity_target">Gníomhaíocht sprioc</string>
+    <string name="combo_warning">Rabhadh</string>
+    <string name="danar_history">Stair le Caidéil</string>
+    <string name="dev">GLÉ</string>
+    <string name="executing">Feidhmiú</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="mdi">MDI</string>
+    <string name="nav_about">Faoi</string>
+    <string name="careportal_newnstreatment_absolute_label">Iomlán</string>
+    <string name="absolute">Iomlán</string>
+    <string name="nsprofileview_activeprofile_label">Próifíl gníomhach</string>
+    <string name="danar_history_alarm">Aláraim</string>
+    <string name="apsmode_title">APS mód</string>
+    <string name="apsselected">APS  roghnaithe</string>
+    <string name="nsprofileview_basal_label">Bunaidh</string>
+    <string name="basal">Bunaidh</string>
+    <string name="danar_stats_basalrate">Bunaidh</string>
+    <string name="sms_basal">Bunaidh:</string>
+    <string name="basalshortlabel">BUN</string>
+    <string name="basal_short">BUN</string>
+    <string name="xdripstatus_shortname">xds</string>
+    <string name="sms_bolus">Bólas:</string>
+    <string name="danar_stats_bolus">Bólas</string>
+    <string name="overview_bolus_label">Bólas</string>
+    <string name="danar_ebolus">Bólas E</string>
+    <string formated="false" name="overview_bolusprogress_goingtodeliver">Ag dul a sheachadadh %.2fA</string>
+    <string name="danar_dsbolus">Bólas DS</string>
+    <string name="danar_debolus">Bólas DE</string>
+    <string name="danar_sbolus">Bólas S</string>
+    <string name="smscommunicator_shortname">SMS</string>
+    <string name="nav_backup">Cúltaca</string>
+    <string name="basal_rate">Bunaidh ráta</string>
+    <string name="basal_step">Bunaidh Céim</string>
+    <string name="overview_newtempbasal_basaltype_label">Bunaidh cineál</string>
+    <string name="overview_newtempbasal_basalpercent">Bunaidh luach [%]</string>
+    <string name="overview_newtempbasal_basalabsolute">Bunaidh luach [A/u]</string>
+    <string name="pump_basebasalrate_label">Bunaidh ráta bonn</string>
+    <string name="base_profile_label">Próifíl bonn</string>
+    <string formated="false" name="bolusdelivered">Seachadta %.2fA Bólas go rathúil</string>
+    <string formated="false" name="smscommunicator_bolusdelivered">Seachadta %.2fA Bólas go rathúil</string>
+    <string name="bolus_step">Bólas Céim</string>
+    <string name="danar_history_bolus">Bólasi</string>
+    <string name="canceltemp">Cealú BRS</string>
+    <string name="smscommunicator_tempbasalcancelfailed">Cealú BRS teip</string>
+    <string name="overview_insulin_label">Inslin</string>
+    <string name="insightpump_shortname">Insight</string>
+    <string name="food_short">Bia</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 8dd6a763a2..69d45e1d7f 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -16,6 +16,7 @@
         <item>@string/cs_lang</item>
         <item>@string/de_lang</item>
         <item>@string/fr_lang</item>
+        <item>@string/ga_lang</item>
         <item>@string/nl_lang</item>
         <item>@string/es_lang</item>
         <item>@string/el_lang</item>
@@ -33,6 +34,7 @@
         <item>cs</item>
         <item>de</item>
         <item>fr</item>
+        <item>ga</item>
         <item>nl</item>
         <item>es</item>
         <item>el</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6a56539ba2..ec3858a31c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1036,6 +1036,7 @@
     <string name="openapsama_current_basal_safety_multiplier">Current basal safety multiplier</string>
     <string name="value_unavailable_short">n/a</string>
     <string name="ns_autobackfill_title">Autobackfill BG</string>
+    <string name="ga_lang">Irish</string>
     <string name="wear_wizard_settings">Wizard Settings</string>
     <string translatable="false" name="key_wearwizard_bg">wearwizard_bg</string>
     <string translatable="false" name="key_wearwizard_trend">wearwizard_trend</string>