Merge branch 'patch-2' of https://github.com/badugitime/Pupil into badugitime-patch-2

ko.json

@@ -104,7 +104,7 @@
     "tanlines": "썬탠자국",
     "kimono": "기모노",
     "virginity": "후장개통",
-    "gloves": "gloves",
+    "gloves": "장갑",
     "bestiality": "수간",
     "blackmail": "협박",
     "rimjob": "애널핥기",
@@ -138,12 +138,17 @@
     "latex": "라텍스",
     "slave": "노예",
     "squirting": "분수",
-    "inseki": "inseki",
+    "inseki": "친인척",
     "magical girl": "마법소녀",
     "bald": "대머리",
     "hairy armpits": "겨드랑이 털",
+<<<<<<< HEAD
     "tomboy": "남자같은 여자",
     "dickgirl on dickgirl": "후타나리x후타나리",
+=======
+    "dickgirl on dickgirl": "후타나리x후타나리",
+    "tomboy": "보이시",
+>>>>>>> d10def8ab84d57855f52bc41e1d88c8bb5379343
     "corruption": "부패",
     "sample": "샘플",
     "fox girl": "여우녀",
@@ -169,7 +174,7 @@
     "blowjob face": "펠라 얼굴",
     "shemale": "쉬메일",
     "oppai loli": "거유로리",
-    "petplay": "petplay",
+    "petplay": "애완플레이",
     "torture": "고문",
     "chikan": "치한",
     "facesitting": "얼굴에앉음",
@@ -189,7 +194,7 @@
     "large insertions": "큰 물건 삽입",
     "gaping": "벌어짐",
     "hotpants": "핫팬츠",
-    "novel": "novel",
+    "novel": "소설",
     "dog": "개",
     "transformation": "변형",
     "eggs": "알",
@@ -212,7 +217,7 @@
     "cosplaying": "코스프레",
     "dog girl": "강아지녀",
     "feminization": "불완전 성전환",
-    "oyakodon": "oyakodon",
+    "oyakodon": "모녀덮밥",
     "body modification": "신체수정",
     "sumata": "스마타",
     "oni": "오니",
@@ -221,12 +226,23 @@
     "hair buns": "hair buns",
     "smegma": "좆밥",
     "vore": "보어",
+<<<<<<< HEAD
     "animated": "animated",
     "facial hair": "facial hair",
     "piss drinking": "음뇨",
     "foot licking": "발 핥기",
     "amputee": "사지절단",
     "no penetration": "no penetration",
+=======
+    "animated": "움짤",
+    "hair buns": "헤어 번",
+    "piss drinking": "음뇨",
+    "facial hair": "얼굴털",
+    "amputee": "사지절단",
+    "foot licking": "발 핥기",
+    "robot": "로봇",
+    "no penetration": "삽입 없음",
+>>>>>>> d10def8ab84d57855f52bc41e1d88c8bb5379343
     "nose hook": "코걸이",
     "robot": "로봇",
     "twins": "쌍둥이",
@@ -7314,4 +7330,4 @@
     "zura zura island": "",
     "zwei worter": "",
     "zxyed": ""
-}
+}