Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -277,10 +277,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Custom Build
 confirmban = Are you sure you want to ban "{0}[white]"?
 confirmkick = Are you sure you want to kick "{0}[white]"?
-confirmvotekick = Are you sure you want to vote-kick "{0}[white]"?
 confirmunban = Are you sure you want to unban this player?
 confirmadmin = Are you sure you want to make "{0}[white]" an admin?
 confirmunadmin = Are you sure you want to remove admin status from "{0}[white]"?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Join Game
 joingame.ip = Address:
 disconnect = Disconnected.
@@ -1115,6 +1116,8 @@ setting.bridgeopacity.name = Bridge Opacity
 setting.playerchat.name = Display Player Bubble Chat
 setting.showweather.name = Show Weather Graphics
 setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Adapt interface to display notch
+setting.macnotch.description = Restart required to apply changes
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Note that beta versions of the game cannot make public lobbies.

core/assets/bundles/bundle_be.properties

@@ -268,10 +268,11 @@ server.version = [gray]Версія: {0} {1}
 server.custombuild = [accent]карыстальніцкая зборка
 confirmban = Вы сапраўды хочаце заблакаваць гэтага гульца?
 confirmkick = Вы сапраўды хочаце выгнаць гэтага гульца?
-confirmvotekick = Вы сапраўды хочаце галасаваннем выгнаць гэтага гульца?
 confirmunban = Вы сапраўды хочаце разблакаваць гэтага гульца?
 confirmadmin = Вы сапраўды хочаце зрабіць гэтага гульца адміністратарам?
 confirmunadmin = Вы сапраўды хочаце прыбраць гэтага гульца з адміністратараў?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Далучыцца да гульні
 joingame.ip = Адрас:
 disconnect = Адключана.
@@ -1090,6 +1091,8 @@ setting.bridgeopacity.name = Непразрыстасць мастоў
 setting.playerchat.name = Адлюстроўваць аблокі чата над гульцамі
 setting.showweather.name = Паказаць Анімацыю Надвор'я
 setting.hidedisplays.name = Схаваць Лагічныя Дысплэі
+setting.macnotch.name = Адаптуйце інтэрфейс для адлюстравання выемкі
+setting.macnotch.description = Каб змены ўжыліся патрабуецца перазапуск
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Майце на ўвазе, што бэта-версія гульні не можа рабіць гульні публічнымі.

core/assets/bundles/bundle_bg.properties

@@ -273,10 +273,11 @@ server.version = [gray]в{0} {1}
 server.custombuild = [accent]Персонализирана компилация
 confirmban = Сигурни ли сте, че искате да баннете "{0}[white]"?
 confirmkick = Сигурни ли сте, че искате да изгоните "{0}[white]"?
-confirmvotekick = Сигурни ли сте, че искате да изгоните "{0}[white]" чрез гласуване?
 confirmunban = Сигурни ли сте че, искате да анулирате банването на този играч?
 confirmadmin = Сигурни ли сте че, искате да направите "{0}[white]" администратор?
 confirmunadmin = Сигурни ли сте че, искате да премахнете администраторските права на "{0}[white]"?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Присъединяване в игра
 joingame.ip = IP адрес:
 disconnect = Връзката беше прекъсната.
@@ -1101,6 +1102,8 @@ setting.bridgeopacity.name = Плътност на Мостовете
 setting.playerchat.name = Показвай Мехурчета с Чат
 setting.showweather.name = Показвай Графики за Климата
 setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Адаптирайте интерфейса за показване на прорез
+setting.macnotch.description = За прилагане на промените е необходимо рестартиране
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Имайте в предвид, че бета версии на играта не могат да стартират публични игри.

core/assets/bundles/bundle_ca.properties

@@ -273,10 +273,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Versió personalitzada
 confirmban = Esteu segur que voleu bandejar a «{0}[white]»?
 confirmkick = Esteu segur que voleu expulsar a «{0}[white]»?
-confirmvotekick = Esteu segur que voleu votar per a expulsar a «{0}[white]»?
 confirmunban = Esteu segur que voleu treure el bandeig a aquest jugador?
 confirmadmin = Esteu segur que voleu fer administrador a «{0}[white]»?
 confirmunadmin = Esteu segur que voleu treure a «{0}[white]» els permisos d’administrador?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Uneix-me a la partida
 joingame.ip = Direcció IP:
 disconnect = Desconnectat.
@@ -1105,6 +1106,8 @@ setting.bridgeopacity.name = Opacitat de cintes i canonades subterrànies
 setting.playerchat.name = Mostra el xat bombolla de jugadors
 setting.showweather.name = Mostra l’estat meteorològic
 setting.hidedisplays.name = Amaga els monitors lògics
+setting.macnotch.name = Adaptar la interfície per mostrar el notch
+setting.macnotch.description = Cal reiniciar perquè s’apliquin els canvis
 steam.friendsonly = Només amics
 steam.friendsonly.tooltip = Indica si només els amics de Steam podran unir-se a la vostra partida.\nSi no es selecciona aquesta opció, la vostra partida serà pública i s’hi podrà unir qualsevol jugador.
 public.beta = Tingueu en compte que les versions beta no disposen de sales d’espera.

core/assets/bundles/bundle_cs.properties

@@ -273,10 +273,11 @@ server.version = [gray]Verze: {0} {1}[]
 server.custombuild = [accent]Upravená verze hry[]
 confirmban = Jsi si jistý, že chceš zakázat hráče "{0}[white]"?[]
 confirmkick = Jsi si jistý, že chceš vykopnout hráče "{0}[white]"?[]
-confirmvotekick = Jsi si jistý, že chceš hlasovat pro vykopnutí hráče "{0}[white]"?[]
 confirmunban = Jsi si jistý, že chceš zrušit zákaz pro tohoto hráče?
 confirmadmin = Jsi si jistý, že chceš hráče "{0}[white]" povýšit na správce?[]
 confirmunadmin = Jsi si jistý, že chceš odebrat hráči "{0}[white]" roli správce?[]
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Připojit se ke hře
 joingame.ip = Adresa IP:
 disconnect = Odpojeno.
@@ -1102,6 +1103,8 @@ setting.bridgeopacity.name = Průsvitnost přemostění
 setting.playerchat.name = Zobrazit bublinu se zprávami hráče
 setting.showweather.name = Zobrazit Grafiku Počasí
 setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Přizpůsobte rozhraní zobrazení zářezu
+setting.macnotch.description = Pro aplikování změn, je potřeba restart
 steam.friendsonly = Přátele Pouze
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Poznámka: nevydané verze her nemůžou být veřejné.

core/assets/bundles/bundle_da.properties

@@ -269,10 +269,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Brugerdefineret version
 confirmban = Er du sikker på, at du ønsker at banne denne spiller?
 confirmkick = Er du sikker på, at du ønsker at kicke denne spiller?
-confirmvotekick = Er du sikker på, at du ønsker at vote-kicke denne spiller?
 confirmunban = Er du sikker på, at du ønsker at fjerne banlysning af denne spiller?
 confirmadmin = Er du sikker på, at du ønsker at gøre denne spiller til administrator?
 confirmunadmin = Er du sikker på at du ønsker at fjerne administrator-rolle fra denne spiller?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Deltag i spil
 joingame.ip = Addresse:
 disconnect = Afbryd forbindelse
@@ -1091,6 +1092,8 @@ setting.bridgeopacity.name = Bro-gennemsigtighed
 setting.playerchat.name = Vis spillers bobbel-chat
 setting.showweather.name = Show Weather Graphics
 setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Tilpas grænsefladen til at vise hak
+setting.macnotch.description = Genstart påkrævet for at anvende ændringer
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Bemærk at beta-versioner af spillet ikke kan tilslutte sig offentlige spil.

core/assets/bundles/bundle_de.properties

@@ -276,10 +276,11 @@ server.version = [lightgray]Version: {0}
 server.custombuild = [accent]Benutzerdefinierter Build
 confirmban = Bist du sicher, dass du diesen Spieler verbannen möchtest?
 confirmkick = Bist du sicher, dass du diesen Spieler rauswerfen willst?
-confirmvotekick = Bist du sicher, dass du darüber abstimmen willst, diesen Spieler rauszuwerfen?
 confirmunban = Bist du sicher, dass du die Verbannung des Spielers rückgängig machen willst?
 confirmadmin = Bist du sicher, dass du diesen Spieler zu einem Administrator machen möchtest?
 confirmunadmin = Bist du sicher, dass dieser Spieler kein Administrator mehr sein soll?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Spiel beitreten
 joingame.ip = IP:
 disconnect = Verbindung unterbrochen.
@@ -1114,6 +1115,8 @@ setting.bridgeopacity.name = Brücken-Deckkraft
 setting.playerchat.name = Chat im Spiel anzeigen
 setting.showweather.name = Wetter anzeigen
 setting.hidedisplays.name = Logik-Bildschirme verdecken
+setting.macnotch.name = Passen Sie die Schnittstelle an die Anzeigekerbe an
+setting.macnotch.description = Neustart erforderlich
 steam.friendsonly = Nur Freunde
 steam.friendsonly.tooltip = Ob nur Steam-Freunde dein Spiel beitreten können.\nDiese Einstellung zu deaktivieren macht dein Spiel öffentlich - jeder kann beitreten.
 public.beta = Bemerke: Beta-Versionen des Spiels können keine öffentlichen Spiele machen.

core/assets/bundles/bundle_es.properties

@@ -273,10 +273,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Versión personalizada
 confirmban = ¿Quieres vetar a "{0}[white]"?
 confirmkick = ¿Quieres expulsar a "{0}[white]"?
-confirmvotekick = ¿Estás a favor de expulsar a "{0}[white]"?
 confirmunban = ¿Quieres quitar el veto a este jugador?
 confirmadmin = ¿Quieres hacer administrador a "{0}[white]"?
 confirmunadmin = ¿Quieres quitarle los permisos de administrador a "{0}[white]"?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Unirse a una Partida
 joingame.ip = Dirección IP:
 disconnect = Desconectado.
@@ -1111,6 +1112,8 @@ setting.bridgeopacity.name = Opacidad de puentes
 setting.playerchat.name = Mostrar chat de burbuja de jugadores
 setting.showweather.name = Efectos visuales climáticos
 setting.hidedisplays.name = Ocultar monitores lógicos
+setting.macnotch.name = Adaptar la interfaz para mostrar la muesca
+setting.macnotch.description = Es necesario reiniciar para aplicar los cambios
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Recuerda que no puedes crear partidas públicas en las versiones beta del juego.

core/assets/bundles/bundle_et.properties

@@ -269,10 +269,11 @@ server.version = [lightgray]v{0} {1}
 server.custombuild = [accent]Kohandatud versioon
 confirmban = Oled kindel, et soovid keelata sellel mängjal siin mängida?
 confirmkick = Oled kindel, et soovid selle mängija välja visata?
-confirmvotekick = Oled kindel, et soovid selle mängija mängust välja hääletada?
 confirmunban = Oled kindel, et soovid lubada sellel mängijal siin uuesti mängida?
 confirmadmin = Oled kindel, et soovid anda sellele mängijale adminstraatori õigused?
 confirmunadmin = Oled kindel, et soovid sellelt mängijalt adminstraatori õigused ära võtta?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Liitu mänguga
 joingame.ip = Aadress:
 disconnect = Ühendus katkestatud.
@@ -1091,6 +1092,8 @@ setting.bridgeopacity.name = Bridge Opacity
 setting.playerchat.name = Näita mängusisest vestlusakent
 setting.showweather.name = Show Weather Graphics
 setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Kohandage liidest sälku kuvamiseks
+setting.macnotch.description = Muudatuste rakendamiseks on vaja taaskäivitada
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Note that beta versions of the game cannot make public lobbies.

core/assets/bundles/bundle_eu.properties

@@ -271,10 +271,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Konpilazio pertsonalizatua
 confirmban = Ziur jokalari hau debekatu nahi duzula?
 confirmkick = Ziur jokalari hau kanporatu nahi duzula?
-confirmvotekick = Ziur hokalari hau botatzearen alde bozkaytu nahi duzula?
 confirmunban = Ziur jokalari hau debekatzeari utzi nahi nahi diozula?
 confirmadmin = Ziur jokalari hau admin bihurtu nahi duzula?
 confirmunadmin = Ziur jokalari honi admin eskubidea kendu nahi diozula?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Batu partidara
 joingame.ip = Helbidea:
 disconnect = Deskonektatuta.
@@ -1093,6 +1094,8 @@ setting.bridgeopacity.name = Bridge Opacity
 setting.playerchat.name = Erakutsi jolas barneko txata
 setting.showweather.name = Show Weather Graphics
 setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Egokitu interfazea bistaratzeko
+setting.macnotch.description = Berrabiarazi behar da aldaketak aplikatzeko
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Kontuan izan jolasaren beta bertsioek ezin dituztela jokalarien gela publokoak sortu.

core/assets/bundles/bundle_fi.properties

@@ -269,10 +269,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Muokattu koontiversio
 confirmban = Oletko varma että haluat antaa porttikiellon tälle pelaajalle?
 confirmkick = Oletko varma että haluat potkia tämän pelaajan?
-confirmvotekick = Oletko varma että haluat äänestää tämän pelaajan potkituksi?
 confirmunban = Oletko varma että haluat päästää tämän pelaajan takaisin?
 confirmadmin = Oletko varma että haluat antaa pelaajalle hallinto-oikeuksia?
 confirmunadmin = Oletko varma että haluat poistaa hallinto-oikeudet pelaajalta?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Liity peliin
 joingame.ip = Osoite:
 disconnect = Yhteys katkaistu.
@@ -1090,6 +1091,8 @@ setting.bridgeopacity.name = Siltojen läpinäkyvyys
 setting.playerchat.name = Näytä pelinsisäinen keskustelu
 setting.showweather.name = Näytä säägrafiikat
 setting.hidedisplays.name = Piilota logiikkanäytöt
+setting.macnotch.name = Mukauta käyttöliittymä näyttämään lovi
+setting.macnotch.description = Muutosten toteuttaminen vaatii uudelleenkäynnistyksen
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Huomaa, että pelin betaversiot eivät voi luoda julkisia auloja.

core/assets/bundles/bundle_fil.properties

@@ -269,10 +269,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Custom Build
 confirmban = Sigurado ka bang gusto mong i-ban si "{0}[white]"?
 confirmkick = Sigurado ka bang gusto mong i-kick si "{0}[white]"?
-confirmvotekick = Sigurado ka bang gusto mong i-vote-kick si "{0}[white]"?
 confirmunban = Sigurado kabang i-unban ang player?
 confirmadmin = Sigurado ka bang gusto mong gawing admin si "{0}[white]"?
 confirmunadmin = Sigurado kabang i-remove ang admin mula kay "{0}[white]"?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Sumali sa Laro
 joingame.ip = Address:
 disconnect = Disconnected.
@@ -1090,6 +1091,8 @@ setting.bridgeopacity.name = Bridge Opacity
 setting.playerchat.name = Ipakita Player Bubble Chat
 setting.showweather.name = Show Weather Graphics
 setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Iangkop ang interface upang ipakita ang bingaw
+setting.macnotch.description = Kinakailangan ang pag-restart upang mailapat ang mga pagbabago
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Tandaan na ang mga beta na bersyon ng laro ay hindi maaaring gumawa ng mga pampublikong lobby.

core/assets/bundles/bundle_fr.properties

@@ -277,10 +277,11 @@ server.version = [gray]Version : {0} {1}
 server.custombuild = [accent]Version personnalisée
 confirmban = Êtes-vous sûr de vouloir bannir "{0}[white]" ?
 confirmkick = Êtes-vous sûr de vouloir expulser "{0}[white]" ?
-confirmvotekick = Êtes-vous sûr de vouloir voter l'expulsion de "{0}[white]" ?
 confirmunban = Êtes-vous sûr de vouloir annuler le ban de ce joueur ?
 confirmadmin = Êtes-vous sûr de vouloir faire de "{0}[white]" un administrateur ?
 confirmunadmin = Êtes-vous sûr de vouloir supprimer le statut d'administrateur de "{0}[white]" ?
+votekick.reason = Raison du vote d'expulsion
+votekick.reason.message = Êtes-vous sûr de vouloir voter l'expulsion de "{0}[white]"?Si oui, merci d'entrer la raison :
 joingame.title = Rejoindre une partie
 joingame.ip = Adresse IP :
 disconnect = Déconnecté.
@@ -1115,6 +1116,8 @@ setting.bridgeopacity.name = Opacité des ponts
 setting.playerchat.name = Montrer les bulles de discussion des joueurs
 setting.showweather.name = Montrer les Effets météo
 setting.hidedisplays.name = Cacher les Écrans
+setting.macnotch.name = Adapter l'interface pour afficher l'encoche
+setting.macnotch.description = Redémarrage du jeu nécessaire pour appliquer les changements
 steam.friendsonly = Amis seulement
 steam.friendsonly.tooltip = Indique si seuls les amis Steam peuvent rejoindre votre partie.\nSi vous décochez cette case, votre partie deviendra publique et tout le monde pourra la rejoindre.
 public.beta = Notez que les versions bêta du jeu ne peuvent pas créer de salons publics.

core/assets/bundles/bundle_hu.properties

@@ -272,10 +272,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Saját Build
 confirmban = Biztosan tiltod ezt a játékost?
 confirmkick = Biztosan kirúgod ezt a játékost?
-confirmvotekick = Biztosan ki akarod rúgatni ezt a játékost?
 confirmunban = Biztosan újra engedélyezed ezt a játékost?
 confirmadmin = Biztosan hozzá akarod adni ezt a játékost az adminokhoz?
 confirmunadmin = Biztosan meg akarod szűntetni ennek a játékosnak az adminstátuszát?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Csatlakozás
 joingame.ip = Cím:
 disconnect = Leválasztva.
@@ -1100,6 +1101,8 @@ setting.bridgeopacity.name = Híd átlátszatlansága
 setting.playerchat.name = Játékos szóbuborékok megjelenítése
 setting.showweather.name = Időjárás grafika megjelenítése
 setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = A felület igazítása a bevágás megjelenítéséhez
+setting.macnotch.description = A változtatások alkalmazásához újra kell indítani
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Ne feledd, hogy a játék béta verziójában nem tudsz nyilvános szobát nyitni.

core/assets/bundles/bundle_id_ID.properties

@@ -273,10 +273,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Bentuk Modifikasi
 confirmban = Anda yakin ingin melarang pemain ini untuk masuk lagi?
 confirmkick = Anda yakin ingin mengeluarkan pemain ini?
-confirmvotekick = Anda yakin ingin memulai pemungutan suara untuk mengeluarkan pemain ini?
 confirmunban = Anda yakin ingin mengizinkan pemain ini untuk masuk lagi?
 confirmadmin = Anda yakin ingin membuat pemain ini sebagai admin?
 confirmunadmin = Anda yakin ingin menghapus status admin dari pemain ini?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Bermain Bersama
 joingame.ip = Alamat:
 disconnect = Terputus.
@@ -1111,6 +1112,8 @@ setting.bridgeopacity.name = Jelas-Beningnya Jembatan
 setting.playerchat.name = Tunjukkan Pesan dalam Permainan
 setting.showweather.name = Perlihatkan Cuaca
 setting.hidedisplays.name = Sembunyikan Tampilan Logika
+setting.macnotch.name = Sesuaikan antarmuka untuk menampilkan takik
+setting.macnotch.description = Mulai ulang diperlukan untuk menerapkan perubahan
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Ingat bahwa game versi beta tidak dapat membuat lobi publik.

core/assets/bundles/bundle_it.properties

@@ -271,10 +271,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Build Personalizzata
 confirmban = Sei sicuro di voler bandire "{0}[white]"?
 confirmkick = Sei sicuro di voler espellere "{0}[white]"?
-confirmvotekick = Sei sicuro di voler votare per l'espulsione di "{0}[white]"?
 confirmunban = Sei sicuro di voler riammettere questo giocatore?
 confirmadmin = Sei sicuro di voler rendere "{0}[white]" un amministratore?
 confirmunadmin = Sei sicuro di voler rimuovere lo stato di amministratore da "{0}[white]"?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Unisciti alla Partita
 joingame.ip = Indirizzo:
 disconnect = Disconnesso.
@@ -1097,6 +1098,8 @@ setting.bridgeopacity.name = Opacità Nastri e Condotti Sopraelevati
 setting.playerchat.name = Mostra Chat
 setting.showweather.name = Mostra grafica del meteo
 setting.hidedisplays.name = Nascondi display logici
+setting.macnotch.name = Adatta l'interfaccia per visualizzare la tacca
+setting.macnotch.description = Riavvio necessario per applicare le modifiche
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Nota che le versioni beta del gioco non possono creare lobby pubbliche.

core/assets/bundles/bundle_ja.properties

@@ -273,10 +273,11 @@ server.version = [lightgray]バージョン: {0} {1}
 server.custombuild = [accent]カスタムビルド
 confirmban = {0} をBanしてもよろしいですか?
 confirmkick = {0} をキックしてもよろしいですか?
-confirmvotekick = {0} を投票キックしてもよろしいですか?
 confirmunban = このプレイヤーのBanを解除してもよろしいですか?
 confirmadmin = {0} を管理者にしてもよろしいですか?
 confirmunadmin = {0} を管理者から削除してもよろしいですか?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = サーバーに参加
 joingame.ip = アドレス:
 disconnect = 接続が切断されました。
@@ -1103,6 +1104,8 @@ setting.bridgeopacity.name = ブリッジの透明度
 setting.playerchat.name = ゲーム内にチャットを表示
 setting.showweather.name = 天気のグラフィックを表示
 setting.hidedisplays.name = 描画されているロジックディスプレイを非表示
+setting.macnotch.name = インターフェイスをノッチ表示に適応させる
+setting.macnotch.description = 再起動が必要です。
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = ベータ版では使用できません。

core/assets/bundles/bundle_ko.properties

@@ -273,10 +273,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]사용자 정의 서버
 confirmban = 정말로 "{0}[white]" 을(를) 차단하시겠습니까?
 confirmkick = 정말로 "{0}[white]" 을(를) 추방하시겠습니까?
-confirmvotekick = 정말로 "{0}[white]" 을(를) 투표로 추방하시겠습니까?
 confirmunban = 정말로 이 플레이어를 차단 해제하시겠습니까?
 confirmadmin = 정말로 "{0}[white]" 을(를) 관리자로 임명하시겠습니까?
 confirmunadmin = 정말로 "{0}[white]"의 관리자를 박탈하시겠습니까?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = 게임 참가
 joingame.ip = 주소:
 disconnect = 연결이 끊어졌습니다.
@@ -1103,6 +1104,8 @@ setting.bridgeopacity.name = 터널 투명도
 setting.playerchat.name = 채팅 말풍선 표시
 setting.showweather.name = 날씨 그래픽 표시
 setting.hidedisplays.name = 로직 디스플레이 숨김
+setting.macnotch.name = 노치를 표시하도록 인터페이스 조정
+setting.macnotch.description = 적용하려면 재시작이 필요합니다
 steam.friendsonly = 친구 전용
 steam.friendsonly.tooltip = 게임에 스팀 친구만 접속할 수 있는가에 대한 여부입니다.체크를 해제하면, 누구나 접속할 수 있습니다.
 public.beta = 베타 버전의 게임은 공개 서버를 만들 수 없습니다.

core/assets/bundles/bundle_lt.properties

@@ -269,10 +269,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Custom Build
 confirmban = Ar esate tikras, jog norite užblokuoti šį žaidėją?
 confirmkick = Ar esate tikras, jog norite išmesti šį žaidėją?
-confirmvotekick = Ar esate tikras, jog norite išbalsuoti šį žaidėją?
 confirmunban = Ar esate tikras, jog norite atblokuoti šį žaidėją?
 confirmadmin = Ar esate tikras, jog norite šį žaidėją padaryti administratoriumi?
 confirmunadmin = Ar esate tikras, jog norite atimti administratoriaus statusą iš šio žaidėjo?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Prisijungti prie žaidimo
 joingame.ip = IP Adresas:
 disconnect = Atsijungta.
@@ -1091,6 +1092,8 @@ setting.bridgeopacity.name = Tilto Nepermatomumas
 setting.playerchat.name = Rodyti Pokalbių Teksto Burbulus Virš Žaidėjų
 setting.showweather.name = Show Weather Graphics
 setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Pritaikykite sąsają, kad būtų rodoma įpjova
+setting.macnotch.description = Norint pritaikyti pakeitimus, reikia paleisti iš naujo
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Įsiminkite, jog beta versijoje negalima sukrti viešų kambarių.

core/assets/bundles/bundle_nl.properties

@@ -277,10 +277,11 @@ server.version = [lightgray]Versie: {0} {1}
 server.custombuild = [accent]Aangespaste Bouw
 confirmban = Weet je zeker dat je deze speler wilt verbannen?
 confirmkick = Weet je zeker dat je deze speler uit het spel wilt zetten?
-confirmvotekick = Weet je zeker dat je deze speler weg wilt wegstemmen?
 confirmunban = Weet je zeker dat je deze speler weer wilt toelaten?
 confirmadmin = Weet je zeker dat je deze speler administrateur wilt geven?
 confirmunadmin = Weet je zeker dat je de administrateurs status van deze speler wilt intrekken?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Treed toe
 joingame.ip = Adres:
 disconnect = Gesloten.
@@ -1103,6 +1104,8 @@ setting.bridgeopacity.name = Brug Transparantie
 setting.playerchat.name = Toon Chat
 setting.showweather.name = Toon Weer Graphics
 setting.hidedisplays.name = Verberg Logische Displays
+setting.macnotch.name = Pas de interface aan om de inkeping weer te geven
+setting.macnotch.description = Herstart vereist om veranderingen door te voeren
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Onthoud dat b<>ta versies geen publieke lobby's kunnen maken.

core/assets/bundles/bundle_nl_BE.properties

@@ -269,10 +269,11 @@ server.version = [lightgray]Versie: {0} {1}
 server.custombuild = [accent]Aangepaste versie
 confirmban = Ben je zeker dat je deze speler wilt verbannen?
 confirmkick = Ben je zeker dat je deze speler van de server wilt gooien?
-confirmvotekick = Ben je zeker dat je een stemming wilt starten om deze speler uit de server to gooien?
 confirmunban = Ben je zeker dat je de verbanning wilt opheffen?
 confirmadmin = Ben je zeker dat je deze speler administrator wilt maken?
 confirmunadmin = Ben je zeker dat je de administratorstatus van deze speler wilt intrekken?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Verbinden met server
 joingame.ip = IP adres:
 disconnect = Verbinding verbroken.
@@ -1091,6 +1092,8 @@ setting.bridgeopacity.name = Bridge Opacity
 setting.playerchat.name = Display In-Game Chat
 setting.showweather.name = Show Weather Graphics
 setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Adapt interface to display notch
+setting.macnotch.description = Restart required to apply changes
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Note that beta versions of the game cannot make public lobbies.

core/assets/bundles/bundle_pl.properties

@@ -273,10 +273,11 @@ server.version = [gray]Wersja: {0}
 server.custombuild = [accent]Zmodowany klient
 confirmban = Jesteś pewny, że chcesz zbanować "{0}[white]"?
 confirmkick = Jesteś pewny, że chcesz wyrzucić "{0}[white]"?
-confirmvotekick = Jesteś pewny, że chcesz głosować za wyrzuceniem "{0}[white]"?
 confirmunban = Jesteś pewny, że chcesz odbanować tego gracza?
 confirmadmin = Jesteś pewny, że chcesz dać rangę administratora "{0}[white]"?
 confirmunadmin = Jesteś pewny, że chcesz zabrać rangę administratora "{0}[white]"?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Dołącz do gry
 joingame.ip = IP:
 disconnect = Rozłączono.
@@ -1101,6 +1102,8 @@ setting.bridgeopacity.name = Przezroczystość mostów
 setting.playerchat.name = Wyświetlaj dymek czatu w grze
 setting.showweather.name = Pokaż pogodę
 setting.hidedisplays.name = Ukryj wyświetlacze logiczne
+setting.macnotch.name = Dostosuj interfejs do wyświetlania wycięcia
+setting.macnotch.description = Aby zastosować zmiany, wymagane jest ponowne uruchomienie
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Wersje beta gry nie mogą tworzyć publicznych pokoi.

core/assets/bundles/bundle_pt_BR.properties

@@ -273,10 +273,11 @@ server.version = [lightgray]Versão: {0}
 server.custombuild = [accent]Versão customizada
 confirmban = Certeza que quer banir "{0}[white]"?
 confirmkick = Certeza que quer expulsar "{0}[white]"?
-confirmvotekick = Você tem certeza de que quer votar para expulsar "{0}[white]"?
 confirmunban = Certeza que quer desbanir este jogador?
 confirmadmin = Certeza que quer fazer "{0}[white]" um administrador?
 confirmunadmin = Certeza que quer remover o status de adminstrador do "{0}[white]"?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Entrar no jogo
 joingame.ip = IP:
 disconnect = Desconectado.
@@ -1112,6 +1113,8 @@ setting.bridgeopacity.name = Opacidade da ponte
 setting.playerchat.name = Mostrar chat em jogo
 setting.showweather.name = Mostrar Gráficos do Clima
 setting.hidedisplays.name = Ocultar Displays de Lógicos
+setting.macnotch.name = Adaptar a interface para exibir o entalhe
+setting.macnotch.description = Reinicialização necessária para aplicar as alterações
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Note que as versões beta do jogo não podem fazer salas públicas.

core/assets/bundles/bundle_pt_PT.properties

@@ -269,10 +269,11 @@ server.version = [lightgray]Versão: {0}
 server.custombuild = [accent]Versão customizada
 confirmban = Certeza que quer banir este jogador?
 confirmkick = Certeza que quer expulsar o jogador?
-confirmvotekick = Você tem certeza de que quer votar para expulsar este jogador?
 confirmunban = Certeza que quer desbanir este jogador?
 confirmadmin = Certeza que quer fazer este jogador um administrador?
 confirmunadmin = Certeza que quer remover o estatus de adminstrador deste jogador?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Entrar no jogo
 joingame.ip = IP:
 disconnect = Desconectado.
@@ -1091,6 +1092,8 @@ setting.bridgeopacity.name = Opacidade da Ponte
 setting.playerchat.name = Mostrar chat em jogo
 setting.showweather.name = Show Weather Graphics
 setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Adaptar a interface para exibir o entalhe
+setting.macnotch.description = É necessário reiniciar para aplicar as alterações
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Observe que as versões beta do jogo não podem criar lobbies públicos.

core/assets/bundles/bundle_ro.properties

@@ -17,7 +17,7 @@ link.bug.description = Ai găsit vreunul? Raportează-l aici
 linkopen = This server has sent you a link. Are you sure you want to open it?\n\n[sky]{0}
 linkfail = Linkul nu a putut fi deschis!\nAdresa URL a fost copiată.
 screenshot = Captură de ecran salvată la {0}
-screenshot.invalid = Harta e prea mare. Se poate să nu existe suficientă memorie pentru captura de ecran.
+screenshot.invalid = Harta e prea mare. Se poate să nu existe suficientă memorie pentru captura de ecran
 gameover = Jocul s-a încheiat
 gameover.disconnect = Deconectare
 gameover.pvp = Echipa [accent] {0}[] este câștigătoare!
@@ -273,10 +273,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Build Personalizat
 confirmban = Sigur vrei să interzici jucătorul "{0}[white]"?
 confirmkick = Sigur vrei să-l dai afară pe "{0}[white]"?
-confirmvotekick = Sigur vrei să-l dai afară pe "{0}[white]"?
 confirmunban = Sigur vrei ca acest jucător să nu mai fie interzis?
 confirmadmin = Sigur vrei să-l faci pe "{0}[white]" un admin?
 confirmunadmin = Sigur vrei ca "{0}[white]" să nu mai fie un admin?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Alătură-te Jocului
 joingame.ip = Adresă:
 disconnect = Deconectat.
@@ -1103,6 +1104,8 @@ setting.bridgeopacity.name = Opacitate Poduri
 setting.playerchat.name = Vezi Chat Temporar
 setting.showweather.name = Vezi Vremea
 setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Adaptați interfața pentru a afișa notch-ul
+setting.macnotch.description = Repornire necesară pt a aplica schimbările.
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = De reținut că versiunile beta ale jocului nu poate face servere publice.

core/assets/bundles/bundle_ru.properties

@@ -273,10 +273,11 @@ server.version = [gray]Версия: {0} {1}
 server.custombuild = [accent]Пользовательская сборка
 confirmban = Вы действительно хотите заблокировать игрока «{0}[white]»?
 confirmkick = Вы действительно хотите выгнать игрока «{0}[white]»?
-confirmvotekick = Вы действительно хотите голосованием выгнать игрока «{0}[white]»?
 confirmunban = Вы действительно хотите разблокировать этого игрока?
 confirmadmin = Вы действительно хотите сделать игрока «{0}[white]» администратором?
 confirmunadmin = Вы действительно хотите убрать игрока «{0}[white]» из администраторов?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Присоединиться к игре
 joingame.ip = Адрес:
 disconnect = Отключено.
@@ -1104,6 +1105,8 @@ setting.bridgeopacity.name = Непрозрачность мостов
 setting.playerchat.name = Отображать облака чата над игроками
 setting.showweather.name = Отображать погоду
 setting.hidedisplays.name = Скрыть логические дисплеи
+setting.macnotch.name = Адаптировать интерфейс к вырезу на экране
+setting.macnotch.description = Для вступления изменений в силу требуется перезагрузка игры
 steam.friendsonly = Только друзья
 steam.friendsonly.tooltip = Только ли друзья из Steam могут присоединяться к вашей игре.\nУбрав эту галочку, вы сделаете вашу игру публичной - присоединиться сможет любой желающий.
 public.beta = Имейте в виду, что бета-версия игры не может делать игры публичными.

core/assets/bundles/bundle_sr.properties

@@ -273,10 +273,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Svjojehodna Verzija
 confirmban = Da li ste sigurni da želite da [scarlet]trajno[] izbacite "{0}[white]"?
 confirmkick = Da li ste sigurni da želite da izbacite "{0}[white]"?
-confirmvotekick = Da li ste sigurni da želite putem glasova da izbacite "{0}[white]"?
 confirmunban = Are you sure you want to unban this player?
 confirmadmin = Da li ste sigurni da želite da pretvorite "{0}[white]" u administratora?
 confirmunadmin = Da li ste sigurni da želite ukloni čin administratora sa "{0}[white]"?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Pridruži Se Igri
 joingame.ip = Adresa:
 disconnect = Veza je prekinuta.
@@ -1105,6 +1106,8 @@ setting.bridgeopacity.name = Prozirnost Mostova
 setting.playerchat.name = Prikazuj Čet Mehure Igrača
 setting.showweather.name = Prikazuj Grafiku Vremena
 setting.hidedisplays.name = Sakrij Logičke Displeje
+setting.macnotch.name = Prilagodi interfejs da prikaže zarez
+setting.macnotch.description = Restartovanje je zahtevano da bi se učitale promene
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Note that beta versions of the game cannot make public lobbies.

core/assets/bundles/bundle_sv.properties

@@ -269,10 +269,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Custom Build
 confirmban = Are you sure you want to ban this player?
 confirmkick = Are you sure you want to kick this player?
-confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Are you sure you want to unban this player?
 confirmadmin = Are you sure you want to make this player an admin?
 confirmunadmin = Are you sure you want to remove admin status from this player?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Join Game
 joingame.ip = Adress:
 disconnect = Frånkopplad.
@@ -1091,6 +1092,8 @@ setting.bridgeopacity.name = Bridge Opacity
 setting.playerchat.name = Visa
 setting.showweather.name = Show Weather Graphics
 setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Anpassa gränssnittet för att visa skåra
+setting.macnotch.description = Omstart krävs för att tillämpa ändringar
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Note that beta versions of the game cannot make public lobbies.

core/assets/bundles/bundle_th.properties

@@ -273,10 +273,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]เวอร์ชั่นปรับแต่ง
 confirmban = คุณแน่ใจหรือว่าจะแบนผู้เล่นนี้?
 confirmkick = คุณแน่ใจหรือว่าจะเตะผู้เล่นนี้ออก?
-confirmvotekick = คุณแน่ใจหรือว่าจะโหวตเตะผู้เล่นนี้ออก?
 confirmunban = คุณแน่ใจหรือว่าจะเลิกแบนผู้เล่นนี้?
 confirmadmin = คุณแน่ใจหรือว่าจะแต่งตั้งผู้เล่นคนนี้เป็นแอดมิน?
 confirmunadmin = คุณแน่ใจหรือว่าจะลบสถานะการเป็นแอดมินของผู้เล่นนี้?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = เข้าร่วมเกม
 joingame.ip = ที่อยู่:
 disconnect = ตัดการเชื่อมต่อแล้ว
@@ -1105,6 +1106,8 @@ setting.bridgeopacity.name = ความโปร่งแสงของสะ
 setting.playerchat.name = แสดงกล่องแชทบนผู้เล่น
 setting.showweather.name = แสดงกราฟิกสภาพอากาศ
 setting.hidedisplays.name = ซ่อนหน้าจอลอจิก
+setting.macnotch.name = ปรับอินเทอร์เฟซเพื่อแสดงรอยบาก
+setting.macnotch.description = อาจจะต้องรีสตาร์ทเพื่อใช้งานการเปลี่ยนแปลง
 steam.friendsonly = เพื่อนเท่านั้น
 steam.friendsonly.tooltip = ว่าจะให้แค่เพื่อนเท่านั้นหรือไม่ที่จะสามารถเข้าร่วมเกมของคุณได้\nหากคุณติ๊กช่องนี้ออกนั้นจะทำให้เกมของคุณเปิดเป็นสาธารณะ - ใครๆก็จะสามารถเข้าร่วมเกมของคุณได้
 public.beta = เกมเวอร์ชั่นเบต้าไม่สามารถเปิดเซิร์ฟเวอร์สาธารณะได้

core/assets/bundles/bundle_tk.properties

@@ -269,10 +269,11 @@ server.version = [lightgray]Versiyon: {0}
 server.custombuild = [accent]ozel yapi
 confirmban = Bu oyuncuyu kalici olarak atmak istedigine emin misin?
 confirmkick = Are you sure you want to kick this player?
-confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Bu oyuncunun yasagini geri almak ister misin?
 confirmadmin = Bu oyuncuyu yetkili yapmak istedigine emin misin?
 confirmunadmin = Bu oyuncunun yetkisini almak istedigine emin misin?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Oyuna katil
 joingame.ip = Link:
 disconnect = Cikildi
@@ -1091,6 +1092,8 @@ setting.bridgeopacity.name = Bridge Opacity
 setting.playerchat.name = Display In-Game Chat
 setting.showweather.name = Show Weather Graphics
 setting.hidedisplays.name = Hide Logic Displays
+setting.macnotch.name = Kesgitlemek üçin interfeýsi uýgunlaşdyryň
+setting.macnotch.description = Üýtgeşmeleri ulanmak üçin täzeden başlaň
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Note that beta versions of the game cannot make public lobbies.

core/assets/bundles/bundle_tr.properties

@@ -273,10 +273,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Özel Sürüm
 confirmban = Bu kullanıcıyı yasaklamak istediğine emin misin?
 confirmkick = Bu kullanıcıyı atmak istediğine emin misin?
-confirmvotekick = Bu kullanıcıyı oylayıp atmak istediğinize emin misiniz?
 confirmunban = Bu kullanıcının yasağını kaldırmak istediğine emin misin?
 confirmadmin = Bu kullanıcıyı bir yönetici yapmak istediğine emin misin?
 confirmunadmin = Bu kullanıcının yönetici yetkilerini almak istediğine istediğine emin misin?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Oyuna Katıl
 joingame.ip = Adres:
 disconnect = Bağlantı kesildi.
@@ -1102,6 +1103,8 @@ setting.bridgeopacity.name = Köprü Opaklığı
 setting.playerchat.name = Oyun-içi Konuşmayı Göster
 setting.showweather.name = Hava Durmu Grafiklerini Göster
 setting.hidedisplays.name = İşlemci İpuçlarını Gizle
+setting.macnotch.name = Arayüzü çentik gösterecek şekilde uyarlayın
+setting.macnotch.description = Değişikleri uygulamak için yeniden başlatma gerekli
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Oyunun beta sürümlerinin halka açık lobiler yapamayacağını unutmayın.

core/assets/bundles/bundle_uk_UA.properties

@@ -275,10 +275,11 @@ server.version = [gray]Версія: {0} {1}
 server.custombuild = [accent]Користувацька збірка
 confirmban = Ви дійсно хочете заблокувати «{0}[white]»?
 confirmkick = Ви дійсно хочете вигнати «{0}[white]»?
-confirmvotekick = Ви дійсно хочете вигнати «{0}[white]» за допомогою голосування?
 confirmunban = Ви дійсно хочете розблокувати цього гравця?
 confirmadmin = Ви дійсно хочете зробити «{0}[white]» адміністратором?
 confirmunadmin = Ви дійсно хочете видалити статус адміністратора з «{0}[white]»?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Багатоосібна гра
 joingame.ip = IP:
 disconnect = Відключено.
@@ -1113,6 +1114,8 @@ setting.bridgeopacity.name = Непрозорість мостів
 setting.playerchat.name = Показувати хмару чата над гравцями
 setting.showweather.name = Показувати погоду
 setting.hidedisplays.name = Приховувати логічні дисплеї
+setting.macnotch.name = Адаптуйте інтерфейс для відображення виїмки
+setting.macnotch.description = Потрібен перезапуск для застосування змін
 steam.friendsonly = Лише друзі
 steam.friendsonly.tooltip = Чи лише друзі Steam зможуть приєднатися до вашої гри.Якщо зняти цей прапорець, ваша гра стане загальнодоступною – будь-хто зможе приєднатися.
 public.beta = Зауважте, що в бета-версії гри ви не можете робити публічні ігри.

core/assets/bundles/bundle_vi.properties

@@ -274,10 +274,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Phiên bản tùy chỉnh
 confirmban = Bạn có chắc chắn muốn cấm "{0}[white]"?
 confirmkick = Bạn có chắc chắn muốn buộc "{0}[white]" rời?
-confirmvotekick = Bạn có chắc chắn muốn bỏ phiếu buộc "{0}[white]" rời?
 confirmunban = Bạn có chắc chắn muốn gỡ cấm người chơi này?
 confirmadmin = Bạn có chắc chắn muốn thêm "{0}[white]" làm quản trị viên?
 confirmunadmin = Bạn có chắc chắn muốn xóa quyền quản trị viên của "{0}[white]" ?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Tham gia trò chơi
 joingame.ip = Địa chỉ:
 disconnect = Ngắt kết nối.
@@ -1106,6 +1107,8 @@ setting.bridgeopacity.name = Độ mờ cầu
 setting.playerchat.name = Hiển thị bong bóng trò chuyện của người chơi
 setting.showweather.name = Hiển thị đồ họa thời tiết
 setting.hidedisplays.name = Ẩn hiển thị logic
+setting.macnotch.name = Điều chỉnh giao diện để hiển thị notch
+setting.macnotch.description = Trò chơi sẽ khởi động lại để áp dụng các thay đổi
 steam.friendsonly = Chỉ bạn bè
 steam.friendsonly.tooltip = Liệu chỉ bạn bè trên Steam mới có thể tham gia trò chơi của bạn hay không.\nBỏ chọn ô này sẽ làm trò chơi của bạn công khai - mọi có thể tham gia.
 public.beta = Lưu ý rằng phiên bản beta của trò chơi không thể tạo sảnh công khai.

core/assets/bundles/bundle_zh_CN.properties

@@ -276,10 +276,11 @@ server.version = [gray]版本：{0} {1}
 server.custombuild = [accent]自行编译
 confirmban = 确定封禁玩家“{0}[white]”？
 confirmkick = 确定踢出玩家“{0}[white]”？
-confirmvotekick = 确定投票踢出玩家“{0}[white]”？
 confirmunban = 确定解封这名玩家？
 confirmadmin = 确定给予玩家“{0}[white]”管理员权限？
 confirmunadmin = 确定收回玩家“{0}[white]”的管理员权限？
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = 加入游戏
 joingame.ip = 地址：
 disconnect = 已断开连接
@@ -1114,6 +1115,8 @@ setting.bridgeopacity.name = 桥梁不透明度
 setting.playerchat.name = 显示玩家聊天气泡
 setting.showweather.name = 显示天气效果
 setting.hidedisplays.name = 不显示逻辑绘图
+setting.macnotch.name = 立陶宛語
+setting.macnotch.description = 需要重新启动
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = 请注意，测试版的游戏不能公开可见。

core/assets/bundles/bundle_zh_TW.properties

@@ -273,10 +273,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]自訂客戶端
 confirmban = 您確定要封鎖「[white]{0}[]」嗎？
 confirmkick = 您確定要踢出「[white]{0}[]」嗎？
-confirmvotekick = 您確定要投票踢出「[white]{0}[]」嗎?
 confirmunban = 您確定要解除封鎖這個玩家嗎？
 confirmadmin = 您確定要晉升「[white]{0}[]」為管理員嗎？
 confirmunadmin = 您確定要解除「[white]{0}[]」的管理員嗎？
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = 加入遊戲
 joingame.ip = IP 位置：
 disconnect = 已中斷連線。
@@ -1110,6 +1111,8 @@ setting.bridgeopacity.name = 橋透明度
 setting.playerchat.name = 在遊戲中顯示聊天視窗
 setting.showweather.name = 顯示天氣動畫
 setting.hidedisplays.name = 隱藏邏輯顯示
+setting.macnotch.name = 使界面適應顯示槽口
+setting.macnotch.description = 需要重新啟動遊戲以更改大小
 steam.friendsonly = Friends Only
 steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = 請注意，該遊戲的Beta版本無法公開遊戲大廳。

core/src/mindustry/Vars.java

@@ -113,6 +113,8 @@ public class Vars implements Loadable{
     public static final float tilePayload = tilesize * tilesize;
     /** icon sizes for UI */
     public static final float iconXLarge = 8*6f, iconLarge = 8*5f, iconMed = 8*4f, iconSmall = 8*3f;
+    /** macbook screen notch height */
+    public static float macNotchHeight = 32f;
     /** for map generator dialog */
     public static boolean updateEditorOnChange = false;
     /** all choosable player colors in join/host dialog */

core/src/mindustry/core/NetServer.java

@@ -349,7 +349,7 @@ public class NetServer implements ApplicationListener{
 
         class VoteSession{
             Player target;
-            ObjectSet<String> voted = new ObjectSet<>();
+            ObjectIntMap<String> voted = new ObjectIntMap<>();
             VoteSession[] map;
             Timer.Task task;
             int votes;
@@ -367,8 +367,12 @@ public class NetServer implements ApplicationListener{
             }
 
             void vote(Player player, int d){
+                int lastVote = voted.get(player.uuid(), 0) | voted.get(admins.getInfo(player.uuid()).lastIP, 0);
+                votes -= lastVote;
+
                 votes += d;
-                voted.addAll(player.uuid(), admins.getInfo(player.uuid()).lastIP);
+                voted.put(player.uuid(), d);
+                voted.put(admins.getInfo(player.uuid()).lastIP, d);
 
                 Call.sendMessage(Strings.format("[lightgray]@[lightgray] has voted on kicking[orange] @[lightgray].[accent] (@/@)\n[lightgray]Type[orange] /vote <y/n>[] to agree.",
                     player.name, target.name, votes, votesRequired()));
@@ -393,7 +397,7 @@ public class NetServer implements ApplicationListener{
         //current kick sessions
         VoteSession[] currentlyKicking = {null};
 
-        clientCommands.<Player>register("votekick", "[player...]", "Vote to kick a player.", (args, player) -> {
+        clientCommands.<Player>register("votekick", "[player] [reason...]", "Vote to kick a player with a valid reason.", (args, player) -> {
             if(!Config.enableVotekick.bool()){
                 player.sendMessage("[scarlet]Vote-kick is disabled on this server.");
                 return;
@@ -422,6 +426,8 @@ public class NetServer implements ApplicationListener{
                     builder.append("[lightgray] ").append(p.name).append("[accent] (#").append(p.id()).append(")\n");
                 });
                 player.sendMessage(builder.toString());
+            }else if(args.length == 1){
+                player.sendMessage("[orange]You need a valid reason to kick the player. Add a reason after the player name.");
             }else{
                 Player found;
                 if(args[0].length() > 1 && args[0].startsWith("#") && Strings.canParseInt(args[0].substring(1))){
@@ -450,6 +456,7 @@ public class NetServer implements ApplicationListener{
 
                         VoteSession session = new VoteSession(currentlyKicking, found);
                         session.vote(player, 1);
+                        Call.sendMessage(Strings.format("[lightgray]Reason:[orange] @[lightgray].", args[1]));
                         vtime.reset();
                         currentlyKicking[0] = session;
                     }
@@ -459,18 +466,31 @@ public class NetServer implements ApplicationListener{
             }
         });
 
-        clientCommands.<Player>register("vote", "<y/n>", "Vote to kick the current player.", (arg, player) -> {
+        clientCommands.<Player>register("vote", "<y/n/c>", "Vote to kick the current player. Admin can cancel the voting with 'c'.", (arg, player) -> {
             if(currentlyKicking[0] == null){
                 player.sendMessage("[scarlet]Nobody is being voted on.");
             }else{
+                if(player.admin && arg[0].equalsIgnoreCase("c")){
+                    Call.sendMessage(Strings.format("[lightgray]Vote canceled by admin[orange] @[lightgray].", player.name));
+                    currentlyKicking[0].task.cancel();
+                    currentlyKicking[0] = null;
+                    return;
+                }
+
                 if(player.isLocal()){
                     player.sendMessage("[scarlet]Local players can't vote. Kick the player yourself instead.");
                     return;
                 }
 
+                int sign = switch(arg[0].toLowerCase()){
+                    case "y", "yes" -> 1;
+                    case "n", "no" -> -1;
+                    default -> 0;
+                };
+
                 //hosts can vote all they want
-                if((currentlyKicking[0].voted.contains(player.uuid()) || currentlyKicking[0].voted.contains(admins.getInfo(player.uuid()).lastIP))){
+                if((currentlyKicking[0].voted.get(player.uuid(), 2) == sign || currentlyKicking[0].voted.get(admins.getInfo(player.uuid()).lastIP, 2) == sign)){
-                    player.sendMessage("[scarlet]You've already voted. Sit down.");
+                    player.sendMessage(Strings.format("[scarlet]You've already voted @. Sit down.", arg[0].toLowerCase()));
                     return;
                 }
 
@@ -484,12 +504,6 @@ public class NetServer implements ApplicationListener{
                     return;
                 }
 
-                int sign = switch(arg[0].toLowerCase()){
-                    case "y", "yes" -> 1;
-                    case "n", "no" -> -1;
-                    default -> 0;
-                };
-
                 if(sign == 0){
                     player.sendMessage("[scarlet]Vote either 'y' (yes) or 'n' (no).");
                     return;

core/src/mindustry/ui/dialogs/SettingsMenuDialog.java

@@ -490,6 +490,10 @@ public class SettingsMenuDialog extends BaseDialog{
         graphics.checkPref("skipcoreanimation", false);
         graphics.checkPref("hidedisplays", false);
 
+        if(OS.isMac){
+            graphics.checkPref("macnotch", false);
+        }
+
         if(!mobile){
             Core.settings.put("swapdiagonal", false);
         }

core/src/mindustry/ui/fragments/HudFragment.java

@@ -293,6 +293,11 @@ public class HudFragment{
         //core info
         parent.fill(t -> {
             t.top();
+
+            if(Core.settings.getBool("macnotch") ){
+                t.margin(macNotchHeight);
+            }
+
             t.visible(() -> shown);
 
             t.name = "coreinfo";

core/src/mindustry/ui/fragments/MenuFragment.java

@@ -100,6 +100,9 @@ public class MenuFragment{
 
             float fx = (int)(width / 2f);
             float fy = (int)(height - 6 - logoh) + logoh / 2 - (Core.graphics.isPortrait() ? Scl.scl(30f) : 0f);
+            if(Core.settings.getBool("macnotch") ){
+                fy -= Scl.scl(macNotchHeight);
+            }
 
             Draw.color();
             Draw.rect(logo, fx, fy, logow, logoh);

core/src/mindustry/ui/fragments/PlayerListFragment.java

@@ -199,8 +199,8 @@ public class PlayerListFragment{
                 button.add().growY();
 
                 button.button(Icon.hammer, ustyle,
-                    () -> ui.showConfirm("@confirm", Core.bundle.format("confirmvotekick",  user.name()),
+                    () -> ui.showTextInput("@votekick.reason", Core.bundle.format("votekick.reason.message", user.name()), "",
-                    () -> Call.sendChatMessage("/votekick #" + user.id)))
+                    reason -> Call.sendChatMessage("/votekick #" + user.id + " " + reason)))
                 .size(h);
             }
 

core/src/mindustry/world/blocks/liquid/LiquidBlock.java

@@ -33,10 +33,15 @@ public class LiquidBlock extends Block{
     }
 
     public static void drawTiledFrames(int size, float x, float y, float padding, Liquid liquid, float alpha){
+        drawTiledFrames(size, x, y, padding, padding, padding, padding, liquid, alpha);
+    }
+
+    public static void drawTiledFrames(int size, float x, float y, float padLeft, float padRight, float padTop, float padBottom, Liquid liquid, float alpha){
         TextureRegion region = renderer.fluidFrames[liquid.gas ? 1 : 0][liquid.getAnimationFrame()];
         TextureRegion toDraw = Tmp.tr1;
 
-        float bounds = size/2f * tilesize - padding;
+        float leftBounds = size/2f * tilesize - padRight;
+        float bottomBounds = size/2f * tilesize - padTop;
         Color color = Tmp.c1.set(liquid.color).a(1f);
 
         for(int sx = 0; sx < size; sx++){
@@ -46,8 +51,8 @@ public class LiquidBlock extends Block{
                 toDraw.set(region);
 
                 //truncate region if at border
-                float rightBorder = relx*tilesize + padding, topBorder = rely*tilesize + padding;
+                float rightBorder = relx*tilesize + padLeft, topBorder = rely*tilesize + padBottom;
-                float squishX = rightBorder + tilesize/2f - bounds, squishY = topBorder + tilesize/2f - bounds;
+                float squishX = rightBorder + tilesize/2f - leftBounds, squishY = topBorder + tilesize/2f - bottomBounds;
                 float ox = 0f, oy = 0f;
 
                 if(squishX >= 8 || squishY >= 8) continue;

core/src/mindustry/world/draw/DrawLiquidTile.java

@@ -2,11 +2,13 @@ package mindustry.world.draw;
 
 import mindustry.gen.*;
 import mindustry.type.*;
+import mindustry.world.*;
 import mindustry.world.blocks.liquid.*;
 
 public class DrawLiquidTile extends DrawBlock{
     public Liquid drawLiquid;
     public float padding;
+    public float padLeft = -1, padRight = -1, padTop = -1, padBottom = -1;
     public float alpha = 1f;
 
     public DrawLiquidTile(Liquid drawLiquid, float padding){
@@ -24,6 +26,14 @@ public class DrawLiquidTile extends DrawBlock{
     @Override
     public void draw(Building build){
         Liquid drawn = drawLiquid != null ? drawLiquid : build.liquids.current();
-        LiquidBlock.drawTiledFrames(build.block.size, build.x, build.y, padding, drawn, build.liquids.get(drawn) / build.block.liquidCapacity * alpha);
+        LiquidBlock.drawTiledFrames(build.block.size, build.x, build.y, padLeft, padRight, padTop, padBottom, drawn, build.liquids.get(drawn) / build.block.liquidCapacity * alpha);
+    }
+
+    @Override
+    public void load(Block block){
+        if(padLeft < 0) padLeft = padding;
+        if(padRight < 0) padRight = padding;
+        if(padTop < 0) padTop = padding;
+        if(padBottom < 0) padBottom = padding;
     }
 }

servers_v7.json

@@ -106,7 +106,7 @@
   },
   {
     "name": "The Devil",
-    "address": ["xem8k5.mindustry.top:8169", "test.xem8k5.top:8920", "other.xem8k5.top:10936", "n2.akiracloud.net:10404"]
+    "address": ["xem8k5.mindustry.top:8169", "test.xem8k5.top:8920", "other.xem8k5.top:10936"]
   },
   {
     "name": "Eradicationdustry",
@@ -129,8 +129,8 @@
     "address": ["sectorized.freeddns.org"]
   },
   {
-    "name": "{AA}",
+    "name": "Apricot Alliance",
-    "address": ["recessive.net"]
+    "address": ["apricotalliance.org"]
   },
   {
     "name": "Sakura",