Merge branch 'update/oregon/0' of https://github.com/purechaose/r6maps

dev/js/lang-terms/lang-terms.de.js

@@ -591,56 +591,40 @@ var R6MLangTermsGerman = (function(R6MLangTerms, undefined) {
           parking: 'Parkplatz'
         },
         oregon: {
-          spawnJunkyard: 'Schrottplatz',
-          spawnStreet: 'StraBe',
-          spawnConstructionSite: 'Baustelle',
+          junkyard: 'Schrottplatz',
+          street: 'StraBe',
+          constructionSite: 'Baustelle',
           towerStairs: 'Turm-<br/>treppe',
           boilerRoom: 'Boiler-<br/>Raum',
           electricRoom: 'Elektrik',
-          bunkerEntrance: 'Bunker-<br/>eingang',
           bunker: 'Bunker',
           basementCorridor: 'Keller-<br/>korridor',
           supplyRoom: 'Nachschub-<br/>raum',
           laundryRoom: 'Waschküche',
           laundryStorage: 'Waschküchen-<br/>lager',
           laundryStairs: 'Waschküchen-<br/>treppe',
-          office: 'Büro',
           diningHall: 'Speisesaal',
-          diningHallCorridor: 'Speisesaal-korridor',
           showers: 'Duschen',
           kitchen: 'Küche',
-          bathroom: 'Toilette',
-          dormStairs: 'Schlafsaaltreppe',
-          pantry: 'Speisekammer',
-          bathroomCorridor: 'Toiletten-korridor',
           classroom: 'Klassen-<br/>zimmer',
           lobby: 'Lobby',
           mainStairs: 'Haupt-<br/>treppe',
           meetingHall: 'Versammlungs-<br/>halle',
           rearStage: 'Hinterbühne',
           garage: 'Garage',
-          officeStorage: 'Büro<br/>-Lagerraum',
-          kidsDorm: 'Kinder-<br/>Schlafsäle',
           dormMainHall: 'Schlafsaal<br/>Haupthalle',
-          smallDorms: 'Kleine Schlafsäle',
           armoryCorridor: 'Waffenlager-<br/>korridor',
           masterBedroom: 'Haupt<br/>-schlafzimmer',
           armory: 'Waffenlager',
           walkIn: 'Begehbarer<br/>Schrank',
           attic: 'Dachboden',
-          watchTower: 'Watchturm',
           busYard: 'Busdepot',
-          junkyard: 'Schrottplatz',
           farmlands: 'Ackerland',
           shootingRange: 'Schießplatz',
-          constructionSite: 'Baustelle',
           parking: 'Parkplatz',
           mainEntrance: 'Haupteingang',
-          street: 'Straße',
           balcony: 'Balkon',
           diningHallRoof: 'Speisesaal-<br/>dach',
-          officeRoof: 'Bürodach',
-          meetingHallEntrance: 'Versammlungs-<br/>hallen-Eingang',
           garageRoof: 'Garagendach',
           dormsRoof: 'Schlafsaaldach',
           meetingHallRoof: 'Versammlungs-<br/>hallendach',

dev/js/lang-terms/lang-terms.es.js

@@ -598,56 +598,40 @@ var R6MLangTermsSpanish = (function(R6MLangTerms, undefined) {
           garage: 'Garage'
         },
         oregon: {
-          spawnJunkyard: 'Desguace',
-          spawnStreet: 'Calle',
-          spawnConstructionSite: 'Zona de obras',
+          junkyard: 'Desguace',
+          street: 'Calle',
+          constructionSite: 'Zona de obras',
           towerStairs: 'Escaleras<br/>de la torre',
           boilerRoom: 'Sala de<br/>calderas',
           electricRoom: 'Cuarto de<br/>electricidad',
-          bunkerEntrance: 'Entrada<br/>al búnker',
           bunker: 'Búnker',
           basementCorridor: 'Pasillo del<br/>sótano',
           supplyRoom: 'Sala de<br/>suministros',
           laundryRoom: 'Lavandería',
           laundryStorage: 'Almacén de<br/>la lavandería',
           laundryStairs: 'Escaleras de<br/>la lavandería',
-          office: 'Oficina',
           diningHall: 'Salón<br/>comedor',
-          diningHallCorridor: 'Entrada del salón comedor',
           showers: 'Duchas',
           kitchen: 'Cocina',
-          bathroom: 'Baño',
-          dormStairs: 'Escaleras de<br/>los dormitorios',
-          pantry: 'Despensa',
-          bathroomCorridor: 'Pasillo de<br/>los baños',
           classroom: 'Aula',
           lobby: 'Vestíbulo',
           mainStairs: 'Escalera<br/>principal',
           meetingHall: 'Salón de<br/>reuniones',
           rearStage: 'Escenario<br/>posterior',
           garage: 'Garage',
-          officeStorage: 'Almacén<br/>de la oficina',
-          kidsDorm: 'Cuartos de<br/>los niños',
           dormMainHall: 'Entrada principal<br/>a los dormitorios',
-          smallDorms: 'Dormitorios<br/>pequeños',
           armoryCorridor: 'Pasillo a la armería',
           masterBedroom: 'Dormitorio principal',
           armory: 'Armería',
           walkIn: 'Armario<br/>vestidor',
           attic: 'Ático',
-          watchTower: 'Torre de vigía',
           busYard: 'Depósito de autubuses',
-          junkyard: 'Desguace',
           farmlands: 'Granjas',
           shootingRange: 'Galería<br/>de tiro',
-          constructionSite: 'Zona de obras',
           parking: 'Aparcamiento',
           mainEntrance: 'Entrada principal',
-          street: 'Calle',
           balcony: 'Balcón',
           diningHallRoof: 'Tejado del<br/>salón comedor',
-          officeRoof: 'Tejado de<br/>la oficina',
-          meetingHallEntrance: 'Entrada<br/>salón de<br/>reuniones',
           garageRoof: 'Tejado del<br/>garage',
           dormsRoof: 'Tejado de<br/>los dormitorios',
           meetingHallRoof: 'Tejado del salón<br/>de reuniones',

dev/js/lang-terms/lang-terms.fr.js

@@ -596,56 +596,40 @@ var R6MLangTermsFrench = (function(R6MLangTerms, undefined) {
           garage: 'Garage'
         },
         oregon: {
-          spawnJunkyard: 'Décharge',
-          spawnStreet: 'Rue',
-          spawnConstructionSite: 'Chantier',
+          junkyard: 'Décharge',
+          street: 'Rue',
+          constructionSite: 'Chantier',
           towerStairs: 'Escalier de<br/>la tour',
           boilerRoom: 'Chaufferie',
           electricRoom: 'Local<br/>élec-<br/>trique',
-          bunkerEntrance: 'Entrée<br/>du bunker',
           bunker: 'Bunker',
           basementCorridor: 'Couloir<br/>du<br/>sous-<br/>sol',
           supplyRoom: 'Réserve',
           laundryRoom: 'Buanderie',
           laundryStorage: 'Local de la<br/>buanderie',
           laundryStairs: 'Escalier de<br/>la buanderie',
-          office: 'Bureau',
           diningHall: 'Cantine',
-          diningHallCorridor: 'Couloir de la cantine',
           showers: 'Douches',
           kitchen: 'Cuisine',
-          bathroom: 'WC',
-          dormStairs: 'Escalier du dortoir',
-          pantry: 'Garde-manger',
-          bathroomCorridor: 'Couloir du WC',
           classroom: 'Salle de classe',
           lobby: 'Entrée',
           mainStairs: 'Escalier<br/>principal',
           meetingHall: 'Salle de réunion',
           rearStage: 'Arrière scène',
           garage: 'Garage',
-          officeStorage: 'Réserve<br/>due bureau',
-          kidsDorm: 'Dortoir des<br/>enfants',
           dormMainHall: 'Dortoir<br/>principal',
-          smallDorms: 'Petit Dortoir',
           armoryCorridor: 'Couloir de<br/>l\'armurerie',
           masterBedroom: 'Chambre<br/>principale',
           armory: 'Armurerie',
           walkIn: 'Dressing',
           attic: 'Grenier',
-          watchTower: 'Tour de guet',
           busYard: 'Cour du bus',
-          junkyard: 'Décharge',
           farmlands: 'Terres cultivées',
           shootingRange: 'Stand<br/>de tir',
-          constructionSite: 'Chantier',
           parking: 'Parking',
           mainEntrance: 'Entrée principale',
-          street: 'Rue',
           balcony: 'Balcon',
           diningHallRoof: 'Toit de la<br/>cantine',
-          officeRoof: 'Toit du bureau',
-          meetingHallEntrance: 'Entrée de la<br/>salle de réunion',
           garageRoof: 'Toit du garage',
           dormsRoof: 'Toit du<br/>dortoir',
           meetingHallRoof: 'Toit de<br/>la salle<br/>de réunnion',

dev/js/lang-terms/lang-terms.he.js

@@ -745,56 +745,40 @@ var R6MLangTermsHebrew = (function(R6MLangTerms, undefined) {
           garage: 'מוסך'
         },
         oregon: {
-          spawnJunkyard: 'חצר גרוטאות',
-          spawnStreet: 'רחוב',
-          spawnConstructionSite: 'אתר בנייה',
+          junkyard: 'חצר גרוטאות',
+          street: 'רחוב',
+          constructionSite: 'אתר בנייה',
           towerStairs: 'מדרגות מגדל',
           boilerRoom: 'חדר<br/>דודי<br/>חימום',
           electricRoom: 'חדר<br/>חשמל',
-          bunkerEntrance: 'כניסה<br/>לבונקר',
           bunker: 'בונקר',
           basementCorridor: 'מסדרון<br/>מרתף',
           supplyRoom: 'חדר<br/>אספקה',
           laundryRoom: 'חדר כביסה',
           laundryStorage: 'מחסן<br/>כביסה',
           laundryStairs: 'מדרגות<br/>חדר<br/>כביסה',
-          office: 'משרד',
           diningHall: 'חדר<br/>אוכל',
-          diningHallCorridor: 'מסדרון חדר אוכל',
           showers: 'מקלחות',
           kitchen: 'מטבח',
-          bathroom: 'שירותים',
-          dormStairs: 'מדרגות מעונות',
-          pantry: 'מזווה',
-          bathroomCorridor: 'מסדרון שירותים',
           classroom: 'כיתה',
           lobby: 'לובי',
           mainStairs: 'מדרגות<br/>ראשיות',
           meetingHall: 'חדר פגישות',
           rearStage: 'במה אחורית',
           garage: 'מוסך',
-          officeStorage: 'מחסן<br/>משרד',
-          kidsDorm: 'מעונות<br/>ילדים',
           dormMainHall: 'מעבר<br/>ראשי<br/>למעונות',
-          smallDorms: 'מעונות<br/>קטנים',
           armoryCorridor: 'מסדרון<br/>נשקייה',
           masterBedroom: 'חדר<br/>שינה<br/>ראשי',
           armory: 'נשקייה',
           walkIn: 'חדר ארונות',
           attic: 'עליית גג',
-          watchTower: 'מגדל שמירה',
           busYard: 'חצר אוטובוסים',
-          junkyard: 'חצר גרוטאות',
           farmlands: 'שדה חקלאי',
           shootingRange: 'מטווח',
-          constructionSite: 'אתר בנייה',
           parking: 'חניון',
           mainEntrance: 'כניסה ראשית',
-          street: 'רחוב',
           balcony: 'מרפסת',
           diningHallRoof: 'גג<br/>חדר<br/>אוכל',
-          officeRoof: 'גג משרד',
-          meetingHallEntrance: 'כניסה לחדר<br/>פגישות',
           garageRoof: 'גג מוסך',
           dormsRoof: 'גג<br/>מעונות',
           meetingHallRoof: 'גג<br/>חדר<br/>פגישות',

dev/js/lang-terms/lang-terms.ja.js

@@ -738,56 +738,40 @@ var R6MLangTermsJapanese = (function(R6MLangTerms, undefined) {
           garage: 'ガレージ'
         },
         oregon: {
-          spawnJunkyard: '廃品置場',
-          spawnStreet: '通り',
-          spawnConstructionSite: '建設現場',
+          junkyard: '廃品置場',
+          street: '通り',
+          constructionSite: '建設現場',
           towerStairs: 'タワー階段',
           boilerRoom: 'ボイラー室',
           electricRoom: '配電室',
-          bunkerEntrance: 'バンカー<br/>入口',
           bunker: 'バンカー',
           basementCorridor: '地下通路',
           supplyRoom: '備品質',
           laundryRoom: '洗濯室',
           laundryStorage: '洗濯室<br/>倉庫',
           laundryStairs: '洗濯室<br/>階段',
-          office: 'オフィス',
           diningHall: '食堂',
-          diningHallCorridor: '食堂通路',
           showers: 'シャワールーム',
           kitchen: 'キッチン',
-          bathroom: '共同トイレ',
-          dormStairs: '共同寝室<br/>の階段',
-          pantry: '食料庫',
-          bathroomCorridor: '共同トイレ前',
           classroom: '教室',
           lobby: 'ロビー',
           mainStairs: 'メイン<br/>階段',
           meetingHall: '会議ホール',
           rearStage: 'ホール裏',
           garage: 'ガレージ',
-          officeStorage: 'オフィス<br/>備品置き場',
-          kidsDorm: '子供部屋',
           dormMainHall: '共同寝室(大)',
-          smallDorms: '共同寝室(小)',
           armoryCorridor: '武器庫通路',
           masterBedroom: 'メイン<br/>ベッドルーム',
           armory: '武器庫',
           walkIn: 'ウォークイン',
           attic: '裏屋根',
-          watchTower: '監視タワー',
           busYard: 'バスヤード',
-          junkyard: '廃品置き場',
           farmlands: '農地',
           shootingRange: '射撃練習場',
-          constructionSite: '建設現場',
           parking: '駐車場',
           mainEntrance: '正面玄関',
-          street: '通り',
           balcony: 'テラス',
           diningHallRoof: '食堂屋上',
-          officeRoof: 'オフィス屋上',
-          meetingHallEntrance: '会議室入口',
           garageRoof: 'ガレージ屋上',
           dormsRoof: '共同寝室<br/>屋根',
           meetingHallRoof: '会議ホール<br/>屋根',