diff --git a/morechoice/lang/C/messages.po b/morechoice/lang/C/messages.po
index e69de29bb..ac0af5614 100644
--- a/morechoice/lang/C/messages.po
+++ b/morechoice/lang/C/messages.po
@@ -0,0 +1,338 @@
+# ADDON morechoice
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica morechoice addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-07 15:04+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: morechoice.php:34
+msgid "Androgyne"
+msgstr ""
+
+#: morechoice.php:35
+msgid "Bear"
+msgstr ""
+
+#: morechoice.php:36
+msgid "Bigender"
+msgstr ""
+
+#: morechoice.php:37
+msgid "Cross dresser"
+msgstr ""
+
+#: morechoice.php:38
+msgid "Drag queen"
+msgstr ""
+
+#: morechoice.php:39
+msgid "Eunuch"
+msgstr ""
+
+#: morechoice.php:40
+msgid "Faux queen"
+msgstr ""
+
+#: morechoice.php:41
+msgid "Gender fluid"
+msgstr ""
+
+#: morechoice.php:42
+msgid "Kathoey"
+msgstr ""
+
+#: morechoice.php:43
+msgid "Lady"
+msgstr ""
+
+#: morechoice.php:44
+msgid "Lipstick lesbian"
+msgstr ""
+
+#: morechoice.php:45
+msgid "Metrosexual"
+msgstr ""
+
+#: morechoice.php:46
+msgid "Monk"
+msgstr ""
+
+#: morechoice.php:47
+msgid "Nun"
+msgstr ""
+
+#: morechoice.php:48
+msgid "Soft butch"
+msgstr ""
+
+#: morechoice.php:49
+msgid "Stone femme"
+msgstr ""
+
+#: morechoice.php:50
+msgid "Tomboy"
+msgstr ""
+
+#: morechoice.php:51
+msgid "Transman"
+msgstr ""
+
+#: morechoice.php:52
+msgid "Transwoman"
+msgstr ""
+
+#: morechoice.php:53
+msgid "Transvesti"
+msgstr ""
+
+#: morechoice.php:54
+msgid "Trigender"
+msgstr ""
+
+#: morechoice.php:55
+msgid "Can't remember"
+msgstr ""
+
+#: morechoice.php:56
+msgid "Hard to tell these days"
+msgstr ""
+
+#: morechoice.php:60
+msgid "Girls with big tits"
+msgstr ""
+
+#: morechoice.php:61
+msgid "Millionaires"
+msgstr ""
+
+#: morechoice.php:62
+msgid "Guys with big schlongs"
+msgstr ""
+
+#: morechoice.php:63
+msgid "Easy women"
+msgstr ""
+
+#: morechoice.php:64
+msgid "People with impaired mobility"
+msgstr ""
+
+#: morechoice.php:65
+msgid "Amputees"
+msgstr ""
+
+#: morechoice.php:66
+msgid "Statues, mannequins and immobility"
+msgstr ""
+
+#: morechoice.php:67
+msgid "Pain"
+msgstr ""
+
+#: morechoice.php:68
+msgid "Trans men"
+msgstr ""
+
+#: morechoice.php:69
+msgid "Older women"
+msgstr ""
+
+#: morechoice.php:70
+msgid "Asphyxiation"
+msgstr ""
+
+#: morechoice.php:71
+msgid "In public"
+msgstr ""
+
+#: morechoice.php:72
+msgid "In danger"
+msgstr ""
+
+#: morechoice.php:73
+msgid "Pretending to be male"
+msgstr ""
+
+#: morechoice.php:74
+msgid "Pretending to be female"
+msgstr ""
+
+#: morechoice.php:75
+msgid "Breats"
+msgstr ""
+
+#: morechoice.php:76
+msgid "Scat"
+msgstr ""
+
+#: morechoice.php:77
+msgid "Crying"
+msgstr ""
+
+#: morechoice.php:78
+msgid "Nappies/Diapers"
+msgstr ""
+
+#: morechoice.php:79
+msgid "Trees"
+msgstr ""
+
+#: morechoice.php:80
+msgid "Vomit"
+msgstr ""
+
+#: morechoice.php:81
+msgid "Murder"
+msgstr ""
+
+#: morechoice.php:82
+msgid "Fat people"
+msgstr ""
+
+#: morechoice.php:83
+msgid "Feet"
+msgstr ""
+
+#: morechoice.php:84
+msgid "Covered in insects"
+msgstr ""
+
+#: morechoice.php:85
+msgid "Turning a human being into furniture"
+msgstr ""
+
+#: morechoice.php:86
+msgid "Elderly people"
+msgstr ""
+
+#: morechoice.php:87
+msgid "Transgender people"
+msgstr ""
+
+#: morechoice.php:88
+msgid "Criminals"
+msgstr ""
+
+#: morechoice.php:89
+msgid "Stealing"
+msgstr ""
+
+#: morechoice.php:90
+msgid "Breast milk"
+msgstr ""
+
+#: morechoice.php:91
+msgid "Immersing genitals in liquids"
+msgstr ""
+
+#: morechoice.php:92
+msgid "Giants"
+msgstr ""
+
+#: morechoice.php:93
+msgid "Masochism"
+msgstr ""
+
+#: morechoice.php:94
+msgid "Cars"
+msgstr ""
+
+#: morechoice.php:95
+msgid "Menstruation"
+msgstr ""
+
+#: morechoice.php:96
+msgid "Mucus"
+msgstr ""
+
+#: morechoice.php:97
+msgid "Obscene language"
+msgstr ""
+
+#: morechoice.php:98
+msgid "Noses"
+msgstr ""
+
+#: morechoice.php:99
+msgid "Navels"
+msgstr ""
+
+#: morechoice.php:100
+msgid "Corpses"
+msgstr ""
+
+#: morechoice.php:101
+msgid "Smells"
+msgstr ""
+
+#: morechoice.php:102
+msgid "Buttocks"
+msgstr ""
+
+#: morechoice.php:103
+msgid "Nonliving objects"
+msgstr ""
+
+#: morechoice.php:104
+msgid "Sleeping people"
+msgstr ""
+
+#: morechoice.php:105
+msgid "Urination"
+msgstr ""
+
+#: morechoice.php:106
+msgid "Eating people"
+msgstr ""
+
+#: morechoice.php:107
+msgid "Being eaten"
+msgstr ""
+
+#: morechoice.php:108
+msgid "Animals"
+msgstr ""
+
+#: morechoice.php:109
+msgid "I'd rather just have some chocolate"
+msgstr ""
+
+#: morechoice.php:113
+msgid "Married to my job"
+msgstr ""
+
+#: morechoice.php:114
+msgid "Polygamist"
+msgstr ""
+
+#: morechoice.php:115
+msgid "Half married"
+msgstr ""
+
+#: morechoice.php:116
+msgid "Living in the past"
+msgstr ""
+
+#: morechoice.php:117
+msgid "Pretending to be over my ex"
+msgstr ""
+
+#: morechoice.php:118
+msgid "Hurt in the past"
+msgstr ""
+
+#: morechoice.php:119
+msgid "Wallowing in self-pity"
+msgstr ""
diff --git a/morechoice/morechoice.php b/morechoice/morechoice.php
index 0d929430b..0d7f6fae8 100644
--- a/morechoice/morechoice.php
+++ b/morechoice/morechoice.php
@@ -30,99 +30,91 @@ function morechoice_uninstall() {
 
 }
 
-// We aren't going to bother translating these to other languages.
-
 function morechoice_gender_selector($a,&$b) {
-	if(Config::get('system', 'language') == 'en') {
-		$b[] = 'Androgyne';
-		$b[] = 'Bear';
-		$b[] = 'Bigender';
-		$b[] = 'Cross dresser';
-		$b[] = 'Drag queen';
-		$b[] = 'Eunuch';
-		$b[] = 'Faux queen';
-		$b[] = 'Gender fluid';
-		$b[] = 'Kathoey';
-		$b[] = 'Lady';
-		$b[] = 'Lipstick lesbian';
-		$b[] = 'Metrosexual';
-		$b[] = 'Monk';
-		$b[] = 'Nun';
-		$b[] = 'Soft butch';
-		$b[] = 'Stone femme';
-		$b[] = 'Tomboy';
-		$b[] = 'Transman';
-		$b[] = 'Transwoman';
-		$b[] = 'Transvesti';
-		$b[] = 'Trigender';
-		$b[] = 'Can\'t remember';
-		$b[] = 'Hard to tell these days';
-	}
+	$b[] = L10n::t('Androgyne');
+	$b[] = L10n::t('Bear');
+	$b[] = L10n::t('Bigender');
+	$b[] = L10n::t('Cross dresser');
+	$b[] = L10n::t('Drag queen');
+	$b[] = L10n::t('Eunuch');
+	$b[] = L10n::t('Faux queen');
+	$b[] = L10n::t('Gender fluid');
+	$b[] = L10n::t('Kathoey');
+	$b[] = L10n::t('Lady');
+	$b[] = L10n::t('Lipstick lesbian');
+	$b[] = L10n::t('Metrosexual');
+	$b[] = L10n::t('Monk');
+	$b[] = L10n::t('Nun');
+	$b[] = L10n::t('Soft butch');
+	$b[] = L10n::t('Stone femme');
+	$b[] = L10n::t('Tomboy');
+	$b[] = L10n::t('Transman');
+	$b[] = L10n::t('Transwoman');
+	$b[] = L10n::t('Transvesti');
+	$b[] = L10n::t('Trigender');
+	$b[] = L10n::t('Can\'t remember');
+	$b[] = L10n::t('Hard to tell these days');
 }
 
 function morechoice_sexpref_selector($a,&$b) {
-	if(Config::get('system', 'language') == 'en') {
-		$b[] = 'Girls with big tits';
-		$b[] = 'Millionaires';
-		$b[] = 'Guys with big schlongs';
-		$b[] = 'Easy women';
-		$b[] = 'People with impaired mobility';
-		$b[] = 'Amputees';
-		$b[] = 'Statues, mannequins and immobility';
-		$b[] = 'Pain';
-		$b[] = 'Trans men';
-		$b[] = 'Older women';
-		$b[] = 'Asphyxiation';
-		$b[] = 'In public';
-		$b[] = 'In danger';
-		$b[] = 'Pretending to be male';
-		$b[] = 'Pretending to be female';
-		$b[] = 'Breats';
-		$b[] = 'Scat';
-		$b[] = 'Crying';
-		$b[] = 'Nappies/Diapers';
-		$b[] = 'Trees';
-		$b[] = 'Vomit';
-		$b[] = 'Murder';
-		$b[] = 'Fat people';
-		$b[] = 'Feet';
-		$b[] = 'Covered in insects';
-		$b[] = 'Turning a human being into furniture';
-		$b[] = 'Elderly people';
-		$b[] = 'Transgender people';
-		$b[] = 'Criminals';
-		$b[] = 'Stealing';
-		$b[] = 'Breast milk';
-		$b[] = 'Immersing genitals in liquids';
-		$b[] = 'Giants';
-		$b[] = 'Masochism';
-		$b[] = 'Cars';
-		$b[] = 'Menstruation';
-		$b[] = 'Mucus';
-		$b[] = 'Obscene language';
-		$b[] = 'Noses';
-		$b[] = 'Navels';
-		$b[] = 'Corpses';
-		$b[] = 'Smells';
-		$b[] = 'Buttocks';
-		$b[] = 'Nonliving objects';
-		$b[] = 'Sleeping people';
-		$b[] = 'Urination';
-		$b[] = 'Eating people';
-		$b[] = 'Being eaten';
-		$b[] = 'Animals';
-		$b[] = 'I\'d rather just have some chocolate';
-	}
+	$b[] = L10n::t('Girls with big tits');
+	$b[] = L10n::t('Millionaires');
+	$b[] = L10n::t('Guys with big schlongs');
+	$b[] = L10n::t('Easy women');
+	$b[] = L10n::t('People with impaired mobility');
+	$b[] = L10n::t('Amputees');
+	$b[] = L10n::t('Statues, mannequins and immobility');
+	$b[] = L10n::t('Pain');
+	$b[] = L10n::t('Trans men');
+	$b[] = L10n::t('Older women');
+	$b[] = L10n::t('Asphyxiation');
+	$b[] = L10n::t('In public');
+	$b[] = L10n::t('In danger');
+	$b[] = L10n::t('Pretending to be male');
+	$b[] = L10n::t('Pretending to be female');
+	$b[] = L10n::t('Breats');
+	$b[] = L10n::t('Scat');
+	$b[] = L10n::t('Crying');
+	$b[] = L10n::t('Nappies/Diapers');
+	$b[] = L10n::t('Trees');
+	$b[] = L10n::t('Vomit');
+	$b[] = L10n::t('Murder');
+	$b[] = L10n::t('Fat people');
+	$b[] = L10n::t('Feet');
+	$b[] = L10n::t('Covered in insects');
+	$b[] = L10n::t('Turning a human being into furniture');
+	$b[] = L10n::t('Elderly people');
+	$b[] = L10n::t('Transgender people');
+	$b[] = L10n::t('Criminals');
+	$b[] = L10n::t('Stealing');
+	$b[] = L10n::t('Breast milk');
+	$b[] = L10n::t('Immersing genitals in liquids');
+	$b[] = L10n::t('Giants');
+	$b[] = L10n::t('Masochism');
+	$b[] = L10n::t('Cars');
+	$b[] = L10n::t('Menstruation');
+	$b[] = L10n::t('Mucus');
+	$b[] = L10n::t('Obscene language');
+	$b[] = L10n::t('Noses');
+	$b[] = L10n::t('Navels');
+	$b[] = L10n::t('Corpses');
+	$b[] = L10n::t('Smells');
+	$b[] = L10n::t('Buttocks');
+	$b[] = L10n::t('Nonliving objects');
+	$b[] = L10n::t('Sleeping people');
+	$b[] = L10n::t('Urination');
+	$b[] = L10n::t('Eating people');
+	$b[] = L10n::t('Being eaten');
+	$b[] = L10n::t('Animals');
+	$b[] = L10n::t('I\'d rather just have some chocolate');
 }
 
 function morechoice_marital_selector($a,&$b) {
-	if(Config::get('system', 'language') == 'en') {
-		$b[] = 'Married to my job';
-		$b[] = 'Polygamist';
-		$b[] = 'Half married';
-		$b[] = 'Living in the past';
-		$b[] = 'Pretending to be over my ex';
-		$b[] = 'Hurt in the past';
-		$b[] = 'Wallowing in self-pity';
-	}
+	$b[] = L10n::t('Married to my job');
+	$b[] = L10n::t('Polygamist');
+	$b[] = L10n::t('Half married');
+	$b[] = L10n::t('Living in the past');
+	$b[] = L10n::t('Pretending to be over my ex');
+	$b[] = L10n::t('Hurt in the past');
+	$b[] = L10n::t('Wallowing in self-pity');
 }
\ No newline at end of file