Merge branch 'master' of https://github.com/minetest/minetest_game

mods/beds/functions.lua

@@ -102,6 +102,11 @@ local function lay_down(player, pos, bed_pos, state, skip)
 			return false
 		end
 
+		-- Check if player is attached to an object
+		if player:get_attach() then
+			return false
+		end
+
 		if beds.player[name] then
 			-- player already in bed, do nothing
 			return false

mods/beds/locale/beds.eo.tr

@@ -0,0 +1,10 @@
+# textdomain: beds
+Fancy Bed=Luksa Lito
+Simple Bed=Simpla Lito
+This bed is already occupied!=
+You have to stop moving before going to bed!=
+Good morning.=Bonan matenon.
+@1 of @2 players are in bed=@1 el @2 ludantoj estas en lito.
+Force night skip=Devigu nokta salton
+You can only sleep at night.=Vi povas nur dormi en la nokto. 
+Leave Bed=Ellitiĝu

mods/beds/locale/beds.ja.tr

@@ -0,0 +1,10 @@
+# textdomain: beds
+Fancy Bed=ファンシーなベッド
+Simple Bed=シンプルなベッド
+This bed is already occupied!=ベッドはすでに使われています！
+You have to stop moving before going to bed!=寝るときは動かないでください！
+Good morning.=おはようございます。
+@1 of @2 players are in bed=ベッドに@1 / @2人います
+Force night skip=強制的に夜をスキップします
+You can only sleep at night.=夜しか寝れません。
+Leave Bed=ベッドから出ます

mods/beds/locale/beds.ru.tr

@@ -1,8 +1,8 @@
 # textdomain: beds
 Fancy Bed=Детализированная Кровать
 Simple Bed=Обычная Кровать
-This bed is already occupied!=
-You have to stop moving before going to bed!=
+This bed is already occupied!=Эта кровать уже занята!
+You have to stop moving before going to bed!=Нельзя воспользоваться кроватью на ходу!
 Good morning.=Доброе утро.
 @1 of @2 players are in bed=@1 из @2 игроков в кровати
 Force night skip=Пропустить ночь

mods/beds/locale/beds.sk.tr

@@ -1,8 +1,8 @@
 # textdomain: beds
 Fancy Bed=Pekná posteľ
 Simple Bed=Jednoduchá posteľ
-This bed is already occupied!=
-You have to stop moving before going to bed!=
+This bed is already occupied!=Táto posteľ je už obsadená
+You have to stop moving before going to bed!=Predtým ako si ľahneš do postele, sa musíš prestať pohybovať!
 Good morning.=Dobré ráno.
 @1 of @2 players are in bed=@1 z @2 hráčov sú v posteli
 Force night skip=Nútene preskočiť noc

mods/beds/locale/beds.zh_CN.tr

@@ -1,8 +1,8 @@
 # textdomain: beds
 Fancy Bed=花式床
 Simple Bed=简易床
-This bed is already occupied!=
-You have to stop moving before going to bed!=
+This bed is already occupied!=床上已有人！
+You have to stop moving before going to bed!=上床前要停止移动！
 Good morning.=早安！
 @1 of @2 players are in bed=@2位玩家中的@1位在床上
 Force night skip=强制跳过夜晚