Merge branch 'develop' into bugfix/core-GS-5596

This commit is contained in:
Jeroen De Meerleer 2018-12-20 17:31:35 +01:00
commit 5535fa9fd2
867 changed files with 24122 additions and 2186 deletions

View file

@ -64,7 +64,7 @@ msgstr ""
#: morechoice.php:45
msgid "Metrosexual"
msgstr ""
msgstr "Metrosexuál"
#: morechoice.php:46
msgid "Monk"
@ -112,7 +112,7 @@ msgstr "Těžké říct touhle dobou"
#: morechoice.php:60
msgid "Girls with big tits"
msgstr ""
msgstr "Holky s velkýma kozama"
#: morechoice.php:61
msgid "Millionaires"
@ -120,11 +120,11 @@ msgstr "Milionáři"
#: morechoice.php:62
msgid "Guys with big schlongs"
msgstr ""
msgstr "Chlapi s velkýma ptákama"
#: morechoice.php:63
msgid "Easy women"
msgstr ""
msgstr "Lehké ženy"
#: morechoice.php:64
msgid "People with impaired mobility"
@ -132,7 +132,7 @@ msgstr "Lidé s pohybovým postižením"
#: morechoice.php:65
msgid "Amputees"
msgstr ""
msgstr "Amputovaní"
#: morechoice.php:66
msgid "Statues, mannequins and immobility"
@ -144,7 +144,7 @@ msgstr "Bolest"
#: morechoice.php:68
msgid "Trans men"
msgstr "Transmuž"
msgstr "Transmuži"
#: morechoice.php:69
msgid "Older women"
@ -164,11 +164,11 @@ msgstr "V nebezpečí"
#: morechoice.php:73
msgid "Pretending to be male"
msgstr "Předstírám, že jsem muž"
msgstr "Předstírají, že jsou muži"
#: morechoice.php:74
msgid "Pretending to be female"
msgstr "Předstírám, že jsem žena"
msgstr "Předstírají, že jsou ženy"
#: morechoice.php:75
msgid "Breats"
@ -180,11 +180,11 @@ msgstr ""
#: morechoice.php:77
msgid "Crying"
msgstr "Pláču"
msgstr "Pláčí"
#: morechoice.php:78
msgid "Nappies/Diapers"
msgstr ""
msgstr "Plenky"
#: morechoice.php:79
msgid "Trees"
@ -208,11 +208,11 @@ msgstr "Nohy"
#: morechoice.php:84
msgid "Covered in insects"
msgstr "Pokryt/a hmyzem"
msgstr "Pokryti hmyzem"
#: morechoice.php:85
msgid "Turning a human being into furniture"
msgstr ""
msgstr "Mění lidské bytosti v nábytek"
#: morechoice.php:86
msgid "Elderly people"
@ -228,7 +228,7 @@ msgstr "Zločinci"
#: morechoice.php:89
msgid "Stealing"
msgstr ""
msgstr "Kradou"
#: morechoice.php:90
msgid "Breast milk"
@ -252,7 +252,7 @@ msgstr "Auto"
#: morechoice.php:95
msgid "Menstruation"
msgstr ""
msgstr "Menstruace"
#: morechoice.php:96
msgid "Mucus"
@ -268,15 +268,15 @@ msgstr "Nosy"
#: morechoice.php:99
msgid "Navels"
msgstr ""
msgstr "Pupky"
#: morechoice.php:100
msgid "Corpses"
msgstr ""
msgstr "Mrtvoly"
#: morechoice.php:101
msgid "Smells"
msgstr ""
msgstr "Pachy"
#: morechoice.php:102
msgid "Buttocks"
@ -296,7 +296,7 @@ msgstr "Močení"
#: morechoice.php:106
msgid "Eating people"
msgstr ""
msgstr "Žerou lidi"
#: morechoice.php:107
msgid "Being eaten"
@ -316,7 +316,7 @@ msgstr ""
#: morechoice.php:114
msgid "Polygamist"
msgstr ""
msgstr "Polygamist(k)a"
#: morechoice.php:115
msgid "Half married"

View file

@ -17,7 +17,7 @@ $a->strings["Gender fluid"] = "";
$a->strings["Kathoey"] = "";
$a->strings["Lady"] = "Dáma";
$a->strings["Lipstick lesbian"] = "";
$a->strings["Metrosexual"] = "";
$a->strings["Metrosexual"] = "Metrosexuál";
$a->strings["Monk"] = "Mnich";
$a->strings["Nun"] = "Jeptiška";
$a->strings["Soft butch"] = "";
@ -29,58 +29,58 @@ $a->strings["Transvesti"] = "Transvestita";
$a->strings["Trigender"] = "";
$a->strings["Can't remember"] = "Nepamatuju si";
$a->strings["Hard to tell these days"] = "Těžké říct touhle dobou";
$a->strings["Girls with big tits"] = "";
$a->strings["Girls with big tits"] = "Holky s velkýma kozama";
$a->strings["Millionaires"] = "Milionáři";
$a->strings["Guys with big schlongs"] = "";
$a->strings["Easy women"] = "";
$a->strings["Guys with big schlongs"] = "Chlapi s velkýma ptákama";
$a->strings["Easy women"] = "Lehké ženy";
$a->strings["People with impaired mobility"] = "Lidé s pohybovým postižením";
$a->strings["Amputees"] = "";
$a->strings["Amputees"] = "Amputovaní";
$a->strings["Statues, mannequins and immobility"] = "Sochy, figuríny a nepohyblivost";
$a->strings["Pain"] = "Bolest";
$a->strings["Trans men"] = "Transmuž";
$a->strings["Trans men"] = "Transmuži";
$a->strings["Older women"] = "Starší ženy";
$a->strings["Asphyxiation"] = "";
$a->strings["In public"] = "Na veřejnosti";
$a->strings["In danger"] = "V nebezpečí";
$a->strings["Pretending to be male"] = "Předstírám, že jsem muž";
$a->strings["Pretending to be female"] = "Předstírám, že jsem žena";
$a->strings["Pretending to be male"] = "Předstírají, že jsou muži";
$a->strings["Pretending to be female"] = "Předstírají, že jsou ženy";
$a->strings["Breats"] = "";
$a->strings["Scat"] = "";
$a->strings["Crying"] = "Pláču";
$a->strings["Nappies/Diapers"] = "";
$a->strings["Crying"] = "Pláčí";
$a->strings["Nappies/Diapers"] = "Plenky";
$a->strings["Trees"] = "Stromy";
$a->strings["Vomit"] = "Zvracení";
$a->strings["Murder"] = "Vražda";
$a->strings["Fat people"] = "Tlustí lidé";
$a->strings["Feet"] = "Nohy";
$a->strings["Covered in insects"] = "Pokryt/a hmyzem";
$a->strings["Turning a human being into furniture"] = "";
$a->strings["Covered in insects"] = "Pokryti hmyzem";
$a->strings["Turning a human being into furniture"] = "Mění lidské bytosti v nábytek";
$a->strings["Elderly people"] = "Postarší lidé";
$a->strings["Transgender people"] = "Transgenderoví lidé";
$a->strings["Criminals"] = "Zločinci";
$a->strings["Stealing"] = "";
$a->strings["Stealing"] = "Kradou";
$a->strings["Breast milk"] = "";
$a->strings["Immersing genitals in liquids"] = "";
$a->strings["Giants"] = "Obři";
$a->strings["Masochism"] = "Masochismus";
$a->strings["Cars"] = "Auto";
$a->strings["Menstruation"] = "";
$a->strings["Menstruation"] = "Menstruace";
$a->strings["Mucus"] = "";
$a->strings["Obscene language"] = "Sprostý jazyk";
$a->strings["Noses"] = "Nosy";
$a->strings["Navels"] = "";
$a->strings["Corpses"] = "";
$a->strings["Smells"] = "";
$a->strings["Navels"] = "Pupky";
$a->strings["Corpses"] = "Mrtvoly";
$a->strings["Smells"] = "Pachy";
$a->strings["Buttocks"] = "";
$a->strings["Nonliving objects"] = "Neživoucí předměty";
$a->strings["Sleeping people"] = "Spící lidé";
$a->strings["Urination"] = "Močení";
$a->strings["Eating people"] = "";
$a->strings["Eating people"] = "Žerou lidi";
$a->strings["Being eaten"] = "";
$a->strings["Animals"] = "Zvířata";
$a->strings["I'd rather just have some chocolate"] = "Radši bych si prostě dal čokoládu";
$a->strings["Married to my job"] = "";
$a->strings["Polygamist"] = "";
$a->strings["Polygamist"] = "Polygamist(k)a";
$a->strings["Half married"] = "Napůl ženatý/vdaná";
$a->strings["Living in the past"] = "Žiju v minulosti";
$a->strings["Pretending to be over my ex"] = "";

View file

@ -3,14 +3,18 @@
# This file is distributed under the same license as the Friendica morechoice addon package.
#
#
# Translators:
# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
# Vinzenz Vietzke <vinz@vinzv.de>, 2018
#
#, 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: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018\n"
"PO-Revision-Date: 2018-08-07 18:18+0000\n"
"Last-Translator: Vinzenz Vietzke <vinz@vinzv.de>, 2018\n"
"Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -120,7 +124,7 @@ msgstr "Millionäre"
#: morechoice.php:62
msgid "Guys with big schlongs"
msgstr ""
msgstr "Typen mit großen Schwänzen"
#: morechoice.php:63
msgid "Easy women"
@ -236,7 +240,7 @@ msgstr "Muttermilch"
#: morechoice.php:91
msgid "Immersing genitals in liquids"
msgstr ""
msgstr "Eintauchen von Genitalien in Flüssigkeiten"
#: morechoice.php:92
msgid "Giants"
@ -292,11 +296,11 @@ msgstr "Schlafende Personen"
#: morechoice.php:105
msgid "Urination"
msgstr ""
msgstr "Urinieren"
#: morechoice.php:106
msgid "Eating people"
msgstr ""
msgstr "Essende Menschen"
#: morechoice.php:107
msgid "Being eaten"

View file

@ -31,7 +31,7 @@ $a->strings["Can't remember"] = "Kann mich nicht erinnern";
$a->strings["Hard to tell these days"] = "Schwer zu sagen dieser Tage";
$a->strings["Girls with big tits"] = "Mädels mit großen Brüsten";
$a->strings["Millionaires"] = "Millionäre";
$a->strings["Guys with big schlongs"] = "";
$a->strings["Guys with big schlongs"] = "Typen mit großen Schwänzen";
$a->strings["Easy women"] = "Leichte Frauen";
$a->strings["People with impaired mobility"] = "Menschen mit eingeschränkter Mobilität";
$a->strings["Amputees"] = "Amputierte";
@ -60,7 +60,7 @@ $a->strings["Transgender people"] = "Transgender Personen";
$a->strings["Criminals"] = "Kriminelle";
$a->strings["Stealing"] = "Stehlen";
$a->strings["Breast milk"] = "Muttermilch";
$a->strings["Immersing genitals in liquids"] = "";
$a->strings["Immersing genitals in liquids"] = "Eintauchen von Genitalien in Flüssigkeiten";
$a->strings["Giants"] = "Riesen";
$a->strings["Masochism"] = "Masochismus";
$a->strings["Cars"] = "Autos";
@ -74,8 +74,8 @@ $a->strings["Smells"] = "Gerüche";
$a->strings["Buttocks"] = "Hintern";
$a->strings["Nonliving objects"] = "Leblose Objekte";
$a->strings["Sleeping people"] = "Schlafende Personen";
$a->strings["Urination"] = "";
$a->strings["Eating people"] = "";
$a->strings["Urination"] = "Urinieren";
$a->strings["Eating people"] = "Essende Menschen";
$a->strings["Being eaten"] = "Verspeist zu werden";
$a->strings["Animals"] = "Tiere";
$a->strings["I'd rather just have some chocolate"] = "Ich bevorzuge eine Tafel Schokolade";

View file

@ -0,0 +1,342 @@
# ADDON morechoice
# Copyright (C)
# This file is distributed under the same license as the Friendica morechoice addon package.
#
#
# Translators:
# Marie Olive <lacellule101@gmail.com>, 2018
#
#, 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: 2018-08-07 18:18+0000\n"
"Last-Translator: Marie Olive <lacellule101@gmail.com>, 2018\n"
"Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: morechoice.php:34
msgid "Androgyne"
msgstr "Androgyne"
#: morechoice.php:35
msgid "Bear"
msgstr "Ours"
#: morechoice.php:36
msgid "Bigender"
msgstr "Bigenre"
#: morechoice.php:37
msgid "Cross dresser"
msgstr ""
#: morechoice.php:38
msgid "Drag queen"
msgstr "drag queen"
#: morechoice.php:39
msgid "Eunuch"
msgstr "eunuque"
#: morechoice.php:40
msgid "Faux queen"
msgstr ""
#: morechoice.php:41
msgid "Gender fluid"
msgstr "genre fluide"
#: 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 "métrosexuel"
#: morechoice.php:46
msgid "Monk"
msgstr "moine"
#: morechoice.php:47
msgid "Nun"
msgstr "religieuse"
#: 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 "homme trans"
#: morechoice.php:52
msgid "Transwoman"
msgstr "femme trans"
#: morechoice.php:53
msgid "Transvesti"
msgstr "travesti"
#: morechoice.php:54
msgid "Trigender"
msgstr "trigenre"
#: morechoice.php:55
msgid "Can't remember"
msgstr "Ne se rappelle pas"
#: morechoice.php:56
msgid "Hard to tell these days"
msgstr "Difficile à dire en ce moment"
#: morechoice.php:60
msgid "Girls with big tits"
msgstr "Filles à gros seins"
#: morechoice.php:61
msgid "Millionaires"
msgstr "Millionnaires"
#: morechoice.php:62
msgid "Guys with big schlongs"
msgstr ""
#: morechoice.php:63
msgid "Easy women"
msgstr "Femmes faciles"
#: morechoice.php:64
msgid "People with impaired mobility"
msgstr "Personnes à mobilité réduite"
#: morechoice.php:65
msgid "Amputees"
msgstr "Amputés"
#: morechoice.php:66
msgid "Statues, mannequins and immobility"
msgstr ""
#: morechoice.php:67
msgid "Pain"
msgstr "Douleur"
#: morechoice.php:68
msgid "Trans men"
msgstr "Hommes trans"
#: 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 ""

View file

@ -0,0 +1,88 @@
<?php
if(! function_exists("string_plural_select_fr")) {
function string_plural_select_fr($n){
$n = intval($n);
return ($n > 1);;
}}
;
$a->strings["Androgyne"] = "Androgyne";
$a->strings["Bear"] = "Ours";
$a->strings["Bigender"] = "Bigenre";
$a->strings["Cross dresser"] = "";
$a->strings["Drag queen"] = "drag queen";
$a->strings["Eunuch"] = "eunuque";
$a->strings["Faux queen"] = "";
$a->strings["Gender fluid"] = "genre fluide";
$a->strings["Kathoey"] = "";
$a->strings["Lady"] = "";
$a->strings["Lipstick lesbian"] = "";
$a->strings["Metrosexual"] = "métrosexuel";
$a->strings["Monk"] = "moine";
$a->strings["Nun"] = "religieuse";
$a->strings["Soft butch"] = "";
$a->strings["Stone femme"] = "";
$a->strings["Tomboy"] = "";
$a->strings["Transman"] = "homme trans";
$a->strings["Transwoman"] = "femme trans";
$a->strings["Transvesti"] = "travesti";
$a->strings["Trigender"] = "trigenre";
$a->strings["Can't remember"] = "Ne se rappelle pas";
$a->strings["Hard to tell these days"] = "Difficile à dire en ce moment";
$a->strings["Girls with big tits"] = "Filles à gros seins";
$a->strings["Millionaires"] = "Millionnaires";
$a->strings["Guys with big schlongs"] = "";
$a->strings["Easy women"] = "Femmes faciles";
$a->strings["People with impaired mobility"] = "Personnes à mobilité réduite";
$a->strings["Amputees"] = "Amputés";
$a->strings["Statues, mannequins and immobility"] = "";
$a->strings["Pain"] = "Douleur";
$a->strings["Trans men"] = "Hommes trans";
$a->strings["Older women"] = "";
$a->strings["Asphyxiation"] = "";
$a->strings["In public"] = "";
$a->strings["In danger"] = "";
$a->strings["Pretending to be male"] = "";
$a->strings["Pretending to be female"] = "";
$a->strings["Breats"] = "";
$a->strings["Scat"] = "";
$a->strings["Crying"] = "";
$a->strings["Nappies/Diapers"] = "";
$a->strings["Trees"] = "";
$a->strings["Vomit"] = "";
$a->strings["Murder"] = "";
$a->strings["Fat people"] = "";
$a->strings["Feet"] = "";
$a->strings["Covered in insects"] = "";
$a->strings["Turning a human being into furniture"] = "";
$a->strings["Elderly people"] = "";
$a->strings["Transgender people"] = "";
$a->strings["Criminals"] = "";
$a->strings["Stealing"] = "";
$a->strings["Breast milk"] = "";
$a->strings["Immersing genitals in liquids"] = "";
$a->strings["Giants"] = "";
$a->strings["Masochism"] = "";
$a->strings["Cars"] = "";
$a->strings["Menstruation"] = "";
$a->strings["Mucus"] = "";
$a->strings["Obscene language"] = "";
$a->strings["Noses"] = "";
$a->strings["Navels"] = "";
$a->strings["Corpses"] = "";
$a->strings["Smells"] = "";
$a->strings["Buttocks"] = "";
$a->strings["Nonliving objects"] = "";
$a->strings["Sleeping people"] = "";
$a->strings["Urination"] = "";
$a->strings["Eating people"] = "";
$a->strings["Being eaten"] = "";
$a->strings["Animals"] = "";
$a->strings["I'd rather just have some chocolate"] = "";
$a->strings["Married to my job"] = "";
$a->strings["Polygamist"] = "";
$a->strings["Half married"] = "";
$a->strings["Living in the past"] = "";
$a->strings["Pretending to be over my ex"] = "";
$a->strings["Hurt in the past"] = "";
$a->strings["Wallowing in self-pity"] = "";