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

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

@@ -565,62 +565,32 @@ var R6MLangTermsGerman = (function(R6MLangTerms, undefined) {
           garage: 'Garage'
         },
         kanal: {
-          spawnFloatingDock: 'Schwimm-Dock',
-          spawnSailboats: 'Segelboote',
-          spawnConstructionSite: 'Baustelle',
-          boatGarage: 'Bootsgarage',
-          boatSupplies: 'Bootsvorräte',
+          floatingDock: 'Schwimm-Dock',
+          sailboats: 'Segelboote',
+          constructionSite: 'Baustelle',
           pipes: 'Undichte Rohre',
-          boatSuppliesHallway: 'Boots-<br/>borräte-<br/>Gang',
           lockerRoom: 'Umkleideraum',
-          coastGuardStairs: 'Küstenwache-<br/>Treppe',
-          showers: 'Duschen',
-          loadingDock: 'Laderampe',
-          machineHallway: 'Maschinen-<br/>Gang',
-          controlCenterStairs: 'Kontroll-<br/>zentrum-<br/>Treppe',
-          holdingRoom: 'Güterraum',
-          holdingRoomHallway: 'Güterraum-<br/>Gang',
-          radio: 'Funk',
-          coastGuardOffice: 'Küstenwache<br/>Büro',
           archives: 'Archiv',
-          coastGuardHall: 'Küsten-<br/>wache<br/>Gang',
-          mainEntrance: 'Haupt-<br/>eingang',
           lounge: 'Lounge',
-          bridge: 'Brücke',
           modelRoom: 'Modellraum',
           securityRoom: 'Sicherheits-<br/>raum',
           projectorRoom: 'Projektorraum',
-          mapsOffice: 'Kartenbüro',
-          mapsOfficeHallway: 'Kartenbüro-<br/>Gang',
           kitchen: 'Küche',
-          cafeteria: 'Cafeteria',
-          plantsHallway: 'Pflanzengang',
-          thirdFloorExit: 'Ausgang<br/>zweiter<br/>Stock',
           controlRoom: 'Kontrollraum',
-          electricRoom: 'Elektrik',
           controlRoomHallway: 'Kontrollraum-Gang',
           serverRoom: 'Server-<br/>Raum',
-          lockgate: 'Schleusentor',
+          lockGate: 'Schleusentor',
           quayContainers: 'Kai-Container',
-          lockgateTunnel: 'Schleusentor-<br/>Tunnel',
-          waterWalkway: 'Steg',
-          quayConstruction: 'Kai-<br/>Baustelle',
-          constructionSite: 'Baustelle',
+          lockGateTunnel: 'Schleusentor-<br/>Tunnel',
           constructionEntrance: 'Baustellen-<br/>eingang',
           parkingAlley: 'Parkplatzgasse',
           parkingEntrance: 'Parkplatz-<br/>einfahrt',
           middleRoad: 'Mittlere<br/>Straße',
           forkliftAlley: 'Gabelstapler-<br/>Gasse',
           frontLawn: 'Vorgarten',
-          basementStairs: 'Kellertreppe',
           coastGuardRoof: 'Küstenwache-<br/>Dache',
-          roofBrickPile: 'Ziegelhaufen<br/>Dach',
           balcony: 'Balkon',
-          controlCenterRoof: 'Kontrollzentrum-<br/>Dach',
-          dockStairs: 'Dock-Treppe',
-          parking: 'Parkplatz',
-          boatCrane: 'Bootskran',
-          mapArchives: 'Karten-<br/>archiv'
+          parking: 'Parkplatz'
         },
         oregon: {
           spawnJunkyard: 'Schrottplatz',

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

@@ -541,64 +541,32 @@ var R6MLangTermsSpanish = (function(R6MLangTerms, undefined) {
           rooftop: 'Tejado'
         },
         kanal: {
-          spawnFloatingDock: 'Embarcadero',
-          spawnSailboats: 'Veleros',
-          spawnConstructionSite: 'Zona de obras',
-          boatGarage: 'Garage de<br/>barcas',
-          boatSupplies: 'Suministros<br/>de barcas',
+          floatingDock: 'Embarcadero',
+          sailboats: 'Veleros',
+          constructionSite: 'Zona de obras',
           pipes: 'Tuberias que<br/>rezuman',
-          boatSuppliesHallway: 'Pasillo de<br/>suministros<br/>de barcas',
           lockerRoom: 'Taquillas',
-          coastGuardStairs: 'Escaleras de<br/>guardacostas',
-          showers: 'Duchas',
-          showersCorridor: 'Pasillo a<br/>las duchas',
-          loadingDock: 'Muelle de<br/>carga',
-          machineHallway: 'Pasillo de<br/>maquinaria',
-          controlCenterStairs: 'Escalera<br/>al centro<br/>de control',
-          holdingRoom: 'Depósito<br/>temporal',
-          holdingRoomHallway: 'Pasillo a<br/>depósito<br/>temporal',
-          radio: 'Sala de<br/>radio',
-          coastGuardOffice: 'Oficina del<br/>guardacostas',
           archives: 'Archivo',
-          coastGuardHall: 'Pasillo de<br/>guardacostas',
-          mainEntrance: 'Entrada<br/>principal',
           lounge: 'Sala de<br/>espera',
-          bridge: 'Puente',
           modelRoom: 'Sala de<br/>modelos',
           securityRoom: 'Sala de<br/>seguridad',
           projectorRoom: 'Sala del<br/>proyector',
-          mapsOffice: 'Oficina<br/>de mapas',
-          mapsOfficeHallway: 'Pasillo a<br/>la oficina<br/>de mapas',
           kitchen: 'Cocina',
-          cafeteria: 'Cafetería',
-          plantsHallway: 'Pasillo<br/>de plantas',
-          thirdFloorExit: 'Salida de<br/>la tercera<br/>planta',
           controlRoom: 'Sala de<br/>control',
-          electricRoom: 'Cuarto<br/>eléctrico',
           controlRoomHallway: 'Pasillo<br/>a la sala<br/>de control',
           serverRoom: 'Sala del<br/>servidor',
-          lockgate: 'Compuerta',
+          lockGate: 'Compuerta',
           quayContainers: 'Contenedores<br/>del muelledw',
-          lockgateTunnel: 'Tunel de las<br/>compuertas',
-          waterWalkway: 'Paserela<br/>del agua',
-          quayConstruction: 'Zona de obras<br/>en el muelle',
-          constructionSite: 'Zona de<br/>obras',
+          lockGateTunnel: 'Tunel de las<br/>compuertas',
           constructionEntrance: 'Entrada a la<br/>zona de obras',
           parkingAlley: 'Callejón del<br/>aparcamiento',
           parkingEntrance: 'Entrada al<br/>aparcamiento',
           middleRoad: 'Carretera<br/>central',
           forkliftAlley: 'Callejón<br/>carretilla<br/>elevadora',
           frontLawn: 'Césped<br/>delantero',
-          basementStairs: 'Escaleras<br/>sótano',
           coastGuardRoof: 'Tejado de<br/>guardacostas',
-          bridgeRoof: 'Techo<br/>del puente',
-          roofBrickPile: 'Pila ladrillos<br/>del tejado',
           balcony: 'Balcón',
-          controlCenterRoof: 'Tejado<br/>del centro<br/>de control',
-          dockStairs: 'Escalera del<br/>embarcadero',
-          parking: 'Aparcamiento',
-          boatCrane: 'Grua de barcas',
-          mapArchives: 'Archivo<br/>de mapas'
+          parking: 'Aparcamiento'
         },
         kafe: {
           riverDocks: 'Embarcadero del río',

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

@@ -376,62 +376,32 @@ var R6MLangTermsFrench = (function(R6MLangTerms, undefined) {
           marketRooftops: 'Toits du marché'
         },
         kanal: {
-          spawnFloatingDock: 'Quai flottant',
-          spawnSailboats: 'Voiliers',
-          spawnConstructionSite: 'Chantier',
-          boatGarage: 'Hangar à bateaux',
-          boatSupplies: 'Remise du hangar',
+          floatingDock: 'Quai flottant',
+          sailboats: 'Voiliers',
+          constructionSite: 'Chantier',
           pipes: 'Tuyaux percés',
-          boatSuppliesHallway: 'Couloir<br/>remise<br/>du hangar',
           lockerRoom: 'Vestiares',
-          coastGuardStairs: 'Escalier<br/>garde-côte',
-          showers: 'Douches',
-          loadingDock: 'Quai de chargement',
-          machineHallway: 'Salle des<br/>machines',
-          controlCenterStairs: 'Escalier<br/>centre<br/>de contrôle',
-          holdingRoom: 'Cellule de<br/>détention',
-          holdingRoomHallway: 'Couloir<br/>cellule<br/>de<br/>détention',
-          radio: 'Radio',
-          coastGuardOffice: 'Bureau<br/>garde-côte',
           archives: 'Archives',
-          coastGuardHall: 'Couloir<br/>garde-côte<br/>',
-          mainEntrance: 'Entrée<br/>principale',
           lounge: 'Lounge',
-          bridge: 'Pont',
           modelRoom: 'Salle de la maquette',
           securityRoom: 'Salle de<br/>sécurité',
           projectorRoom: 'Salle de<br/>projection',
-          mapsOffice: 'Salle des<br/>cartes',
-          mapsOfficeHallway: 'Couloir salle<br/>des cartes',
           kitchen: 'Cuisine',
-          cafeteria: 'Caféteéria',
-          plantsHallway: 'Couloir avec plantes',
-          thirdFloorExit: 'Sortie<br/>du 3d<br/>étage',
           controlRoom: 'Salle de<br/>contrôle',
-          electricRoom: 'Local<br/>électrique',
           controlRoomHallway: 'Couloir salle de contrôle',
           serverRoom: 'Salle des<br/>serveurs',
-          lockgate: 'Écluse',
+          lockGate: 'Écluse',
           quayContainers: 'Conteneurs à quai',
-          lockgateTunnel: 'Tunnel<br/>à écluse',
-          waterWalkway: 'Passerelle',
-          quayConstruction: 'Quai en contruction',
-          constructionSite: 'Chantier<br/>',
+          lockGateTunnel: 'Tunnel<br/>à écluse',
           constructionEntrance: 'Entrée<br/>du chantier',
           parkingAlley: 'Allée du parking',
           parkingEntrance: 'Entrée<br/>du parking',
           middleRoad: 'Route<br/>du milieu',
           forkliftAlley: 'Allée char.<br/>Élévateurs',
           frontLawn: 'Pelouse de devant',
-          basementStairs: 'Escalier du sous-sol',
           coastGuardRoof: 'Toit<br/>de la<br/>garde-côte',
-          roofBrickPile: 'Tas<br/>de<br/>tuiles',
           balcony: 'Balcon',
-          controlCenterRoof: 'Toit<br/>du centre<br/>de contrôle',
-          dockStairs: 'Escalier du quai',
-          parking: 'Parking',
-          boatCrane: 'Grue',
-          mapArchives: 'Archives<br/>des cartes'
+          parking: 'Parking'
         },
         club: {
           spawnMainEntrance: 'Porte principale',

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

@@ -688,64 +688,32 @@ var R6MLangTermsHebrew = (function(R6MLangTerms, undefined) {
           rooftop: 'גג'
         },
         kanal: {
-          spawnFloatingDock: 'נמל צף',
-          spawnSailboats: 'סירות מפרש',
-          spawnConstructionSite: 'אתר בנייה',
-          boatGarage: 'מוסך סירות',
-          boatSupplies: 'חדר אספקה<br/>לסירות',
+          floatingDock: 'נמל צף',
+          sailboats: 'סירות מפרש',
+          constructionSite: 'אתר בנייה',
           pipes: 'צנרת',
-          boatSuppliesHallway: 'מסדרון<br/>חדר<br/>אספקה',
           lockerRoom: 'לוקרים',
-          coastGuardStairs: 'מדרגות<br/>משמר החוף',
-          showers: 'מקלחות',
-          showersCorridor: 'מסדרון<br/>מקלחות',
-          loadingDock: 'רציף טעינה',
-          machineHallway: 'מסדרון<br/>מכונות',
-          controlCenterStairs: 'מדרגות<br/>מרכז<br/>בקרה',
-          holdingRoom: 'חדר<br/>החזקה',
-          holdingRoomHallway: 'מסדרון<br/>חדר<br/>החזקה',
-          radio: 'רדיו',
-          coastGuardOffice: 'משרד<br/>משמר החוף',
           archives: 'ארכיון',
-          coastGuardHall: 'פרזדור<br/>משמר<br/>החוף',
-          mainEntrance: 'כניסה<br/>ראשית',
           lounge: 'סלון',
-          bridge: 'גשר',
           modelRoom: 'חדר מודלים',
           securityRoom: 'חדר<br/>אבטחה',
           projectorRoom: 'חדר<br/>מקרן',
-          mapsOffice: 'משרד<br/>המפות',
-          mapsOfficeHallway: 'מסדרון<br/>משרד<br/>מפות',
           kitchen: 'מטבח',
-          cafeteria: 'קפיטריה',
-          plantsHallway: 'מסדרון צמחיה',
-          thirdFloorExit: 'יציאת<br/>קומה<br/>שלישית',
           controlRoom: 'חדר<br/>בקרה',
-          electricRoom: 'חדר<br/>חשמל',
           controlRoomHallway: 'מסדרון חדר בקרה',
           serverRoom: 'חדר<br/>שרתים',
-          lockgate: 'שער ספינות',
+          lockGate: 'שער ספינות',
           quayContainers: 'מכולות רציף',
-          lockgateTunnel: 'מנהרת<br/>שער<br/>ספינות',
-          waterWalkway: 'גשר מים',
-          quayConstruction: 'רציף בבנייה',
-          constructionSite: 'אתר<br/>בנייה',
+          lockGateTunnel: 'מנהרת<br/>שער<br/>ספינות',
           constructionEntrance: 'כניסת<br/>אתר<br/>בנייה',
           parkingAlley: 'מעבר לחניות',
           parkingEntrance: 'כניסה<br/>לחניון',
           middleRoad: 'רחוב<br/>אמצעי',
           forkliftAlley: 'סמטת<br/>מלגזונים',
           frontLawn: 'חצר קדמית',
-          basementStairs: 'מדרגות מרתף',
           coastGuardRoof: 'גג<br/>משמר<br/>החוף',
-          bridgeRoof: 'גג<br/>הגשר',
-          roofBrickPile: 'ערמת<br/>לבנים<br/>על הגג',
           balcony: 'מרפסת',
-          controlCenterRoof: 'גג<br/>מרכז<br/>בקרה',
-          dockStairs: 'מדרגות נמל',
-          parking: 'חניון',
-          boatCrane: 'מנוף ספינות',
-          mapArchives: 'ארכיון מפות'
+          parking: 'חניון'
         },
         kafe: {
           riverDocks: 'רציפי הנהר',

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

@@ -681,64 +681,32 @@ var R6MLangTermsJapanese = (function(R6MLangTerms, undefined) {
           rooftop: '屋上'
         },
         kanal: {
-          spawnFloatingDock: '浮きドック',
-          spawnSailboats: '帆船',
-          spawnConstructionSite: '建設現場',
-          boatGarage: 'ボートガレージ',
-          boatSupplies: 'ボート倉庫',
+          floatingDock: '浮きドック',
+          sailboats: '帆船',
+          constructionSite: '建設現場',
           pipes: '漏水区画',
-          boatSuppliesHallway: 'ボート<br/>倉庫前<br/>廊下',
           lockerRoom: 'ロッカールーム',
-          coastGuardStairs: '沿岸警備<br/>階段',
-          showers: 'シャワー<br/>ルーム',
-          showersCorridor: 'シャワー<br/>ルーム前',
-          loadingDock: '搬出口',
-          machineHallway: '機械室前<br/>廊下',
-          controlCenterStairs: '管制センター<br/>階段',
-          holdingRoom: '待合室',
-          holdingRoomHallway: '待合室<br/>廊下',
-          radio: '無線室',
-          coastGuardOffice: '沿岸警備<br/>オフィス',
           archives: '資料室',
-          coastGuardHall: '事務所前<br/>廊下',
-          mainEntrance: '正面玄関',
           lounge: 'ラウンジ',
-          bridge: '渡り廊下',
           modelRoom: 'モデルルーム',
           securityRoom: 'セキュリティ<br/>ルーム',
           projectorRoom: '映写室',
-          mapsOffice: '海図管理室',
-          mapsOfficeHallway: '海図管理室前<br/>廊下',
           kitchen: 'キッチン',
-          cafeteria: 'カフェテリア',
-          plantsHallway: 'プラント育成区画',
-          thirdFloorExit: '3階出口',
           controlRoom: '管制室',
-          electricRoom: '配電室',
           controlRoomHallway: '管制室廊下',
           serverRoom: 'サーバー<br/>ルーム',
-          lockgate: '水門',
+          lockGate: '水門',
           quayContainers: '埠頭コンテナ',
-          lockgateTunnel: '水門トンネル',
-          waterWalkway: '水上通路',
-          quayConstruction: '埠頭建設現場',
-          constructionSite: '建設現場',
+          lockGateTunnel: '水門トンネル',
           constructionEntrance: '建設現場<br/>入口',
           parkingAlley: '駐車場路地',
           parkingEntrance: '駐車場入口',
           middleRoad: '中央道路',
           forkliftAlley: 'フォークリフト用<br/>通路',
           frontLawn: '前庭',
-          basementStairs: '地下階段',
           coastGuardRoof: '沿岸警備<br/>屋上',
-          bridgeRoof: 'ブリッジ<br/>ルーフ',
-          roofBrickPile: 'レンガ屋根',
           balcony: 'テラス',
-          controlCenterRoof: '管制センター<br/>屋上',
-          dockStairs: 'ドック階段',
-          parking: '駐車場',
-          boatCrane: 'ボートクレーン',
-          mapArchives: 'マップ資料室'
+          parking: '駐車場'
         },
         kafe: {
           riverDocks: '桟橋',