Merge remote-tracking branch 'upstream/master'

2019-02-20 21:04:49 -06:00
parent d7652cf8a0 d4ed8f1a4c
commit 0824915d26
33 changed files with 0 additions and 0 deletions
--- a/string/en/conversation/borvo_the_hutt.stf
+++ b/string/en/conversation/borvo_the_hutt.stf
--- a/string/en/conversation/doctor.stf
+++ b/string/en/conversation/doctor.stf
--- a/string/en/conversation/halloween_vendor.stf
+++ b/string/en/conversation/halloween_vendor.stf
--- a/string/en/conversation/station_corellia.stf
+++ b/string/en/conversation/station_corellia.stf
--- a/string/en/conversation/station_dantooine.stf
+++ b/string/en/conversation/station_dantooine.stf
--- a/string/en/conversation/station_dathomir.stf
+++ b/string/en/conversation/station_dathomir.stf
--- a/string/en/conversation/station_endor.stf
+++ b/string/en/conversation/station_endor.stf
--- a/string/en/conversation/station_lok.stf
+++ b/string/en/conversation/station_lok.stf
--- a/string/en/conversation/station_naboo.stf
+++ b/string/en/conversation/station_naboo.stf
--- a/string/en/conversation/station_tatooine.stf
+++ b/string/en/conversation/station_tatooine.stf
--- a/string/en/conversation/station_yavin4.stf
+++ b/string/en/conversation/station_yavin4.stf
--- a/string/en/conversation/story_arc_chapter_three_pilot.stf
+++ b/string/en/conversation/story_arc_chapter_three_pilot.stf
--- a/string/en/conversation/tatooine_eisley_jano.stf
+++ b/string/en/conversation/tatooine_eisley_jano.stf
--- a/string/en/conversation/tcg_vendor.stf
+++ b/string/en/conversation/tcg_vendor.stf
--- a/string/en/deed_detail.stf
+++ b/string/en/deed_detail.stf
--- a/string/en/event/empire_day.stf
+++ b/string/en/event/empire_day.stf
--- a/string/en/live_motd.stf
+++ b/string/en/live_motd.stf
--- a/string/en/mission/mission_generic.stf
+++ b/string/en/mission/mission_generic.stf
--- a/string/en/mob/creature_names.stf
+++ b/string/en/mob/creature_names.stf
--- a/string/en/mob/pgc_social_group.stf
+++ b/string/en/mob/pgc_social_group.stf
--- a/string/en/monster_detail.stf
+++ b/string/en/monster_detail.stf
--- a/string/en/pet/pet_menu.stf
+++ b/string/en/pet/pet_menu.stf
--- a/string/en/proc/proc.stf
+++ b/string/en/proc/proc.stf
--- a/string/en/quest/ground/c_talus_grave_robbers_1.stf
+++ b/string/en/quest/ground/c_talus_grave_robbers_1.stf
--- a/string/en/quest/ground/camp_delta_defense_01.stf
+++ b/string/en/quest/ground/camp_delta_defense_01.stf
--- a/string/en/quest/ground/camp_delta_defense_02.stf
+++ b/string/en/quest/ground/camp_delta_defense_02.stf
--- a/string/en/quest/ground/camp_delta_defense_03.stf
+++ b/string/en/quest/ground/camp_delta_defense_03.stf
--- a/string/en/quest/ground/camp_delta_defense_04.stf
+++ b/string/en/quest/ground/camp_delta_defense_04.stf
--- a/string/en/quest/ground/corellia_39_chirq_council_02b.stf
+++ b/string/en/quest/ground/corellia_39_chirq_council_02b.stf
--- a/string/en/quest/ground/system_message.stf
+++ b/string/en/quest/ground/system_message.stf
--- a/string/en/quest/ground/util/quest_giver_object.stf
+++ b/string/en/quest/ground/util/quest_giver_object.stf
--- a/string/en/theme_park_name.stf
+++ b/string/en/theme_park_name.stf
--- a/string/en/ui.stf
+++ b/string/en/ui.stf